diff --git a/copyright.txt b/copyright.txt
index 17ba5f39a91..e663f77915e 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -1,13 +1,13 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
\ No newline at end of file
diff --git a/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/AtomServlet.java b/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/AtomServlet.java
index f4414ba575d..7628a488fed 100644
--- a/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/AtomServlet.java
+++ b/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/AtomServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.portal.servlet;
@@ -42,7 +42,7 @@ import org.apache.abdera.protocol.server.servlet.AbderaServlet;
  */
 public class AtomServlet extends AbderaServlet {
 
-	@Override
+
 	public void init(ServletConfig servletConfig) throws ServletException {
 		super.init(servletConfig);
 
@@ -51,7 +51,7 @@ public class AtomServlet extends AbderaServlet {
 		}
 	}
 
-	@Override
+
 	protected Provider createProvider() {
 		AtomProvider atomProvider = new AtomProvider();
 
@@ -69,7 +69,7 @@ public class AtomServlet extends AbderaServlet {
 		return atomProvider;
 	}
 
-	@Override
+
 	protected void service(
 			HttpServletRequest request, HttpServletResponse response)
 		throws ServletException {
diff --git a/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/ExtWebServlet.java b/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/ExtWebServlet.java
index bbda939668c..0325fa6f4dd 100644
--- a/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/ExtWebServlet.java
+++ b/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/servlet/ExtWebServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.portal.servlet;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServlet;
  */
 public class ExtWebServlet extends HttpServlet {
 
-	@Override
+
 	public void init(ServletConfig servletConfig) throws ServletException {
 		super.init(servletConfig);
 
diff --git a/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/util/ExtPortalImpl.java b/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/util/ExtPortalImpl.java
index 32ec9653a55..45f6b862e20 100644
--- a/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/util/ExtPortalImpl.java
+++ b/ext/sample-ext/docroot/WEB-INF/ext-impl/src/com/liferay/portal/util/ExtPortalImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.portal.util;
@@ -19,7 +19,7 @@ package com.liferay.portal.util;
  */
 public class ExtPortalImpl extends PortalImpl {
 
-	@Override
+
 	public String getComputerName() {
 		return "EXT_PORTAL_IMPL_INSTALLED_" + super.getComputerName();
 	}
diff --git a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/hook/deploy/DeployListenerDeployManagerImpl.java b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/hook/deploy/DeployListenerDeployManagerImpl.java
index 9abacbc075d..f41c00095b9 100644
--- a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/hook/deploy/DeployListenerDeployManagerImpl.java
+++ b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/hook/deploy/DeployListenerDeployManagerImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.hook.deploy;
@@ -38,7 +38,7 @@ public class DeployListenerDeployManagerImpl
 		_deployManager = deployManager;
 	}
 
-	@Override
+
 	public void deploy(AutoDeploymentContext autoDeploymentContext)
 		throws Exception {
 
@@ -54,32 +54,32 @@ public class DeployListenerDeployManagerImpl
 			autoDeploymentContext.getContext(), COMMAND_ON_AFTER_DEPLOY);
 	}
 
-	@Override
+
 	public String getDeployDir() throws Exception {
 		return _deployManager.getDeployDir();
 	}
 
-	@Override
+
 	public String getInstalledDir() throws Exception {
 		return _deployManager.getInstalledDir();
 	}
 
-	@Override
+
 	public PluginPackage getInstalledPluginPackage(String context) {
 		return _deployManager.getInstalledPluginPackage(context);
 	}
 
-	@Override
+
 	public List<PluginPackage> getInstalledPluginPackages() {
 		return _deployManager.getInstalledPluginPackages();
 	}
 
-	@Override
+
 	public List<String[]> getLevelsRequiredDeploymentContexts() {
 		return _deployManager.getLevelsRequiredDeploymentContexts();
 	}
 
-	@Override
+
 	public List<String[]> getLevelsRequiredDeploymentWARFileNames() {
 		return _deployManager.getLevelsRequiredDeploymentWARFileNames();
 	}
@@ -88,17 +88,17 @@ public class DeployListenerDeployManagerImpl
 		return _deployManager;
 	}
 
-	@Override
+
 	public boolean isDeployed(String context) {
 		return _deployManager.isDeployed(context);
 	}
 
-	@Override
+
 	public boolean isRequiredDeploymentContext(String context) {
 		return _deployManager.isRequiredDeploymentContext(context);
 	}
 
-	@Override
+
 	public PluginPackage readPluginPackageProperties(
 		String displayName, Properties properties) {
 
@@ -106,12 +106,12 @@ public class DeployListenerDeployManagerImpl
 			displayName, properties);
 	}
 
-	@Override
+
 	public PluginPackage readPluginPackageXml(String xml) throws Exception {
 		return _deployManager.readPluginPackageXml(xml);
 	}
 
-	@Override
+
 	public void redeploy(String context) throws Exception {
 		if (!sendMesssage(context, COMMAND_ON_BEFORE_REDEPLOY)) {
 			return;
@@ -122,7 +122,7 @@ public class DeployListenerDeployManagerImpl
 		sendMesssage(context, COMMAND_ON_AFTER_REDEPLOY);
 	}
 
-	@Override
+
 	public void undeploy(String context) throws Exception {
 		if (!isAllowUndeploy(context)) {
 			return;
diff --git a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/servlet/DeployListenerServletContextListener.java b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/servlet/DeployListenerServletContextListener.java
index 11f70f050a8..0e26f7b40fa 100644
--- a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/servlet/DeployListenerServletContextListener.java
+++ b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/servlet/DeployListenerServletContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.servlet;
@@ -28,17 +28,17 @@ import javax.servlet.ServletContextListener;
 public class DeployListenerServletContextListener
 	extends BasePortalLifecycle implements ServletContextListener {
 
-	@Override
+
 	public void contextDestroyed(ServletContextEvent servletContextEvent) {
 		portalDestroy();
 	}
 
-	@Override
+
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		registerPortalLifecycle();
 	}
 
-	@Override
+
 	protected void doPortalDestroy() throws Exception {
 		DeployManager deployManager = DeployManagerUtil.getDeployManager();
 
@@ -53,7 +53,7 @@ public class DeployListenerServletContextListener
 		}
 	}
 
-	@Override
+
 	protected void doPortalInit() {
 		DeployManagerUtil deployManagerUtil = new DeployManagerUtil();
 
diff --git a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsKeys.java b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsKeys.java
index eb9dbf27f2d..4a18a5d6ce6 100644
--- a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsKeys.java
+++ b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.util;
diff --git a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsValues.java b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsValues.java
index e6e66e63c56..580ef0caf5e 100644
--- a/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsValues.java
+++ b/hooks/deploy-listener-hook/docroot/WEB-INF/src/com/liferay/deploylistener/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.util;
diff --git a/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/hook/sanitizer/EmailToMBMessageFilterSanitizerImpl.java b/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/hook/sanitizer/EmailToMBMessageFilterSanitizerImpl.java
index 5f0af243476..63dd6be983b 100644
--- a/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/hook/sanitizer/EmailToMBMessageFilterSanitizerImpl.java
+++ b/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/hook/sanitizer/EmailToMBMessageFilterSanitizerImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.emailtombfilter.hook.sanitizer;
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  */
 public class EmailToMBMessageFilterSanitizerImpl implements Sanitizer {
 
-	@Override
+
 	public byte[] sanitize(
 		long companyId, long groupId, long userId, String className,
 		long classPK, String contentType, String[] modes, byte[] bytes,
@@ -47,7 +47,7 @@ public class EmailToMBMessageFilterSanitizerImpl implements Sanitizer {
 		return bytes;
 	}
 
-	@Override
+
 	public void sanitize(
 			long companyId, long groupId, long userId, String className,
 			long classPK, String contentType, String[] modes,
@@ -63,7 +63,7 @@ public class EmailToMBMessageFilterSanitizerImpl implements Sanitizer {
 		}
 	}
 
-	@Override
+
 	public String sanitize(
 		long companyId, long groupId, long userId, String className,
 		long classPK, String contentType, String[] modes, String s,
diff --git a/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsKeys.java b/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsKeys.java
index eba4b42453a..92a0ade0d6c 100644
--- a/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsKeys.java
+++ b/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.emailtombfilter.util;
diff --git a/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsValues.java b/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsValues.java
index 441661df268..cc23f553991 100644
--- a/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsValues.java
+++ b/hooks/email-to-mb-filter-hook/docroot/WEB-INF/src/com/liferay/emailtombfilter/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.emailtombfilter.util;
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/events/StartupAction.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/events/StartupAction.java
index acd95ae27a8..03c42d65917 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/events/StartupAction.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/events/StartupAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.events;
@@ -38,7 +38,7 @@ import com.liferay.portal.kernel.util.Validator;
  */
 public class StartupAction extends SimpleAction {
 
-	@Override
+
 	public void run(String[] ids) throws ActionException {
 		try {
 			if ((PortletPropsValues.EMAIL_LARGE_GROUP_SIZE >= 0) &&
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/GroupModelListener.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/GroupModelListener.java
index de0a5630d1e..5f1ec9324dd 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/GroupModelListener.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/GroupModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.hook.listeners;
@@ -43,7 +43,7 @@ import java.util.concurrent.Callable;
  */
 public class GroupModelListener extends BaseModelListener<Group> {
 
-	@Override
+
 	public void onAfterAddAssociation(
 		Object classPK, String associationClassName,
 		Object associationClassPK) {
@@ -56,7 +56,7 @@ public class GroupModelListener extends BaseModelListener<Group> {
 
 			Callable<Void> callable = new Callable<Void>() {
 
-				@Override
+
 				public Void call() throws Exception {
 					MessageBusUtil.sendMessage(
 						DestinationNames.ASYNC_SERVICE,
@@ -75,7 +75,7 @@ public class GroupModelListener extends BaseModelListener<Group> {
 		}
 	}
 
-	@Override
+
 	public void onAfterCreate(Group group) {
 		if (!GoogleMailGroupsUtil.isSync(group)) {
 			return;
@@ -91,7 +91,7 @@ public class GroupModelListener extends BaseModelListener<Group> {
 		}
 	}
 
-	@Override
+
 	public void onAfterRemove(Group group) {
 		if (!GoogleMailGroupsUtil.isSync(group)) {
 			return;
@@ -106,7 +106,7 @@ public class GroupModelListener extends BaseModelListener<Group> {
 		}
 	}
 
-	@Override
+
 	public void onAfterRemoveAssociation(
 		Object classPK, String associationClassName,
 		Object associationClassPK) {
@@ -119,7 +119,7 @@ public class GroupModelListener extends BaseModelListener<Group> {
 
 			Callable<Void> callable = new Callable<Void>() {
 
-				@Override
+
 				public Void call() throws Exception {
 					MessageBusUtil.sendMessage(
 						DestinationNames.ASYNC_SERVICE,
@@ -176,7 +176,7 @@ public class GroupModelListener extends BaseModelListener<Group> {
 			_action = action;
 		}
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				if (_action.equals("addGroupMembers")) {
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/RoleModelListener.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/RoleModelListener.java
index e24da9f9ff9..628d7f57f8e 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/RoleModelListener.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/RoleModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.hook.listeners;
@@ -49,7 +49,7 @@ import java.util.concurrent.Callable;
  */
 public class RoleModelListener extends BaseModelListener<Role> {
 
-	@Override
+
 	public void onAfterAddAssociation(
 		Object classPK, String associationClassName,
 		Object associationClassPK) {
@@ -60,7 +60,7 @@ public class RoleModelListener extends BaseModelListener<Role> {
 
 			Callable<Void> callable = new Callable<Void>() {
 
-				@Override
+
 				public Void call() throws Exception {
 					MessageBusUtil.sendMessage(
 						DestinationNames.ASYNC_SERVICE,
@@ -78,7 +78,7 @@ public class RoleModelListener extends BaseModelListener<Role> {
 		}
 	}
 
-	@Override
+
 	public void onAfterRemoveAssociation(
 		Object classPK, String associationClassName,
 		Object associationClassPK) {
@@ -89,7 +89,7 @@ public class RoleModelListener extends BaseModelListener<Role> {
 
 			Callable<Void> callable = new Callable<Void>() {
 
-				@Override
+
 				public Void call() throws Exception {
 					MessageBusUtil.sendMessage(
 						DestinationNames.ASYNC_SERVICE,
@@ -162,7 +162,7 @@ public class RoleModelListener extends BaseModelListener<Role> {
 			_groupMemberRole = groupMemberRole;
 		}
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				GoogleMailGroupsUtil.updateGroupMemberRoles(
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/UserModelListener.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/UserModelListener.java
index 30c141d8447..d7dbb522aff 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/UserModelListener.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/listeners/UserModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.hook.listeners;
@@ -45,7 +45,7 @@ import java.util.concurrent.Callable;
  */
 public class UserModelListener extends BaseModelListener<User> {
 
-	@Override
+
 	public void onAfterAddAssociation(
 		Object classPK, String associationClassName,
 		Object associationClassPK) {
@@ -58,7 +58,7 @@ public class UserModelListener extends BaseModelListener<User> {
 
 			Callable<Void> callable = new Callable<Void>() {
 
-				@Override
+
 				public Void call() throws Exception {
 					MessageBusUtil.sendMessage(
 						DestinationNames.ASYNC_SERVICE,
@@ -77,7 +77,7 @@ public class UserModelListener extends BaseModelListener<User> {
 		}
 	}
 
-	@Override
+
 	public void onAfterRemoveAssociation(
 		Object classPK, String associationClassName,
 		Object associationClassPK) {
@@ -90,7 +90,7 @@ public class UserModelListener extends BaseModelListener<User> {
 
 			Callable<Void> callable = new Callable<Void>() {
 
-				@Override
+
 				public Void call() throws Exception {
 					MessageBusUtil.sendMessage(
 						DestinationNames.ASYNC_SERVICE,
@@ -147,7 +147,7 @@ public class UserModelListener extends BaseModelListener<User> {
 			_action = action;
 		}
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				for (Group group : _groups) {
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/service/impl/GoogleMailGroupsGroupLocalServiceImpl.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/service/impl/GoogleMailGroupsGroupLocalServiceImpl.java
index 031197af93f..c0098669bff 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/service/impl/GoogleMailGroupsGroupLocalServiceImpl.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/hook/service/impl/GoogleMailGroupsGroupLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.hook.service.impl;
@@ -49,7 +49,7 @@ public class GoogleMailGroupsGroupLocalServiceImpl
 		super(groupLocalService);
 	}
 
-	@Override
+
 	public Group updateFriendlyURL(long groupId, String friendlyURL)
 		throws PortalException {
 
@@ -69,7 +69,7 @@ public class GoogleMailGroupsGroupLocalServiceImpl
 		return group;
 	}
 
-	@Override
+
 	public Group updateGroup(
 			long groupId, long parentGroupId, String name, String description,
 			int type, boolean manualMembership, int membershipRestriction,
@@ -107,7 +107,7 @@ public class GoogleMailGroupsGroupLocalServiceImpl
 			_oldGroupEmailAddress = oldGroupEmailAddress;
 		}
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				if (_oldFriendlyURL.equals(_group.getFriendlyURL())) {
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/GoogleMailGroupsUtil.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/GoogleMailGroupsUtil.java
index 9c5ef238719..c46a4842072 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/GoogleMailGroupsUtil.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/GoogleMailGroupsUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.util;
@@ -165,7 +165,7 @@ public class GoogleMailGroupsUtil {
 		actionableDynamicQuery.setPerformActionMethod(
 			new ActionableDynamicQuery.PerformActionMethod<Group>() {
 
-				@Override
+
 				public void performAction(Group group) throws PortalException {
 					if (!isSync(group)) {
 						return;
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsKeys.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsKeys.java
index 93071a77f4e..59fb606c514 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsKeys.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.util;
diff --git a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsValues.java b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsValues.java
index 38273e20450..eba8fcf2724 100644
--- a/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsValues.java
+++ b/hooks/google-mail-groups-hook/docroot/WEB-INF/src/com/liferay/google/mail/groups/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.groups.util;
diff --git a/hooks/google-mail-users-hook/docroot/WEB-INF/src/com/liferay/google/mail/users/hook/mail/GoogleMailUsersHook.java b/hooks/google-mail-users-hook/docroot/WEB-INF/src/com/liferay/google/mail/users/hook/mail/GoogleMailUsersHook.java
index 923a3b5691a..8639f67530d 100644
--- a/hooks/google-mail-users-hook/docroot/WEB-INF/src/com/liferay/google/mail/users/hook/mail/GoogleMailUsersHook.java
+++ b/hooks/google-mail-users-hook/docroot/WEB-INF/src/com/liferay/google/mail/users/hook/mail/GoogleMailUsersHook.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.mail.users.hook.mail;
@@ -39,13 +39,13 @@ import java.util.List;
  */
 public class GoogleMailUsersHook implements Hook {
 
-	@Override
+
 	public void addForward(
 		long companyId, long userId, List<Filter> filters,
 		List<String> emailAddresses, boolean leaveCopy) {
 	}
 
-	@Override
+
 	public void addUser(
 		long companyId, long userId, String password, String firstName,
 		String middleName, String lastName, String emailAddress) {
@@ -71,13 +71,13 @@ public class GoogleMailUsersHook implements Hook {
 		}
 	}
 
-	@Override
+
 	public void addVacationMessage(
 		long companyId, long userId, String emailAddress,
 		String vacationMessage) {
 	}
 
-	@Override
+
 	public void deleteEmailAddress(long companyId, long userId) {
 		try {
 			String primaryEmailAddress = _getPrimaryEmailAddress(
@@ -93,7 +93,7 @@ public class GoogleMailUsersHook implements Hook {
 		}
 	}
 
-	@Override
+
 	public void deleteUser(long companyId, long userId) {
 		try {
 			String primaryEmailAddress = _getPrimaryEmailAddress(
@@ -106,12 +106,12 @@ public class GoogleMailUsersHook implements Hook {
 		}
 	}
 
-	@Override
+
 	public void updateBlocked(
 		long companyId, long userId, List<String> blocked) {
 	}
 
-	@Override
+
 	public void updateEmailAddress(
 		long companyId, long userId, String emailAddress) {
 
@@ -133,7 +133,7 @@ public class GoogleMailUsersHook implements Hook {
 		}
 	}
 
-	@Override
+
 	public void updatePassword(long companyId, long userId, String password) {
 		try {
 			String primaryEmailAddress = _getPrimaryEmailAddress(
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf
index 1118a7c5c03..228e109eca3 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf
index 640984e154a..58f2b1dab71 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf
index 539670eeb97..c0b50026d1d 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf
index 7cad853d1ce..bae8cd20c7f 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf
index 732b54114e6..187e9aca66b 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf
index e4dc9487db1..1a0903fb6b6 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf
index a5a66b6e1c8..aa1bb9f2922 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf
index 834b59fc85f..d5fa784324c 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf
index ffbd87e9c3e..1ce44103a5e 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf
index 439147800ff..267e9195e1a 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf
index 750f3123dec..93ddac8e7f4 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf
index 0b3bfda9114..fab540a7770 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf
index 43162b65cdf..2ff74d7b2d2 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf
index ec9ec17db1b..30ae9d620ad 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf
index a8498e001ad..31fa431b6f3 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf
index 2cd616883e1..7ee7190f89b 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf
index 23df88558bf..eb56638ac1c 100644
--- a/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf
+++ b/hooks/localization-ja-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf
index 1118a7c5c03..228e109eca3 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/setup_wizard_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf
index 640984e154a..58f2b1dab71 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portal/update_reminder_query_question.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf
index a7580a8d879..88a3bd5723a 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/common/addresses_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf
index 7cad853d1ce..bae8cd20c7f 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user/search_columns_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf
index 732b54114e6..187e9aca66b 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/directory/user_search_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf
index e4dc9487db1..1a0903fb6b6 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/login/create_account_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf
index a5a66b6e1c8..aa1bb9f2922 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/authentication/open_sso_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf
index 834b59fc85f..d5fa784324c 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/edit_ldap_server_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf
index ffbd87e9c3e..1ce44103a5e 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/portal_settings/test_ldap_users_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf
index 439147800ff..267e9195e1a 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_billing_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf
index 750f3123dec..93ddac8e7f4 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_first_shipping_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf
index 0b3bfda9114..fab540a7770 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_billing_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf
index 43162b65cdf..2ff74d7b2d2 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/checkout_second_shipping_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf
index ec9ec17db1b..30ae9d620ad 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/shopping/order_search_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf
index b4abcae7f32..751cae1b047 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/common/addresses_address.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf
index 2cd616883e1..7ee7190f89b 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/details_user_name.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf
index 23df88558bf..eb56638ac1c 100644
--- a/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf
+++ b/hooks/localization-zh-hook/docroot/META-INF/custom_jsps/html/portlet/users_admin/user/password_reminder_query_question.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/localization-zh-hook/docroot/WEB-INF/src/com/liferay/localization/zh/hook/security/auth/ChineseFullNameGenerator.java b/hooks/localization-zh-hook/docroot/WEB-INF/src/com/liferay/localization/zh/hook/security/auth/ChineseFullNameGenerator.java
index 59b9104530c..9dacb59e0c1 100644
--- a/hooks/localization-zh-hook/docroot/WEB-INF/src/com/liferay/localization/zh/hook/security/auth/ChineseFullNameGenerator.java
+++ b/hooks/localization-zh-hook/docroot/WEB-INF/src/com/liferay/localization/zh/hook/security/auth/ChineseFullNameGenerator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.zh.hook.security.auth;
@@ -25,7 +25,7 @@ import com.liferay.portal.kernel.util.Validator;
  */
 public class ChineseFullNameGenerator extends FamilyNameFirstFullNameGenerator {
 
-	@Override
+
 	public String[] splitFullName(String fullName) {
 		if (!LocalizationZHUtil.isCJKUnifiedIdeographString(fullName)) {
 			return super.splitFullName(fullName);
@@ -47,7 +47,7 @@ public class ChineseFullNameGenerator extends FamilyNameFirstFullNameGenerator {
 		return new String[] {firstName, middleName, lastName};
 	}
 
-	@Override
+
 	protected String buildFullName(
 		String firstName, String middleName, String lastName,
 		boolean useInitials) {
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/events/StartupAction.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/events/StartupAction.java
index 753ab6cbee2..6a16c6b45ed 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/events/StartupAction.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/events/StartupAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.events;
@@ -21,12 +21,12 @@ import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.util.GetterUtil;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class StartupAction extends SimpleAction {
 
-	@Override
+
 	public void run(String[] ids) throws ActionException {
 		try {
 			doRun(ids);
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoColumnModelListener.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoColumnModelListener.java
index 602697b4cfa..83083a9a117 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoColumnModelListener.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoColumnModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.listeners;
@@ -27,13 +27,13 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class ExpandoColumnModelListener
 	extends BaseModelListener<ExpandoColumn> {
 
-	@Override
+
 	public void onAfterRemove(ExpandoColumn expandoColumn)
 		throws ModelListenerException {
 
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoTableModelListener.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoTableModelListener.java
index a8933561bd0..9000b7fc408 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoTableModelListener.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/listeners/ExpandoTableModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.listeners;
@@ -23,12 +23,12 @@ import com.mongodb.DB;
 import com.mongodb.DBCollection;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class ExpandoTableModelListener extends BaseModelListener<ExpandoTable> {
 
-	@Override
+
 	public void onAfterCreate(ExpandoTable expandoTable) {
 		DB db = MongoDBUtil.getDB(expandoTable.getCompanyId());
 
@@ -48,7 +48,7 @@ public class ExpandoTableModelListener extends BaseModelListener<ExpandoTable> {
 		}
 	}
 
-	@Override
+
 	public void onAfterRemove(ExpandoTable expandoTable) {
 		DB db = MongoDBUtil.getDB(expandoTable.getCompanyId());
 
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoColumnLocalServiceImpl.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoColumnLocalServiceImpl.java
index 6f01dd3eb7a..838d6e5f3a4 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoColumnLocalServiceImpl.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoColumnLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.service.impl;
@@ -31,7 +31,7 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoExpandoColumnLocalServiceImpl
@@ -43,7 +43,7 @@ public class MongoExpandoColumnLocalServiceImpl
 		super(expandoColumnLocalService);
 	}
 
-	@Override
+
 	public ExpandoColumn updateColumn(
 			long columnId, String name, int type, Object defaultData)
 		throws PortalException {
@@ -65,7 +65,7 @@ public class MongoExpandoColumnLocalServiceImpl
 		return expandoColumn;
 	}
 
-	@Override
+
 	public ExpandoColumn updateTypeSettings(long columnId, String typeSettings)
 		throws PortalException {
 
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoRowLocalServiceImpl.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoRowLocalServiceImpl.java
index e990fa61fb8..97db97cabd7 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoRowLocalServiceImpl.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoRowLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.service.impl;
@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoExpandoRowLocalServiceImpl
@@ -46,17 +46,17 @@ public class MongoExpandoRowLocalServiceImpl
 		super(expandoRowLocalService);
 	}
 
-	@Override
+
 	public ExpandoRow addRow(long tableId, long classPK) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void deleteRow(long rowId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void deleteRow(long tableId, long classPK) throws PortalException {
 		ExpandoTable expandoTable = ExpandoTableLocalServiceUtil.getTable(
 			tableId);
@@ -66,12 +66,12 @@ public class MongoExpandoRowLocalServiceImpl
 		dbCollection.remove(new BasicDBObject("classPK", classPK));
 	}
 
-	@Override
+
 	public ExpandoRow getRow(long rowId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public ExpandoRow getRow(long tableId, long classPK)
 		throws PortalException {
 
@@ -81,7 +81,7 @@ public class MongoExpandoRowLocalServiceImpl
 		return getRow(expandoTable, classPK);
 	}
 
-	@Override
+
 	public ExpandoRow getRow(
 		long companyId, long classNameId, String tableName, long classPK) {
 
@@ -96,7 +96,7 @@ public class MongoExpandoRowLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public List<ExpandoRow> getRows(long tableId, int start, int end) {
 		try {
 			ExpandoTable expandoTable = ExpandoTableLocalServiceUtil.getTable(
@@ -109,7 +109,7 @@ public class MongoExpandoRowLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public List<ExpandoRow> getRows(
 		long companyId, long classNameId, String tableName, int start,
 		int end) {
@@ -125,7 +125,7 @@ public class MongoExpandoRowLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public int getRowsCount(long tableId) {
 		try {
 			ExpandoTable expandoTable = ExpandoTableLocalServiceUtil.getTable(
@@ -140,7 +140,7 @@ public class MongoExpandoRowLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public int getRowsCount(
 		long companyId, long classNameId, String tableName) {
 
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoTableLocalServiceImpl.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoTableLocalServiceImpl.java
index d9f0b34c2ad..224b46ea80f 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoTableLocalServiceImpl.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoTableLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.service.impl;
@@ -25,7 +25,7 @@ import com.mongodb.DB;
 import com.mongodb.DBCollection;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoExpandoTableLocalServiceImpl
@@ -37,7 +37,7 @@ public class MongoExpandoTableLocalServiceImpl
 		super(expandoTableLocalService);
 	}
 
-	@Override
+
 	public ExpandoTable updateTable(long tableId, String name)
 		throws PortalException {
 
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoValueLocalServiceImpl.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoValueLocalServiceImpl.java
index 09d1110033f..78ffecb05d2 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoValueLocalServiceImpl.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/hook/service/impl/MongoExpandoValueLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.hook.service.impl;
@@ -47,7 +47,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoExpandoValueLocalServiceImpl
@@ -59,7 +59,7 @@ public class MongoExpandoValueLocalServiceImpl
 		super(expandoValueLocalService);
 	}
 
-	@Override
+
 	public ExpandoValue addValue(
 			long classNameId, long tableId, long columnId, long classPK,
 			String data)
@@ -122,7 +122,7 @@ public class MongoExpandoValueLocalServiceImpl
 		return expandoValue;
 	}
 
-	@Override
+
 	public void addValues(
 			long classNameId, long tableId, List<ExpandoColumn> expandoColumns,
 			long classPK, Map<String, String> data)
@@ -180,7 +180,7 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public void deleteColumnValues(long columnId) {
 		try {
 			ExpandoColumn expandoColumn = ExpandoColumnUtil.fetchByPrimaryKey(
@@ -207,12 +207,12 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public void deleteRowValues(long rowId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void deleteTableValues(long tableId) {
 		try {
 			ExpandoTable expandoTable = ExpandoTableLocalServiceUtil.getTable(
@@ -240,12 +240,12 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public void deleteValue(long valueId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void deleteValue(long columnId, long rowId) throws PortalException {
 		ExpandoColumn expandoColumn = ExpandoColumnLocalServiceUtil.getColumn(
 			columnId);
@@ -258,7 +258,7 @@ public class MongoExpandoValueLocalServiceImpl
 			expandoTable.getName(), expandoColumn.getName(), rowId);
 	}
 
-	@Override
+
 	public void deleteValue(
 			long companyId, long classNameId, String tableName,
 			String columnName, long classPK)
@@ -287,7 +287,7 @@ public class MongoExpandoValueLocalServiceImpl
 		dbCollection.update(queryDBObject, operatorDBObject);
 	}
 
-	@Override
+
 	public void deleteValues(long classNameId, long classPK) {
 		long companyId = CompanyThreadLocal.getCompanyId();
 
@@ -309,7 +309,7 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public List<ExpandoValue> getColumnValues(
 		long columnId, int start, int end) {
 
@@ -330,7 +330,7 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public List<ExpandoValue> getColumnValues(
 		long companyId, long classNameId, String tableName, String columnName,
 		String data, int start, int end) {
@@ -384,7 +384,7 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public int getColumnValuesCount(long columnId) {
 		try {
 			ExpandoColumn expandoColumn =
@@ -402,7 +402,7 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public int getColumnValuesCount(
 		long companyId, long classNameId, String tableName, String columnName,
 		String data) {
@@ -441,17 +441,17 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public List<ExpandoValue> getRowValues(long rowId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public List<ExpandoValue> getRowValues(long rowId, int start, int end) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public List<ExpandoValue> getRowValues(
 		long companyId, long classNameId, String tableName, long classPK,
 		int start, int end) {
@@ -501,12 +501,12 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public int getRowValuesCount(long rowId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public int getRowValuesCount(
 		long companyId, long classNameId, String tableName, long classPK) {
 
@@ -522,12 +522,12 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public ExpandoValue getValue(long valueId) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public ExpandoValue getValue(long columnId, long rowId)
 		throws PortalException {
 
@@ -542,7 +542,7 @@ public class MongoExpandoValueLocalServiceImpl
 			expandoTable.getName(), expandoColumn.getName(), rowId);
 	}
 
-	@Override
+
 	public ExpandoValue getValue(long tableId, long columnId, long classPK) {
 		try {
 			ExpandoTable expandoTable = ExpandoTableLocalServiceUtil.getTable(
@@ -560,7 +560,7 @@ public class MongoExpandoValueLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public ExpandoValue getValue(
 		long companyId, long classNameId, String tableName, String columnName,
 		long classPK) {
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoConditional.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoConditional.java
index b1f949f6a4a..0becc4996d0 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoConditional.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoConditional.java
@@ -1,21 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.lang;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoConditional {
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoOperator.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoOperator.java
index 19e40c85495..3db62101965 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoOperator.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/lang/MongoOperator.java
@@ -1,21 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.lang;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoOperator {
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/servlet/MongoServletContextListener.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/servlet/MongoServletContextListener.java
index d7b53110394..58a71f7fc87 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/servlet/MongoServletContextListener.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/servlet/MongoServletContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.servlet;
@@ -23,30 +23,30 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoServletContextListener
 	extends BasePortalLifecycle implements ServletContextListener {
 
-	@Override
+
 	public void contextDestroyed(ServletContextEvent servletContextEvent) {
 		portalDestroy();
 	}
 
-	@Override
+
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		registerPortalLifecycle();
 	}
 
-	@Override
+
 	protected void doPortalDestroy() throws Exception {
 		Mongo mongo = MongoDBUtil.getMongo();
 
 		mongo.close();
 	}
 
-	@Override
+
 	protected void doPortalInit() {
 	}
 
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/MongoDBUtil.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/MongoDBUtil.java
index 9dc8e6ff1a6..be011350cf2 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/MongoDBUtil.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/MongoDBUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.util;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class MongoDBUtil {
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsKeys.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsKeys.java
index 6ec82adadfe..a36d52088b7 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsKeys.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsKeys.java
@@ -1,21 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.util;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public interface PortletPropsKeys {
diff --git a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsValues.java b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsValues.java
index 061989ee927..236a17f6c32 100644
--- a/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsValues.java
+++ b/hooks/mongodb-hook/docroot/WEB-INF/src/com/liferay/mongodb/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mongodb.util;
@@ -18,7 +18,7 @@ import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.util.portlet.PortletProps;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  * @author Brian Wing Shun Chan
  */
 public class PortletPropsValues {
diff --git a/hooks/sample-servlet-filter-hook/docroot/WEB-INF/src/com/liferay/sampleservletfilter/hook/filter/SampleFilter.java b/hooks/sample-servlet-filter-hook/docroot/WEB-INF/src/com/liferay/sampleservletfilter/hook/filter/SampleFilter.java
index eb2b8c1be43..95637408e62 100644
--- a/hooks/sample-servlet-filter-hook/docroot/WEB-INF/src/com/liferay/sampleservletfilter/hook/filter/SampleFilter.java
+++ b/hooks/sample-servlet-filter-hook/docroot/WEB-INF/src/com/liferay/sampleservletfilter/hook/filter/SampleFilter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservletfilter.hook.filter;
@@ -30,12 +30,12 @@ import javax.servlet.ServletResponse;
  */
 public class SampleFilter implements Filter {
 
-	@Override
+
 	public void destroy() {
 		System.out.println("Called SampleFilter.destroy()");
 	}
 
-	@Override
+
 	public void doFilter(
 			ServletRequest servletRequest, ServletResponse servletResponse,
 			FilterChain filterChain)
@@ -51,7 +51,7 @@ public class SampleFilter implements Filter {
 		filterChain.doFilter(servletRequest, servletResponse);
 	}
 
-	@Override
+
 	public void init(FilterConfig filterConfig) {
 		System.out.println(
 			"Called SampleFilter.init(" + filterConfig + ") where hello=" +
diff --git a/hooks/sample-struts-action-hook/docroot/META-INF/custom_jsps/html/portal/sample.jsp b/hooks/sample-struts-action-hook/docroot/META-INF/custom_jsps/html/portal/sample.jsp
index a2f31450778..54c5c4893c9 100644
--- a/hooks/sample-struts-action-hook/docroot/META-INF/custom_jsps/html/portal/sample.jsp
+++ b/hooks/sample-struts-action-hook/docroot/META-INF/custom_jsps/html/portal/sample.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsAction.java b/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsAction.java
index f8422c685e2..187a9c459ce 100644
--- a/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsAction.java
+++ b/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestrutsaction.hook.action;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class SampleStrutsAction extends BaseStrutsAction {
 
-	@Override
+
 	public String execute(
 			HttpServletRequest request, HttpServletResponse response)
 		throws Exception {
diff --git a/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsPortletAction.java b/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsPortletAction.java
index 6367b6ceecc..e0b65445377 100644
--- a/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsPortletAction.java
+++ b/hooks/sample-struts-action-hook/docroot/WEB-INF/src/com/liferay/samplestrutsaction/hook/action/SampleStrutsPortletAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestrutsaction.hook.action;
@@ -30,7 +30,7 @@ import javax.portlet.ResourceResponse;
  */
 public class SampleStrutsPortletAction extends BaseStrutsPortletAction {
 
-	@Override
+
 	public void processAction(
 			StrutsPortletAction originalStrutsPortletAction,
 			PortletConfig portletConfig, ActionRequest actionRequest,
@@ -41,7 +41,7 @@ public class SampleStrutsPortletAction extends BaseStrutsPortletAction {
 			portletConfig, actionRequest, actionResponse);
 	}
 
-	@Override
+
 	public String render(
 			StrutsPortletAction originalStrutsPortletAction,
 			PortletConfig portletConfig, RenderRequest renderRequest,
@@ -57,7 +57,7 @@ public class SampleStrutsPortletAction extends BaseStrutsPortletAction {
 			portletConfig, renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void serveResource(
 			StrutsPortletAction originalStrutsPortletAction,
 			PortletConfig portletConfig, ResourceRequest resourceRequest,
diff --git a/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/model/impl/SampleWrapperUserImpl.java b/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/model/impl/SampleWrapperUserImpl.java
index 06475233d71..19ba1a665a6 100644
--- a/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/model/impl/SampleWrapperUserImpl.java
+++ b/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/model/impl/SampleWrapperUserImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplewrapper.hook.model.impl;
@@ -30,7 +30,7 @@ public class SampleWrapperUserImpl extends UserWrapper {
 		return "Green";
 	}
 
-	@Override
+
 	public String getFirstName() {
 		System.out.println("Called SampleWrapperUserImpl.getFirstName()");
 
diff --git a/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/service/impl/SampleWrapperUserLocalServiceImpl.java b/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/service/impl/SampleWrapperUserLocalServiceImpl.java
index 695054017aa..c22b9dbcd26 100644
--- a/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/service/impl/SampleWrapperUserLocalServiceImpl.java
+++ b/hooks/sample-wrapper-hook/docroot/WEB-INF/src/com/liferay/samplewrapper/hook/service/impl/SampleWrapperUserLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplewrapper.hook.service.impl;
@@ -31,7 +31,7 @@ public class SampleWrapperUserLocalServiceImpl extends UserLocalServiceWrapper {
 		super(userLocalService);
 	}
 
-	@Override
+
 	public User getUserById(long userId) throws PortalException {
 		System.out.println(
 			"Called SampleWrapperUserLocalServiceImpl.getUserById(" + userId +
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/addthis.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/addthis.jsp
index c84bb0eb741..9af29a87756 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/addthis.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/addthis.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/digg.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/digg.jsp
index 49fec9d3d1d..ed7220c92b2 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/digg.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/digg.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/evernote.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/evernote.jsp
index d4b785a600e..40db55eb571 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/evernote.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/evernote.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/linkedin.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/linkedin.jsp
index ba8cef677ef..21b1723656d 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/linkedin.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/linkedin.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/reddit.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/reddit.jsp
index 4e2eb638278..d1770e23b21 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/reddit.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/reddit.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/slashdot.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/slashdot.jsp
index 73f9621f9f8..3f848b05dcb 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/slashdot.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/slashdot.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/stumbleupon.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/stumbleupon.jsp
index a3356fd01f0..6ab866bae28 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/stumbleupon.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/stumbleupon.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/tuenti.jsp b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/tuenti.jsp
index fabb2eb0c2c..0c16843c721 100644
--- a/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/tuenti.jsp
+++ b/hooks/social-bookmarks-hook/docroot/META-INF/custom_jsps/html/taglib/ui/social_bookmark/tuenti.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/misc/jalopy.xml b/misc/jalopy.xml
index 03ba99e0ad0..526b61b7c55 100644
--- a/misc/jalopy.xml
+++ b/misc/jalopy.xml
@@ -33,15 +33,15 @@
 <text>/**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */</text>
 <use>true</use>
 </header>
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/message_boards/view_message_content.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/message_boards/view_message_content.jsp
index ea4f3f98034..5f283b37eaf 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/message_boards/view_message_content.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/message_boards/view_message_content.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/init-ext.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/init-ext.jsp
index 0046a046a06..0e3f1be121f 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/init-ext.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/init-ext.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/page_history_action.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/page_history_action.jsp
index 38d5dbb803e..db93a1be3f7 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/page_history_action.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/page_history_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view.jsp
index 26eb1e2364f..34352d68750 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view_page_content.jspf b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view_page_content.jspf
index 64a81a83f5b..b416628b4a7 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view_page_content.jspf
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/portlet/wiki/view_page_content.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/aui/workflow_status/page.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/aui/workflow_status/page.jsp
index e2be589e885..a4dcfc89391 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/aui/workflow_status/page.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/aui/workflow_status/page.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/page.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/page.jsp
index def639297d1..ddaf3ee5852 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/page.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/page.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/view_message_thread.jsp b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/view_message_thread.jsp
index 4b880203d1d..98449b730c0 100644
--- a/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/view_message_thread.jsp
+++ b/portlets/akismet-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/discussion/view_message_thread.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/exception/NoSuchDataException.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/exception/NoSuchDataException.java
index b919c504b21..d30debba5fa 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/exception/NoSuchDataException.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/exception/NoSuchDataException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.exception;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetData.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetData.java
index a393362ecf5..e8a1158466c 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetData.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetData.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model;
@@ -38,17 +38,17 @@ public interface AkismetData extends AkismetDataModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.akismet.model.impl.AkismetDataImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<AkismetData, Long> AKISMET_DATA_ID_ACCESSOR = new Accessor<AkismetData, Long>() {
-			@Override
+
 			public Long get(AkismetData akismetData) {
 				return akismetData.getAkismetDataId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<AkismetData> getTypeClass() {
 				return AkismetData.class;
 			}
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataClp.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataClp.java
index ddf9d606149..3bd4a8931cc 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataClp.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model;
@@ -46,37 +46,37 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 	public AkismetDataClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return AkismetData.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return AkismetData.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _akismetDataId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setAkismetDataId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _akismetDataId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -97,7 +97,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long akismetDataId = (Long)attributes.get("akismetDataId");
 
@@ -163,12 +163,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getAkismetDataId() {
 		return _akismetDataId;
 	}
 
-	@Override
+
 	public void setAkismetDataId(long akismetDataId) {
 		_akismetDataId = akismetDataId;
 
@@ -186,12 +186,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -209,7 +209,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getClassName() {
 		if (getClassNameId() <= 0) {
 			return StringPool.BLANK;
@@ -218,7 +218,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		return PortalUtil.getClassName(getClassNameId());
 	}
 
-	@Override
+
 	public void setClassName(String className) {
 		long classNameId = 0;
 
@@ -229,12 +229,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		setClassNameId(classNameId);
 	}
 
-	@Override
+
 	public long getClassNameId() {
 		return _classNameId;
 	}
 
-	@Override
+
 	public void setClassNameId(long classNameId) {
 		_classNameId = classNameId;
 
@@ -252,12 +252,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public long getClassPK() {
 		return _classPK;
 	}
 
-	@Override
+
 	public void setClassPK(long classPK) {
 		_classPK = classPK;
 
@@ -275,12 +275,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getType() {
 		return _type;
 	}
 
-	@Override
+
 	public void setType(String type) {
 		_type = type;
 
@@ -298,12 +298,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getPermalink() {
 		return _permalink;
 	}
 
-	@Override
+
 	public void setPermalink(String permalink) {
 		_permalink = permalink;
 
@@ -321,12 +321,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getReferrer() {
 		return _referrer;
 	}
 
-	@Override
+
 	public void setReferrer(String referrer) {
 		_referrer = referrer;
 
@@ -344,12 +344,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getUserAgent() {
 		return _userAgent;
 	}
 
-	@Override
+
 	public void setUserAgent(String userAgent) {
 		_userAgent = userAgent;
 
@@ -367,12 +367,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getUserIP() {
 		return _userIP;
 	}
 
-	@Override
+
 	public void setUserIP(String userIP) {
 		_userIP = userIP;
 
@@ -390,12 +390,12 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public String getUserURL() {
 		return _userURL;
 	}
 
-	@Override
+
 	public void setUserURL(String userURL) {
 		_userURL = userURL;
 
@@ -462,7 +462,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			AkismetDataLocalServiceUtil.addAkismetData(this);
@@ -472,13 +472,13 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public AkismetData toEscapedModel() {
 		return (AkismetData)ProxyUtil.newProxyInstance(AkismetData.class.getClassLoader(),
 			new Class[] { AkismetData.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		AkismetDataClp clone = new AkismetDataClp();
 
@@ -496,7 +496,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(AkismetData akismetData) {
 		long primaryKey = akismetData.getPrimaryKey();
 
@@ -511,7 +511,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -537,22 +537,22 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -581,7 +581,7 @@ public class AkismetDataClp extends BaseModelImpl<AkismetData>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataModel.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataModel.java
index 473306e86c4..09ad576048c 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataModel.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model;
@@ -96,7 +96,7 @@ public interface AkismetDataModel extends AttachedModel, BaseModel<AkismetData>
 	 *
 	 * @return the fully qualified class name of this akismet data
 	 */
-	@Override
+
 	public String getClassName();
 
 	public void setClassName(String className);
@@ -106,7 +106,7 @@ public interface AkismetDataModel extends AttachedModel, BaseModel<AkismetData>
 	 *
 	 * @return the class name ID of this akismet data
 	 */
-	@Override
+
 	public long getClassNameId();
 
 	/**
@@ -114,7 +114,7 @@ public interface AkismetDataModel extends AttachedModel, BaseModel<AkismetData>
 	 *
 	 * @param classNameId the class name ID of this akismet data
 	 */
-	@Override
+
 	public void setClassNameId(long classNameId);
 
 	/**
@@ -122,7 +122,7 @@ public interface AkismetDataModel extends AttachedModel, BaseModel<AkismetData>
 	 *
 	 * @return the class p k of this akismet data
 	 */
-	@Override
+
 	public long getClassPK();
 
 	/**
@@ -130,7 +130,7 @@ public interface AkismetDataModel extends AttachedModel, BaseModel<AkismetData>
 	 *
 	 * @param classPK the class p k of this akismet data
 	 */
-	@Override
+
 	public void setClassPK(long classPK);
 
 	/**
@@ -223,60 +223,60 @@ public interface AkismetDataModel extends AttachedModel, BaseModel<AkismetData>
 	 */
 	public void setUserURL(String userURL);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.akismet.model.AkismetData akismetData);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.akismet.model.AkismetData> toCacheModel();
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData toEscapedModel();
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataSoap.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataSoap.java
index 1c387b1178b..17ad715e807 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataSoap.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataWrapper.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataWrapper.java
index f0cd00646cf..b05075f3ff0 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataWrapper.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/model/AkismetDataWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model;
@@ -44,17 +44,17 @@ public class AkismetDataWrapper implements AkismetData,
 		_akismetData = akismetData;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return AkismetData.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return AkismetData.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -72,7 +72,7 @@ public class AkismetDataWrapper implements AkismetData,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long akismetDataId = (Long)attributes.get("akismetDataId");
 
@@ -135,57 +135,57 @@ public class AkismetDataWrapper implements AkismetData,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _akismetData.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _akismetData.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _akismetData.isNew();
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData toEscapedModel() {
 		return new AkismetDataWrapper(_akismetData.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData toUnescapedModel() {
 		return new AkismetDataWrapper(_akismetData.toUnescapedModel());
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _akismetData.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.akismet.model.AkismetData> toCacheModel() {
 		return _akismetData.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.akismet.model.AkismetData akismetData) {
 		return _akismetData.compareTo(akismetData);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _akismetData.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _akismetData.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new AkismetDataWrapper((AkismetData)_akismetData.clone());
 	}
@@ -195,7 +195,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the fully qualified class name of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getClassName() {
 		return _akismetData.getClassName();
 	}
@@ -205,7 +205,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the permalink of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getPermalink() {
 		return _akismetData.getPermalink();
 	}
@@ -215,7 +215,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the referrer of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getReferrer() {
 		return _akismetData.getReferrer();
 	}
@@ -225,7 +225,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the type of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getType() {
 		return _akismetData.getType();
 	}
@@ -235,7 +235,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the user agent of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getUserAgent() {
 		return _akismetData.getUserAgent();
 	}
@@ -245,7 +245,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the user i p of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getUserIP() {
 		return _akismetData.getUserIP();
 	}
@@ -255,17 +255,17 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the user u r l of this akismet data
 	*/
-	@Override
+
 	public java.lang.String getUserURL() {
 		return _akismetData.getUserURL();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _akismetData.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _akismetData.toXmlString();
 	}
@@ -275,7 +275,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the modified date of this akismet data
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _akismetData.getModifiedDate();
 	}
@@ -285,7 +285,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the akismet data ID of this akismet data
 	*/
-	@Override
+
 	public long getAkismetDataId() {
 		return _akismetData.getAkismetDataId();
 	}
@@ -295,7 +295,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the class name ID of this akismet data
 	*/
-	@Override
+
 	public long getClassNameId() {
 		return _akismetData.getClassNameId();
 	}
@@ -305,7 +305,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the class p k of this akismet data
 	*/
-	@Override
+
 	public long getClassPK() {
 		return _akismetData.getClassPK();
 	}
@@ -315,12 +315,12 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @return the primary key of this akismet data
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _akismetData.getPrimaryKey();
 	}
 
-	@Override
+
 	public void persist() {
 		_akismetData.persist();
 	}
@@ -330,17 +330,17 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param akismetDataId the akismet data ID of this akismet data
 	*/
-	@Override
+
 	public void setAkismetDataId(long akismetDataId) {
 		_akismetData.setAkismetDataId(akismetDataId);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_akismetData.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setClassName(java.lang.String className) {
 		_akismetData.setClassName(className);
 	}
@@ -350,7 +350,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param classNameId the class name ID of this akismet data
 	*/
-	@Override
+
 	public void setClassNameId(long classNameId) {
 		_akismetData.setClassNameId(classNameId);
 	}
@@ -360,23 +360,23 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param classPK the class p k of this akismet data
 	*/
-	@Override
+
 	public void setClassPK(long classPK) {
 		_akismetData.setClassPK(classPK);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_akismetData.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_akismetData.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_akismetData.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -386,12 +386,12 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param modifiedDate the modified date of this akismet data
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_akismetData.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_akismetData.setNew(n);
 	}
@@ -401,7 +401,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param permalink the permalink of this akismet data
 	*/
-	@Override
+
 	public void setPermalink(java.lang.String permalink) {
 		_akismetData.setPermalink(permalink);
 	}
@@ -411,12 +411,12 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param primaryKey the primary key of this akismet data
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_akismetData.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_akismetData.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -426,7 +426,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param referrer the referrer of this akismet data
 	*/
-	@Override
+
 	public void setReferrer(java.lang.String referrer) {
 		_akismetData.setReferrer(referrer);
 	}
@@ -436,7 +436,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param type the type of this akismet data
 	*/
-	@Override
+
 	public void setType(java.lang.String type) {
 		_akismetData.setType(type);
 	}
@@ -446,7 +446,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param userAgent the user agent of this akismet data
 	*/
-	@Override
+
 	public void setUserAgent(java.lang.String userAgent) {
 		_akismetData.setUserAgent(userAgent);
 	}
@@ -456,7 +456,7 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param userIP the user i p of this akismet data
 	*/
-	@Override
+
 	public void setUserIP(java.lang.String userIP) {
 		_akismetData.setUserIP(userIP);
 	}
@@ -466,12 +466,12 @@ public class AkismetDataWrapper implements AkismetData,
 	*
 	* @param userURL the user u r l of this akismet data
 	*/
-	@Override
+
 	public void setUserURL(java.lang.String userURL) {
 		_akismetData.setUserURL(userURL);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -490,22 +490,22 @@ public class AkismetDataWrapper implements AkismetData,
 		return false;
 	}
 
-	@Override
+
 	public AkismetData getWrappedModel() {
 		return _akismetData;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _akismetData.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _akismetData.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_akismetData.resetOriginalValues();
 	}
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalService.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalService.java
index b9794fd6050..40ed098c6d7 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalService.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service;
@@ -142,11 +142,11 @@ public interface AkismetDataLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -159,7 +159,7 @@ public interface AkismetDataLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getAkismetDatasCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceClp.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceClp.java
index 813476e4639..beef20a4746 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceClp.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service;
@@ -149,7 +149,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		_methodParameterTypes24 = new String[] { "java.util.Date" };
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData addAkismetData(
 		com.liferay.akismet.model.AkismetData akismetData) {
 		Object returnObj = null;
@@ -174,7 +174,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData createAkismetData(
 		long akismetDataId) {
 		Object returnObj = null;
@@ -198,7 +198,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData deleteAkismetData(
 		com.liferay.akismet.model.AkismetData akismetData) {
 		Object returnObj = null;
@@ -223,7 +223,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData deleteAkismetData(
 		long akismetDataId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -252,7 +252,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData fetchAkismetData(
 		java.lang.String className, long classPK) {
 		Object returnObj = null;
@@ -281,7 +281,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData fetchAkismetData(
 		long akismetDataId) {
 		Object returnObj = null;
@@ -305,7 +305,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData getAkismetData(
 		long akismetDataId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -334,7 +334,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData updateAkismetData(
 		com.liferay.akismet.model.AkismetData akismetData) {
 		Object returnObj = null;
@@ -359,7 +359,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData updateAkismetData(
 		java.lang.String className, long classPK, java.lang.String type,
 		java.lang.String permalink, java.lang.String referrer,
@@ -403,7 +403,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.akismet.model.AkismetData)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -426,7 +426,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -449,7 +449,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -472,7 +472,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -502,7 +502,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -532,7 +532,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getAkismetDatasCount() {
 		Object returnObj = null;
 
@@ -555,14 +555,14 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -585,7 +585,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -610,7 +610,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -642,7 +642,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -677,7 +677,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.akismet.model.AkismetData> getAkismetDatas(
 		int start, int end) {
 		Object returnObj = null;
@@ -701,7 +701,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return (java.util.List<com.liferay.akismet.model.AkismetData>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -726,7 +726,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -756,7 +756,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void deleteAkismetData(java.lang.String className, long classPK)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
@@ -781,7 +781,7 @@ public class AkismetDataLocalServiceClp implements AkismetDataLocalService {
 		}
 	}
 
-	@Override
+
 	public void deleteAkismetData(java.util.Date modifiedDate) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName24,
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceUtil.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceUtil.java
index c38bd91c463..ce0f5c7c305 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceUtil.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceWrapper.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceWrapper.java
index ccc09ef1ba9..5770a8522c0 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceWrapper.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/AkismetDataLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service;
@@ -39,7 +39,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param akismetData the akismet data
 	* @return the akismet data that was added
 	*/
-	@Override
+
 	public com.liferay.akismet.model.AkismetData addAkismetData(
 		com.liferay.akismet.model.AkismetData akismetData) {
 		return _akismetDataLocalService.addAkismetData(akismetData);
@@ -51,7 +51,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param akismetDataId the primary key for the new akismet data
 	* @return the new akismet data
 	*/
-	@Override
+
 	public com.liferay.akismet.model.AkismetData createAkismetData(
 		long akismetDataId) {
 		return _akismetDataLocalService.createAkismetData(akismetDataId);
@@ -63,7 +63,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param akismetData the akismet data
 	* @return the akismet data that was removed
 	*/
-	@Override
+
 	public com.liferay.akismet.model.AkismetData deleteAkismetData(
 		com.liferay.akismet.model.AkismetData akismetData) {
 		return _akismetDataLocalService.deleteAkismetData(akismetData);
@@ -76,20 +76,20 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @return the akismet data that was removed
 	* @throws PortalException if a akismet data with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.akismet.model.AkismetData deleteAkismetData(
 		long akismetDataId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _akismetDataLocalService.deleteAkismetData(akismetDataId);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData fetchAkismetData(
 		java.lang.String className, long classPK) {
 		return _akismetDataLocalService.fetchAkismetData(className, classPK);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData fetchAkismetData(
 		long akismetDataId) {
 		return _akismetDataLocalService.fetchAkismetData(akismetDataId);
@@ -102,7 +102,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @return the akismet data
 	* @throws PortalException if a akismet data with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.akismet.model.AkismetData getAkismetData(
 		long akismetDataId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -115,13 +115,13 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param akismetData the akismet data
 	* @return the akismet data that was updated
 	*/
-	@Override
+
 	public com.liferay.akismet.model.AkismetData updateAkismetData(
 		com.liferay.akismet.model.AkismetData akismetData) {
 		return _akismetDataLocalService.updateAkismetData(akismetData);
 	}
 
-	@Override
+
 	public com.liferay.akismet.model.AkismetData updateAkismetData(
 		java.lang.String className, long classPK, java.lang.String type,
 		java.lang.String permalink, java.lang.String referrer,
@@ -131,17 +131,17 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 			type, permalink, referrer, userAgent, userIP, userURL);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _akismetDataLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _akismetDataLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _akismetDataLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -149,14 +149,14 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _akismetDataLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -168,12 +168,12 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	*
 	* @return the number of akismet datas
 	*/
-	@Override
+
 	public int getAkismetDatasCount() {
 		return _akismetDataLocalService.getAkismetDatasCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -186,7 +186,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _akismetDataLocalService.getOSGiServiceIdentifier();
 	}
@@ -197,7 +197,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _akismetDataLocalService.dynamicQuery(dynamicQuery);
@@ -215,7 +215,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -235,7 +235,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -255,7 +255,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param end the upper bound of the range of akismet datas (not inclusive)
 	* @return the range of akismet datas
 	*/
-	@Override
+
 	public java.util.List<com.liferay.akismet.model.AkismetData> getAkismetDatas(
 		int start, int end) {
 		return _akismetDataLocalService.getAkismetDatas(start, end);
@@ -267,7 +267,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _akismetDataLocalService.dynamicQueryCount(dynamicQuery);
@@ -280,7 +280,7 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -288,23 +288,23 @@ public class AkismetDataLocalServiceWrapper implements AkismetDataLocalService,
 			projection);
 	}
 
-	@Override
+
 	public void deleteAkismetData(java.lang.String className, long classPK)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_akismetDataLocalService.deleteAkismetData(className, classPK);
 	}
 
-	@Override
+
 	public void deleteAkismetData(java.util.Date modifiedDate) {
 		_akismetDataLocalService.deleteAkismetData(modifiedDate);
 	}
 
-	@Override
+
 	public AkismetDataLocalService getWrappedService() {
 		return _akismetDataLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		AkismetDataLocalService akismetDataLocalService) {
 		_akismetDataLocalService = akismetDataLocalService;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/ClpSerializer.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/ClpSerializer.java
index f0f80510be8..bb9838e1220 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/ClpSerializer.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/messaging/ClpMessageListener.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/messaging/ClpMessageListener.java
index 674c02aed7f..a60526ebc65 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/messaging/ClpMessageListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataPersistence.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataPersistence.java
index e2440aaa3ba..f4a001c0755 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataPersistence.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.persistence;
@@ -276,7 +276,7 @@ public interface AkismetDataPersistence extends BasePersistence<AkismetData> {
 	*/
 	public AkismetData fetchByPrimaryKey(long akismetDataId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, AkismetData> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -344,6 +344,6 @@ public interface AkismetDataPersistence extends BasePersistence<AkismetData> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataUtil.java b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataUtil.java
index 76a408b90e0..a6790a5f08c 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataUtil.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/service/com/liferay/akismet/service/persistence/AkismetDataUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.persistence;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/messaging/DeleteAkismetDataMessageListener.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/messaging/DeleteAkismetDataMessageListener.java
index ecbc4fe524a..2a37c5bf376 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/messaging/DeleteAkismetDataMessageListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/messaging/DeleteAkismetDataMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.akismet.messaging;
@@ -30,7 +30,7 @@ public class DeleteAkismetDataMessageListener extends BaseMessageListener {
 			AkismetUtil.getReportableTime(companyId));
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		long[] companyIds = PortalUtil.getCompanyIds();
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/portlet/AkismetPortlet.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/portlet/AkismetPortlet.java
index 8c46647444a..1a401571e89 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/portlet/AkismetPortlet.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/akismet/portlet/AkismetPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.akismet.portlet;
@@ -82,7 +82,7 @@ public class AkismetPortlet extends MVCPortlet {
 		}
 	}
 
-	@Override
+
 	protected boolean isProcessPortletRequest(PortletRequest portletRequest) {
 		ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute(
 			WebKeys.THEME_DISPLAY);
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditDiscussionAction.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditDiscussionAction.java
index aa82fd1914b..d99e69289b3 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditDiscussionAction.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditDiscussionAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.action;
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class AkismetEditDiscussionAction extends BaseStrutsAction {
 
-	@Override
+
 	public String execute(
 			HttpServletRequest request, HttpServletResponse response)
 		throws Exception {
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditMessageAction.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditMessageAction.java
index a192f71a2eb..bc3f0369d1b 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditMessageAction.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditMessageAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.action;
@@ -43,7 +43,7 @@ import javax.portlet.PortletConfig;
  */
 public class AkismetEditMessageAction extends BaseStrutsPortletAction {
 
-	@Override
+
 	public void processAction(
 			PortletConfig portletConfig, ActionRequest actionRequest,
 			ActionResponse actionResponse)
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditPageAction.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditPageAction.java
index 80b23d4bc25..71b3c48ee7a 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditPageAction.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/action/AkismetEditPageAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.action;
@@ -51,7 +51,7 @@ import javax.portlet.ResourceResponse;
  */
 public class AkismetEditPageAction extends BaseStrutsPortletAction {
 
-	@Override
+
 	public void processAction(
 			StrutsPortletAction originalStrutsPortletAction,
 			PortletConfig portletConfig, ActionRequest actionRequest,
@@ -82,7 +82,7 @@ public class AkismetEditPageAction extends BaseStrutsPortletAction {
 		}
 	}
 
-	@Override
+
 	public String render(
 			StrutsPortletAction originalStrutsPortletAction,
 			PortletConfig portletConfig, RenderRequest renderRequest,
@@ -93,7 +93,7 @@ public class AkismetEditPageAction extends BaseStrutsPortletAction {
 			portletConfig, renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void serveResource(
 			StrutsPortletAction originalStrutsPortletAction,
 			PortletConfig portletConfig, ResourceRequest resourceRequest,
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetMBMessageModelListener.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetMBMessageModelListener.java
index 95a2be7dfc2..627111925a4 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetMBMessageModelListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetMBMessageModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.listeners;
@@ -24,7 +24,7 @@ import com.liferay.portal.kernel.model.BaseModelListener;
 public class AkismetMBMessageModelListener
 	extends BaseModelListener<MBMessage> {
 
-	@Override
+
 	public void onAfterRemove(MBMessage message) {
 		try {
 			AkismetDataLocalServiceUtil.deleteAkismetData(
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetWikiPageModelListener.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetWikiPageModelListener.java
index 0ba1280cd89..c55b411f35d 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetWikiPageModelListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/listeners/AkismetWikiPageModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.listeners;
@@ -23,7 +23,7 @@ import com.liferay.wiki.model.WikiPage;
  */
 public class AkismetWikiPageModelListener extends BaseModelListener<WikiPage> {
 
-	@Override
+
 	public void onAfterRemove(WikiPage page) {
 		try {
 			AkismetDataLocalServiceUtil.deleteAkismetData(
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetMBMessageLocalServiceImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetMBMessageLocalServiceImpl.java
index 65ff8eb80ad..269e91183cf 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetMBMessageLocalServiceImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetMBMessageLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.service.impl;
@@ -54,7 +54,7 @@ public class AkismetMBMessageLocalServiceImpl
 		super(mbMessageLocalService);
 	}
 
-	@Override
+
 	public MBMessage addDiscussionMessage(
 			long userId, String userName, long groupId, String className,
 			long classPK, long threadId, long parentMessageId, String subject,
@@ -98,7 +98,7 @@ public class AkismetMBMessageLocalServiceImpl
 			userId, message.getMessageId(), status, serviceContext);
 	}
 
-	@Override
+
 	public MBMessage addMessage(
 			long userId, String userName, long groupId, long categoryId,
 			long threadId, long parentMessageId, String subject, String body,
@@ -139,7 +139,7 @@ public class AkismetMBMessageLocalServiceImpl
 			userId, message.getMessageId(), status, serviceContext);
 	}
 
-	@Override
+
 	public MBMessage addMessage(
 			long userId, String userName, long groupId, long categoryId,
 			String subject, String body, String format,
@@ -179,7 +179,7 @@ public class AkismetMBMessageLocalServiceImpl
 			userId, message.getMessageId(), status, serviceContext);
 	}
 
-	@Override
+
 	public MBMessage updateDiscussionMessage(
 			long userId, long messageId, String className, long classPK,
 			String subject, String body, ServiceContext serviceContext)
@@ -214,7 +214,7 @@ public class AkismetMBMessageLocalServiceImpl
 			userId, message.getMessageId(), status, serviceContext);
 	}
 
-	@Override
+
 	public MBMessage updateMessage(
 			long userId, long messageId, String subject, String body,
 			List<ObjectValuePair<String, InputStream>> inputStreamOVPs,
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetWikiPageLocalServiceImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetWikiPageLocalServiceImpl.java
index ad5a9c4236d..ad65d785896 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetWikiPageLocalServiceImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/service/impl/AkismetWikiPageLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.service.impl;
@@ -48,7 +48,7 @@ public class AkismetWikiPageLocalServiceImpl
 		super(wikiPageLocalService);
 	}
 
-	@Override
+
 	public WikiPage addPage(
 			long userId, long nodeId, String title, double version,
 			String content, String summary, boolean minorEdit, String format,
@@ -99,7 +99,7 @@ public class AkismetWikiPageLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public WikiPage updatePage(
 			long userId, long nodeId, String title, double version,
 			String content, String summary, boolean minorEdit, String format,
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/upgrade/UpgradeProcess_1_0_0.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/upgrade/UpgradeProcess_1_0_0.java
index cd18403599b..340bc962158 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/upgrade/UpgradeProcess_1_0_0.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/hook/upgrade/UpgradeProcess_1_0_0.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.hook.upgrade;
@@ -21,12 +21,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 100;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		if (!hasColumn("Akismet_AkismetData", "mbMessageId")) {
 			return;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataBaseImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataBaseImpl.java
index aba6378ac45..2b243987272 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataBaseImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model.impl;
@@ -39,7 +39,7 @@ public abstract class AkismetDataBaseImpl extends AkismetDataModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a akismet data model instance should use the {@link AkismetData} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			AkismetDataLocalServiceUtil.addAkismetData(this);
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataCacheModel.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataCacheModel.java
index 89d3e218142..a6798f29b25 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataCacheModel.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class AkismetDataCacheModel implements CacheModel<AkismetData>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class AkismetDataCacheModel implements CacheModel<AkismetData>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, akismetDataId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -93,7 +93,7 @@ public class AkismetDataCacheModel implements CacheModel<AkismetData>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public AkismetData toEntityModel() {
 		AkismetDataImpl akismetDataImpl = new AkismetDataImpl();
 
@@ -156,7 +156,7 @@ public class AkismetDataCacheModel implements CacheModel<AkismetData>,
 		return akismetDataImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		akismetDataId = objectInput.readLong();
 		modifiedDate = objectInput.readLong();
@@ -172,7 +172,7 @@ public class AkismetDataCacheModel implements CacheModel<AkismetData>,
 		userURL = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(akismetDataId);
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataImpl.java
index 4cfc9c854a9..a3433a3e289 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model.impl;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataModelImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataModelImpl.java
index 509ccceea32..46c721a3413 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataModelImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/model/impl/AkismetDataModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.model.impl;
@@ -116,37 +116,37 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 	public AkismetDataModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _akismetDataId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setAkismetDataId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _akismetDataId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return AkismetData.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return AkismetData.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -167,7 +167,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long akismetDataId = (Long)attributes.get("akismetDataId");
 
@@ -230,22 +230,22 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public long getAkismetDataId() {
 		return _akismetDataId;
 	}
 
-	@Override
+
 	public void setAkismetDataId(long akismetDataId) {
 		_akismetDataId = akismetDataId;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_columnBitmask |= MODIFIEDDATE_COLUMN_BITMASK;
 
@@ -260,7 +260,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return _originalModifiedDate;
 	}
 
-	@Override
+
 	public String getClassName() {
 		if (getClassNameId() <= 0) {
 			return StringPool.BLANK;
@@ -269,7 +269,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return PortalUtil.getClassName(getClassNameId());
 	}
 
-	@Override
+
 	public void setClassName(String className) {
 		long classNameId = 0;
 
@@ -280,12 +280,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		setClassNameId(classNameId);
 	}
 
-	@Override
+
 	public long getClassNameId() {
 		return _classNameId;
 	}
 
-	@Override
+
 	public void setClassNameId(long classNameId) {
 		_columnBitmask |= CLASSNAMEID_COLUMN_BITMASK;
 
@@ -302,12 +302,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return _originalClassNameId;
 	}
 
-	@Override
+
 	public long getClassPK() {
 		return _classPK;
 	}
 
-	@Override
+
 	public void setClassPK(long classPK) {
 		_columnBitmask |= CLASSPK_COLUMN_BITMASK;
 
@@ -324,7 +324,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return _originalClassPK;
 	}
 
-	@Override
+
 	public String getType() {
 		if (_type == null) {
 			return StringPool.BLANK;
@@ -334,12 +334,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public void setType(String type) {
 		_type = type;
 	}
 
-	@Override
+
 	public String getPermalink() {
 		if (_permalink == null) {
 			return StringPool.BLANK;
@@ -349,12 +349,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public void setPermalink(String permalink) {
 		_permalink = permalink;
 	}
 
-	@Override
+
 	public String getReferrer() {
 		if (_referrer == null) {
 			return StringPool.BLANK;
@@ -364,12 +364,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public void setReferrer(String referrer) {
 		_referrer = referrer;
 	}
 
-	@Override
+
 	public String getUserAgent() {
 		if (_userAgent == null) {
 			return StringPool.BLANK;
@@ -379,12 +379,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public void setUserAgent(String userAgent) {
 		_userAgent = userAgent;
 	}
 
-	@Override
+
 	public String getUserIP() {
 		if (_userIP == null) {
 			return StringPool.BLANK;
@@ -394,12 +394,12 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public void setUserIP(String userIP) {
 		_userIP = userIP;
 	}
 
-	@Override
+
 	public String getUserURL() {
 		if (_userURL == null) {
 			return StringPool.BLANK;
@@ -409,7 +409,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public void setUserURL(String userURL) {
 		_userURL = userURL;
 	}
@@ -418,20 +418,20 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			AkismetData.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public AkismetData toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (AkismetData)ProxyUtil.newProxyInstance(_classLoader,
@@ -441,7 +441,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		AkismetDataImpl akismetDataImpl = new AkismetDataImpl();
 
@@ -461,7 +461,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return akismetDataImpl;
 	}
 
-	@Override
+
 	public int compareTo(AkismetData akismetData) {
 		long primaryKey = akismetData.getPrimaryKey();
 
@@ -476,7 +476,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -498,22 +498,22 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		AkismetDataModelImpl akismetDataModelImpl = this;
 
@@ -530,7 +530,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		akismetDataModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<AkismetData> toCacheModel() {
 		AkismetDataCacheModel akismetDataCacheModel = new AkismetDataCacheModel();
 
@@ -600,7 +600,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return akismetDataCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -629,7 +629,7 @@ public class AkismetDataModelImpl extends BaseModelImpl<AkismetData>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/DeleteMBMessagesListener.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/DeleteMBMessagesListener.java
index c1c57c2f060..a673c354cfd 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/DeleteMBMessagesListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/DeleteMBMessagesListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.moderation.messaging;
@@ -62,7 +62,7 @@ public class DeleteMBMessagesListener extends BaseMessageListener {
 		}
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		long[] companyIds = PortalUtil.getCompanyIds();
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/UpdateWikiPagesListener.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/UpdateWikiPagesListener.java
index 91e077d4faa..69b7fd39be6 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/UpdateWikiPagesListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/messaging/UpdateWikiPagesListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.moderation.messaging;
@@ -34,7 +34,7 @@ import java.util.List;
  */
 public class UpdateWikiPagesListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		long[] companyIds = PortalUtil.getCompanyIds();
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/portlet/ModerationPortlet.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/portlet/ModerationPortlet.java
index 16d2aa05a03..3b5707d9f64 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/portlet/ModerationPortlet.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/portlet/ModerationPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.moderation.portlet;
@@ -226,7 +226,7 @@ public class ModerationPortlet extends MVCPortlet {
 		}
 	}
 
-	@Override
+
 	protected boolean isProcessPortletRequest(PortletRequest portletRequest) {
 		ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute(
 			WebKeys.THEME_DISPLAY);
@@ -249,7 +249,7 @@ public class ModerationPortlet extends MVCPortlet {
 		return false;
 	}
 
-	@Override
+
 	protected boolean isSessionErrorException(Throwable cause) {
 		if (cause instanceof NoSuchMessageException ||
 			cause instanceof NoSuchPageException ||
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/util/ModerationUtil.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/util/ModerationUtil.java
index ad9655feedf..5327bec409c 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/util/ModerationUtil.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/moderation/util/ModerationUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.moderation.util;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceBaseImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceBaseImpl.java
index ae8e44db8e4..f5734162685 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceBaseImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.base;
@@ -79,7 +79,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @return the akismet data that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public AkismetData addAkismetData(AkismetData akismetData) {
 		akismetData.setNew(true);
 
@@ -92,7 +92,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param akismetDataId the primary key for the new akismet data
 	 * @return the new akismet data
 	 */
-	@Override
+
 	public AkismetData createAkismetData(long akismetDataId) {
 		return akismetDataPersistence.create(akismetDataId);
 	}
@@ -105,7 +105,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @throws PortalException if a akismet data with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public AkismetData deleteAkismetData(long akismetDataId)
 		throws PortalException {
 		return akismetDataPersistence.remove(akismetDataId);
@@ -118,12 +118,12 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @return the akismet data that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public AkismetData deleteAkismetData(AkismetData akismetData) {
 		return akismetDataPersistence.remove(akismetData);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -137,7 +137,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return akismetDataPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -154,7 +154,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return akismetDataPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -174,7 +174,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return akismetDataPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -187,7 +187,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return akismetDataPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -199,14 +199,14 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return akismetDataPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public AkismetData fetchAkismetData(long akismetDataId) {
 		return akismetDataPersistence.fetchByPrimaryKey(akismetDataId);
 	}
@@ -218,13 +218,13 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @return the akismet data
 	 * @throws PortalException if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData getAkismetData(long akismetDataId)
 		throws PortalException {
 		return akismetDataPersistence.findByPrimaryKey(akismetDataId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -237,7 +237,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -263,13 +263,13 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return akismetDataLocalService.deleteAkismetData((AkismetData)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return akismetDataPersistence.findByPrimaryKey(primaryKeyObj);
@@ -286,7 +286,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @param end the upper bound of the range of akismet datas (not inclusive)
 	 * @return the range of akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> getAkismetDatas(int start, int end) {
 		return akismetDataPersistence.findAll(start, end);
 	}
@@ -296,7 +296,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 *
 	 * @return the number of akismet datas
 	 */
-	@Override
+
 	public int getAkismetDatasCount() {
 		return akismetDataPersistence.countAll();
 	}
@@ -308,7 +308,7 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 * @return the akismet data that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public AkismetData updateAkismetData(AkismetData akismetData) {
 		return akismetDataPersistence.update(akismetData);
 	}
@@ -483,12 +483,12 @@ public abstract class AkismetDataLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return AkismetDataLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceClpInvoker.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceClpInvoker.java
index 07c24993858..60e2e3a673c 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceClpInvoker.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/base/AkismetDataLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.base;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/impl/AkismetDataLocalServiceImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/impl/AkismetDataLocalServiceImpl.java
index aa06a9e89c6..74751198b52 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/impl/AkismetDataLocalServiceImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/impl/AkismetDataLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.impl;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/persistence/impl/AkismetDataPersistenceImpl.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/persistence/impl/AkismetDataPersistenceImpl.java
index 191191582bd..521c5c0d9b7 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/persistence/impl/AkismetDataPersistenceImpl.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/service/persistence/impl/AkismetDataPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.service.persistence.impl;
@@ -110,7 +110,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param modifiedDate the modified date
 	 * @return the matching akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findByLtModifiedDate(Date modifiedDate) {
 		return findByLtModifiedDate(modifiedDate, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -128,7 +128,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param end the upper bound of the range of akismet datas (not inclusive)
 	 * @return the range of matching akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findByLtModifiedDate(Date modifiedDate, int start,
 		int end) {
 		return findByLtModifiedDate(modifiedDate, start, end, null);
@@ -147,7 +147,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findByLtModifiedDate(Date modifiedDate, int start,
 		int end, OrderByComparator<AkismetData> orderByComparator) {
 		return findByLtModifiedDate(modifiedDate, start, end,
@@ -168,7 +168,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findByLtModifiedDate(Date modifiedDate, int start,
 		int end, OrderByComparator<AkismetData> orderByComparator,
 		boolean retrieveFromCache) {
@@ -283,7 +283,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the first matching akismet data
 	 * @throws NoSuchDataException if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData findByLtModifiedDate_First(Date modifiedDate,
 		OrderByComparator<AkismetData> orderByComparator)
 		throws NoSuchDataException {
@@ -313,7 +313,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching akismet data, or <code>null</code> if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData fetchByLtModifiedDate_First(Date modifiedDate,
 		OrderByComparator<AkismetData> orderByComparator) {
 		List<AkismetData> list = findByLtModifiedDate(modifiedDate, 0, 1,
@@ -334,7 +334,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the last matching akismet data
 	 * @throws NoSuchDataException if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData findByLtModifiedDate_Last(Date modifiedDate,
 		OrderByComparator<AkismetData> orderByComparator)
 		throws NoSuchDataException {
@@ -364,7 +364,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching akismet data, or <code>null</code> if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData fetchByLtModifiedDate_Last(Date modifiedDate,
 		OrderByComparator<AkismetData> orderByComparator) {
 		int count = countByLtModifiedDate(modifiedDate);
@@ -392,7 +392,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the previous, current, and next akismet data
 	 * @throws NoSuchDataException if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData[] findByLtModifiedDate_PrevAndNext(long akismetDataId,
 		Date modifiedDate, OrderByComparator<AkismetData> orderByComparator)
 		throws NoSuchDataException {
@@ -545,7 +545,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 *
 	 * @param modifiedDate the modified date
 	 */
-	@Override
+
 	public void removeByLtModifiedDate(Date modifiedDate) {
 		for (AkismetData akismetData : findByLtModifiedDate(modifiedDate,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -559,7 +559,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param modifiedDate the modified date
 	 * @return the number of matching akismet datas
 	 */
-	@Override
+
 	public int countByLtModifiedDate(Date modifiedDate) {
 		FinderPath finderPath = FINDER_PATH_WITH_PAGINATION_COUNT_BY_LTMODIFIEDDATE;
 
@@ -636,7 +636,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the matching akismet data
 	 * @throws NoSuchDataException if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData findByC_C(long classNameId, long classPK)
 		throws NoSuchDataException {
 		AkismetData akismetData = fetchByC_C(classNameId, classPK);
@@ -671,7 +671,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param classPK the class p k
 	 * @return the matching akismet data, or <code>null</code> if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData fetchByC_C(long classNameId, long classPK) {
 		return fetchByC_C(classNameId, classPK, true);
 	}
@@ -684,7 +684,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching akismet data, or <code>null</code> if a matching akismet data could not be found
 	 */
-	@Override
+
 	public AkismetData fetchByC_C(long classNameId, long classPK,
 		boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { classNameId, classPK };
@@ -781,7 +781,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param classPK the class p k
 	 * @return the akismet data that was removed
 	 */
-	@Override
+
 	public AkismetData removeByC_C(long classNameId, long classPK)
 		throws NoSuchDataException {
 		AkismetData akismetData = findByC_C(classNameId, classPK);
@@ -796,7 +796,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param classPK the class p k
 	 * @return the number of matching akismet datas
 	 */
-	@Override
+
 	public int countByC_C(long classNameId, long classPK) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_C_C;
 
@@ -857,7 +857,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 *
 	 * @param akismetData the akismet data
 	 */
-	@Override
+
 	public void cacheResult(AkismetData akismetData) {
 		entityCache.putResult(AkismetDataModelImpl.ENTITY_CACHE_ENABLED,
 			AkismetDataImpl.class, akismetData.getPrimaryKey(), akismetData);
@@ -874,7 +874,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 *
 	 * @param akismetDatas the akismet datas
 	 */
-	@Override
+
 	public void cacheResult(List<AkismetData> akismetDatas) {
 		for (AkismetData akismetData : akismetDatas) {
 			if (entityCache.getResult(
@@ -895,7 +895,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(AkismetDataImpl.class);
 
@@ -911,7 +911,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(AkismetData akismetData) {
 		entityCache.removeResult(AkismetDataModelImpl.ENTITY_CACHE_ENABLED,
 			AkismetDataImpl.class, akismetData.getPrimaryKey());
@@ -922,7 +922,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 		clearUniqueFindersCache((AkismetDataModelImpl)akismetData);
 	}
 
-	@Override
+
 	public void clearCache(List<AkismetData> akismetDatas) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -992,7 +992,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param akismetDataId the primary key for the new akismet data
 	 * @return the new akismet data
 	 */
-	@Override
+
 	public AkismetData create(long akismetDataId) {
 		AkismetData akismetData = new AkismetDataImpl();
 
@@ -1009,7 +1009,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the akismet data that was removed
 	 * @throws NoSuchDataException if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData remove(long akismetDataId) throws NoSuchDataException {
 		return remove((Serializable)akismetDataId);
 	}
@@ -1021,7 +1021,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the akismet data that was removed
 	 * @throws NoSuchDataException if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData remove(Serializable primaryKey)
 		throws NoSuchDataException {
 		Session session = null;
@@ -1054,7 +1054,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 		}
 	}
 
-	@Override
+
 	protected AkismetData removeImpl(AkismetData akismetData) {
 		akismetData = toUnwrappedModel(akismetData);
 
@@ -1086,7 +1086,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 		return akismetData;
 	}
 
-	@Override
+
 	public AkismetData updateImpl(AkismetData akismetData) {
 		akismetData = toUnwrappedModel(akismetData);
 
@@ -1164,7 +1164,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the akismet data
 	 * @throws NoSuchDataException if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchDataException {
 		AkismetData akismetData = fetchByPrimaryKey(primaryKey);
@@ -1188,7 +1188,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @return the akismet data
 	 * @throws NoSuchDataException if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData findByPrimaryKey(long akismetDataId)
 		throws NoSuchDataException {
 		return findByPrimaryKey((Serializable)akismetDataId);
@@ -1200,7 +1200,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param primaryKey the primary key of the akismet data
 	 * @return the akismet data, or <code>null</code> if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData fetchByPrimaryKey(Serializable primaryKey) {
 		AkismetData akismetData = (AkismetData)entityCache.getResult(AkismetDataModelImpl.ENTITY_CACHE_ENABLED,
 				AkismetDataImpl.class, primaryKey);
@@ -1246,12 +1246,12 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param akismetDataId the primary key of the akismet data
 	 * @return the akismet data, or <code>null</code> if a akismet data with the primary key could not be found
 	 */
-	@Override
+
 	public AkismetData fetchByPrimaryKey(long akismetDataId) {
 		return fetchByPrimaryKey((Serializable)akismetDataId);
 	}
 
-	@Override
+
 	public Map<Serializable, AkismetData> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1348,7 +1348,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 *
 	 * @return the akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1364,7 +1364,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param end the upper bound of the range of akismet datas (not inclusive)
 	 * @return the range of akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1381,7 +1381,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findAll(int start, int end,
 		OrderByComparator<AkismetData> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1400,7 +1400,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of akismet datas
 	 */
-	@Override
+
 	public List<AkismetData> findAll(int start, int end,
 		OrderByComparator<AkismetData> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1490,7 +1490,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 * Removes all the akismet datas from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (AkismetData akismetData : findAll()) {
 			remove(akismetData);
@@ -1502,7 +1502,7 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 	 *
 	 * @return the number of akismet datas
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1534,12 +1534,12 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return AkismetDataModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1572,19 +1572,19 @@ public class AkismetDataPersistenceImpl extends BasePersistenceImpl<AkismetData>
 				"type"
 			});
 	private static final AkismetData _nullAkismetData = new AkismetDataImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<AkismetData> toCacheModel() {
 				return _nullAkismetDataCacheModel;
 			}
 		};
 
 	private static final CacheModel<AkismetData> _nullAkismetDataCacheModel = new CacheModel<AkismetData>() {
-			@Override
+
 			public AkismetData toEntityModel() {
 				return _nullAkismetData;
 			}
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/servlet/AkismetServletContextListener.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/servlet/AkismetServletContextListener.java
index 8ee095c1137..35a293a7cfd 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/servlet/AkismetServletContextListener.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/servlet/AkismetServletContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.servlet;
@@ -35,21 +35,21 @@ import javax.servlet.ServletContextListener;
 public class AkismetServletContextListener
 	extends BasePortalLifecycle implements ServletContextListener {
 
-	@Override
+
 	public void contextDestroyed(ServletContextEvent servletContextEvent) {
 		portalDestroy();
 	}
 
-	@Override
+
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		registerPortalLifecycle();
 	}
 
-	@Override
+
 	protected void doPortalDestroy() {
 	}
 
-	@Override
+
 	protected void doPortalInit() throws Exception {
 		List<Company> companies = CompanyLocalServiceUtil.getCompanies();
 
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetConstants.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetConstants.java
index d9ba0e250b0..1553f6a1a23 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetConstants.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.util;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetUtil.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetUtil.java
index 372f1706912..4f9eb45db5a 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetUtil.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/AkismetUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.util;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletKeys.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletKeys.java
index 7d07d59b8e9..aa42350c681 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletKeys.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.util;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsKeys.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsKeys.java
index b7302b3de64..31e338f6729 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsKeys.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.util;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsValues.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsValues.java
index 93adf1c8520..f09171bb368 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsValues.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.util;
diff --git a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PrefsPortletPropsUtil.java b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PrefsPortletPropsUtil.java
index 2b236c4fd0a..ea06e3e3750 100644
--- a/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PrefsPortletPropsUtil.java
+++ b/portlets/akismet-portlet/docroot/WEB-INF/src/com/liferay/akismet/util/PrefsPortletPropsUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.akismet.util;
diff --git a/portlets/akismet-portlet/docroot/akismet/view.jsp b/portlets/akismet-portlet/docroot/akismet/view.jsp
index 00ec83c34fe..75980e1cda7 100644
--- a/portlets/akismet-portlet/docroot/akismet/view.jsp
+++ b/portlets/akismet-portlet/docroot/akismet/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/init.jsp b/portlets/akismet-portlet/docroot/init.jsp
index 4c2a943df5d..bb431043b0a 100644
--- a/portlets/akismet-portlet/docroot/init.jsp
+++ b/portlets/akismet-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/discussions.jspf b/portlets/akismet-portlet/docroot/moderation/discussions.jspf
index 9bedcd8f0e8..709c252ebd3 100644
--- a/portlets/akismet-portlet/docroot/moderation/discussions.jspf
+++ b/portlets/akismet-portlet/docroot/moderation/discussions.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/discussions_action.jsp b/portlets/akismet-portlet/docroot/moderation/discussions_action.jsp
index eb6dc4cfe06..8662ce37a09 100644
--- a/portlets/akismet-portlet/docroot/moderation/discussions_action.jsp
+++ b/portlets/akismet-portlet/docroot/moderation/discussions_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/message_boards.jspf b/portlets/akismet-portlet/docroot/moderation/message_boards.jspf
index 23b31d651da..902f9a6d8a7 100644
--- a/portlets/akismet-portlet/docroot/moderation/message_boards.jspf
+++ b/portlets/akismet-portlet/docroot/moderation/message_boards.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/message_boards_action.jsp b/portlets/akismet-portlet/docroot/moderation/message_boards_action.jsp
index c89e741b5d4..6f33b43702d 100644
--- a/portlets/akismet-portlet/docroot/moderation/message_boards_action.jsp
+++ b/portlets/akismet-portlet/docroot/moderation/message_boards_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/view.jsp b/portlets/akismet-portlet/docroot/moderation/view.jsp
index 17cd10bcbc5..1c128179e04 100644
--- a/portlets/akismet-portlet/docroot/moderation/view.jsp
+++ b/portlets/akismet-portlet/docroot/moderation/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/wiki_pages.jspf b/portlets/akismet-portlet/docroot/moderation/wiki_pages.jspf
index 12b94be1fe9..492d769bdcc 100644
--- a/portlets/akismet-portlet/docroot/moderation/wiki_pages.jspf
+++ b/portlets/akismet-portlet/docroot/moderation/wiki_pages.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/akismet-portlet/docroot/moderation/wiki_pages_action.jsp b/portlets/akismet-portlet/docroot/moderation/wiki_pages_action.jsp
index 7f6a0c1b46f..e393c619e0c 100644
--- a/portlets/akismet-portlet/docroot/moderation/wiki_pages_action.jsp
+++ b/portlets/akismet-portlet/docroot/moderation/wiki_pages_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/analog-clock-portlet/docroot/view.jsp b/portlets/analog-clock-portlet/docroot/view.jsp
index 312e6ece73b..13d7e99ddf3 100644
--- a/portlets/analog-clock-portlet/docroot/view.jsp
+++ b/portlets/analog-clock-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/bible-gateway-portlet/docroot/init.jsp b/portlets/bible-gateway-portlet/docroot/init.jsp
index 0b2e5b18f52..ddfe6b367e7 100644
--- a/portlets/bible-gateway-portlet/docroot/init.jsp
+++ b/portlets/bible-gateway-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/bible-gateway-portlet/docroot/view.jsp b/portlets/bible-gateway-portlet/docroot/view.jsp
index 971be9a277f..3dbd26b108f 100644
--- a/portlets/bible-gateway-portlet/docroot/view.jsp
+++ b/portlets/bible-gateway-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchEntryException.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchEntryException.java
index b28a29020e1..e72fb961a9c 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchEntryException.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchEntryException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.exception;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchStatusException.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchStatusException.java
index f8eadcb161a..1c8fd657a7e 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchStatusException.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/exception/NoSuchStatusException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.exception;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Entry.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Entry.java
index 60af0518852..78d5fe4ab74 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Entry.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Entry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -38,17 +38,17 @@ public interface Entry extends EntryModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.chat.model.impl.EntryImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<Entry, Long> ENTRY_ID_ACCESSOR = new Accessor<Entry, Long>() {
-			@Override
+
 			public Long get(Entry entry) {
 				return entry.getEntryId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<Entry> getTypeClass() {
 				return Entry.class;
 			}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryClp.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryClp.java
index 3da480e5cad..1fdae47ee54 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryClp.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -45,37 +45,37 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 	public EntryClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Entry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Entry.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -92,7 +92,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long entryId = (Long)attributes.get("entryId");
 
@@ -134,12 +134,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getEntryId() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setEntryId(long entryId) {
 		_entryId = entryId;
 
@@ -157,12 +157,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public long getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(long createDate) {
 		_createDate = createDate;
 
@@ -180,12 +180,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public long getFromUserId() {
 		return _fromUserId;
 	}
 
-	@Override
+
 	public void setFromUserId(long fromUserId) {
 		_fromUserId = fromUserId;
 
@@ -203,7 +203,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public String getFromUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getFromUserId());
@@ -215,16 +215,16 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public void setFromUserUuid(String fromUserUuid) {
 	}
 
-	@Override
+
 	public long getToUserId() {
 		return _toUserId;
 	}
 
-	@Override
+
 	public void setToUserId(long toUserId) {
 		_toUserId = toUserId;
 
@@ -242,7 +242,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public String getToUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getToUserId());
@@ -254,16 +254,16 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public void setToUserUuid(String toUserUuid) {
 	}
 
-	@Override
+
 	public String getContent() {
 		return _content;
 	}
 
-	@Override
+
 	public void setContent(String content) {
 		_content = content;
 
@@ -281,12 +281,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public int getFlag() {
 		return _flag;
 	}
 
-	@Override
+
 	public void setFlag(int flag) {
 		_flag = flag;
 
@@ -353,7 +353,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			EntryLocalServiceUtil.addEntry(this);
@@ -363,13 +363,13 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public Entry toEscapedModel() {
 		return (Entry)ProxyUtil.newProxyInstance(Entry.class.getClassLoader(),
 			new Class[] { Entry.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		EntryClp clone = new EntryClp();
 
@@ -383,7 +383,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(Entry entry) {
 		int value = 0;
 
@@ -406,7 +406,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -432,22 +432,22 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(13);
 
@@ -468,7 +468,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(22);
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryModel.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryModel.java
index 06238d93987..668217bba28 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryModel.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -173,60 +173,60 @@ public interface EntryModel extends BaseModel<Entry> {
 	 */
 	public void setFlag(int flag);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.chat.model.Entry entry);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.chat.model.Entry> toCacheModel();
 
-	@Override
+
 	public com.liferay.chat.model.Entry toEscapedModel();
 
-	@Override
+
 	public com.liferay.chat.model.Entry toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntrySoap.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntrySoap.java
index e6d09914f26..b96226c6b48 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntrySoap.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntrySoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryWrapper.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryWrapper.java
index e30cf451663..169c7be5b44 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryWrapper.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/EntryWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -42,17 +42,17 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		_entry = entry;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Entry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Entry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -66,7 +66,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long entryId = (Long)attributes.get("entryId");
 
@@ -105,42 +105,42 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _entry.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _entry.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _entry.isNew();
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry toEscapedModel() {
 		return new EntryWrapper(_entry.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry toUnescapedModel() {
 		return new EntryWrapper(_entry.toUnescapedModel());
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _entry.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.chat.model.Entry> toCacheModel() {
 		return _entry.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.chat.model.Entry entry) {
 		return _entry.compareTo(entry);
 	}
@@ -150,22 +150,22 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the flag of this entry
 	*/
-	@Override
+
 	public int getFlag() {
 		return _entry.getFlag();
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _entry.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _entry.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new EntryWrapper((Entry)_entry.clone());
 	}
@@ -175,7 +175,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the content of this entry
 	*/
-	@Override
+
 	public java.lang.String getContent() {
 		return _entry.getContent();
 	}
@@ -185,7 +185,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the from user uuid of this entry
 	*/
-	@Override
+
 	public java.lang.String getFromUserUuid() {
 		return _entry.getFromUserUuid();
 	}
@@ -195,17 +195,17 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the to user uuid of this entry
 	*/
-	@Override
+
 	public java.lang.String getToUserUuid() {
 		return _entry.getToUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _entry.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _entry.toXmlString();
 	}
@@ -215,7 +215,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the create date of this entry
 	*/
-	@Override
+
 	public long getCreateDate() {
 		return _entry.getCreateDate();
 	}
@@ -225,7 +225,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the entry ID of this entry
 	*/
-	@Override
+
 	public long getEntryId() {
 		return _entry.getEntryId();
 	}
@@ -235,7 +235,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the from user ID of this entry
 	*/
-	@Override
+
 	public long getFromUserId() {
 		return _entry.getFromUserId();
 	}
@@ -245,7 +245,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the primary key of this entry
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _entry.getPrimaryKey();
 	}
@@ -255,17 +255,17 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the to user ID of this entry
 	*/
-	@Override
+
 	public long getToUserId() {
 		return _entry.getToUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_entry.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_entry.setCachedModel(cachedModel);
 	}
@@ -275,7 +275,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param content the content of this entry
 	*/
-	@Override
+
 	public void setContent(java.lang.String content) {
 		_entry.setContent(content);
 	}
@@ -285,7 +285,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param createDate the create date of this entry
 	*/
-	@Override
+
 	public void setCreateDate(long createDate) {
 		_entry.setCreateDate(createDate);
 	}
@@ -295,23 +295,23 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param entryId the entry ID of this entry
 	*/
-	@Override
+
 	public void setEntryId(long entryId) {
 		_entry.setEntryId(entryId);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_entry.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_entry.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_entry.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -321,7 +321,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param flag the flag of this entry
 	*/
-	@Override
+
 	public void setFlag(int flag) {
 		_entry.setFlag(flag);
 	}
@@ -331,7 +331,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param fromUserId the from user ID of this entry
 	*/
-	@Override
+
 	public void setFromUserId(long fromUserId) {
 		_entry.setFromUserId(fromUserId);
 	}
@@ -341,12 +341,12 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param fromUserUuid the from user uuid of this entry
 	*/
-	@Override
+
 	public void setFromUserUuid(java.lang.String fromUserUuid) {
 		_entry.setFromUserUuid(fromUserUuid);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_entry.setNew(n);
 	}
@@ -356,12 +356,12 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param primaryKey the primary key of this entry
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_entry.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_entry.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -371,7 +371,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param toUserId the to user ID of this entry
 	*/
-	@Override
+
 	public void setToUserId(long toUserId) {
 		_entry.setToUserId(toUserId);
 	}
@@ -381,12 +381,12 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param toUserUuid the to user uuid of this entry
 	*/
-	@Override
+
 	public void setToUserUuid(java.lang.String toUserUuid) {
 		_entry.setToUserUuid(toUserUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -405,22 +405,22 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		return false;
 	}
 
-	@Override
+
 	public Entry getWrappedModel() {
 		return _entry;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entry.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _entry.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_entry.resetOriginalValues();
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Status.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Status.java
index 389068a6700..e20365aae4b 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Status.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/Status.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -38,17 +38,17 @@ public interface Status extends StatusModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.chat.model.impl.StatusImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<Status, Long> STATUS_ID_ACCESSOR = new Accessor<Status, Long>() {
-			@Override
+
 			public Long get(Status status) {
 				return status.getStatusId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<Status> getTypeClass() {
 				return Status.class;
 			}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusClp.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusClp.java
index 726a1784e3c..ca9b56512ad 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusClp.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -45,37 +45,37 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 	public StatusClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Status.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Status.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _statusId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setStatusId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _statusId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -94,7 +94,7 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long statusId = (Long)attributes.get("statusId");
 
@@ -148,12 +148,12 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getStatusId() {
 		return _statusId;
 	}
 
-	@Override
+
 	public void setStatusId(long statusId) {
 		_statusId = statusId;
 
@@ -171,12 +171,12 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -194,7 +194,7 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -206,16 +206,16 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public long getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(long modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -233,17 +233,17 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public boolean getOnline() {
 		return _online;
 	}
 
-	@Override
+
 	public boolean isOnline() {
 		return _online;
 	}
 
-	@Override
+
 	public void setOnline(boolean online) {
 		_online = online;
 
@@ -261,17 +261,17 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public boolean getAwake() {
 		return _awake;
 	}
 
-	@Override
+
 	public boolean isAwake() {
 		return _awake;
 	}
 
-	@Override
+
 	public void setAwake(boolean awake) {
 		_awake = awake;
 
@@ -289,12 +289,12 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public String getActivePanelIds() {
 		return _activePanelIds;
 	}
 
-	@Override
+
 	public void setActivePanelIds(String activePanelIds) {
 		_activePanelIds = activePanelIds;
 
@@ -313,12 +313,12 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public String getMessage() {
 		return _message;
 	}
 
-	@Override
+
 	public void setMessage(String message) {
 		_message = message;
 
@@ -336,17 +336,17 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public boolean getPlaySound() {
 		return _playSound;
 	}
 
-	@Override
+
 	public boolean isPlaySound() {
 		return _playSound;
 	}
 
-	@Override
+
 	public void setPlaySound(boolean playSound) {
 		_playSound = playSound;
 
@@ -413,7 +413,7 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			StatusLocalServiceUtil.addStatus(this);
@@ -423,13 +423,13 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public Status toEscapedModel() {
 		return (Status)ProxyUtil.newProxyInstance(Status.class.getClassLoader(),
 			new Class[] { Status.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		StatusClp clone = new StatusClp();
 
@@ -445,7 +445,7 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(Status status) {
 		long primaryKey = status.getPrimaryKey();
 
@@ -460,7 +460,7 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -486,22 +486,22 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(17);
 
@@ -526,7 +526,7 @@ public class StatusClp extends BaseModelImpl<Status> implements Status {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(28);
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusModel.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusModel.java
index a4a35875315..2f09005c18e 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusModel.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -209,60 +209,60 @@ public interface StatusModel extends BaseModel<Status> {
 	 */
 	public void setPlaySound(boolean playSound);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.chat.model.Status status);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.chat.model.Status> toCacheModel();
 
-	@Override
+
 	public com.liferay.chat.model.Status toEscapedModel();
 
-	@Override
+
 	public com.liferay.chat.model.Status toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusSoap.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusSoap.java
index f6d764711bb..4fb9bb0c76b 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusSoap.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusWrapper.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusWrapper.java
index df0bad39a80..6d79dc700ae 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusWrapper.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/model/StatusWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
@@ -42,17 +42,17 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 		_status = status;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Status.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Status.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -68,7 +68,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long statusId = (Long)attributes.get("statusId");
 
@@ -124,7 +124,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the awake of this status
 	*/
-	@Override
+
 	public boolean getAwake() {
 		return _status.getAwake();
 	}
@@ -134,7 +134,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the online of this status
 	*/
-	@Override
+
 	public boolean getOnline() {
 		return _status.getOnline();
 	}
@@ -144,7 +144,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the play sound of this status
 	*/
-	@Override
+
 	public boolean getPlaySound() {
 		return _status.getPlaySound();
 	}
@@ -154,22 +154,22 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return <code>true</code> if this status is awake; <code>false</code> otherwise
 	*/
-	@Override
+
 	public boolean isAwake() {
 		return _status.isAwake();
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _status.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _status.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _status.isNew();
 	}
@@ -179,7 +179,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return <code>true</code> if this status is online; <code>false</code> otherwise
 	*/
-	@Override
+
 	public boolean isOnline() {
 		return _status.isOnline();
 	}
@@ -189,47 +189,47 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return <code>true</code> if this status is play sound; <code>false</code> otherwise
 	*/
-	@Override
+
 	public boolean isPlaySound() {
 		return _status.isPlaySound();
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status toEscapedModel() {
 		return new StatusWrapper(_status.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status toUnescapedModel() {
 		return new StatusWrapper(_status.toUnescapedModel());
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _status.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.chat.model.Status> toCacheModel() {
 		return _status.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.chat.model.Status status) {
 		return _status.compareTo(status);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _status.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _status.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new StatusWrapper((Status)_status.clone());
 	}
@@ -239,7 +239,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the active panel IDs of this status
 	*/
-	@Override
+
 	public java.lang.String getActivePanelIds() {
 		return _status.getActivePanelIds();
 	}
@@ -249,7 +249,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the message of this status
 	*/
-	@Override
+
 	public java.lang.String getMessage() {
 		return _status.getMessage();
 	}
@@ -259,17 +259,17 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the user uuid of this status
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _status.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _status.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _status.toXmlString();
 	}
@@ -279,7 +279,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the modified date of this status
 	*/
-	@Override
+
 	public long getModifiedDate() {
 		return _status.getModifiedDate();
 	}
@@ -289,7 +289,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the primary key of this status
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _status.getPrimaryKey();
 	}
@@ -299,7 +299,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the status ID of this status
 	*/
-	@Override
+
 	public long getStatusId() {
 		return _status.getStatusId();
 	}
@@ -309,12 +309,12 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @return the user ID of this status
 	*/
-	@Override
+
 	public long getUserId() {
 		return _status.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_status.persist();
 	}
@@ -324,7 +324,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param activePanelIds the active panel IDs of this status
 	*/
-	@Override
+
 	public void setActivePanelIds(java.lang.String activePanelIds) {
 		_status.setActivePanelIds(activePanelIds);
 	}
@@ -334,28 +334,28 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param awake the awake of this status
 	*/
-	@Override
+
 	public void setAwake(boolean awake) {
 		_status.setAwake(awake);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_status.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_status.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_status.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_status.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -365,7 +365,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param message the message of this status
 	*/
-	@Override
+
 	public void setMessage(java.lang.String message) {
 		_status.setMessage(message);
 	}
@@ -375,12 +375,12 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param modifiedDate the modified date of this status
 	*/
-	@Override
+
 	public void setModifiedDate(long modifiedDate) {
 		_status.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_status.setNew(n);
 	}
@@ -390,7 +390,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param online the online of this status
 	*/
-	@Override
+
 	public void setOnline(boolean online) {
 		_status.setOnline(online);
 	}
@@ -400,7 +400,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param playSound the play sound of this status
 	*/
-	@Override
+
 	public void setPlaySound(boolean playSound) {
 		_status.setPlaySound(playSound);
 	}
@@ -410,12 +410,12 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param primaryKey the primary key of this status
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_status.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_status.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -425,7 +425,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param statusId the status ID of this status
 	*/
-	@Override
+
 	public void setStatusId(long statusId) {
 		_status.setStatusId(statusId);
 	}
@@ -435,7 +435,7 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param userId the user ID of this status
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_status.setUserId(userId);
 	}
@@ -445,12 +445,12 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 	*
 	* @param userUuid the user uuid of this status
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_status.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -469,22 +469,22 @@ public class StatusWrapper implements Status, ModelWrapper<Status> {
 		return false;
 	}
 
-	@Override
+
 	public Status getWrappedModel() {
 		return _status;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _status.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _status.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_status.resetOriginalValues();
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/ClpSerializer.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/ClpSerializer.java
index 6cdd365df5c..37c1e901ce4 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/ClpSerializer.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalService.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalService.java
index efdb427108e..235bdd04bb5 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalService.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
@@ -137,11 +137,11 @@ public interface EntryLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -154,7 +154,7 @@ public interface EntryLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getEntriesCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceClp.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceClp.java
index fe59ec04418..67d747e0e9c 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceClp.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
@@ -144,7 +144,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		_methodParameterTypes25 = new String[] { "long" };
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry addEntry(
 		com.liferay.chat.model.Entry entry) {
 		Object returnObj = null;
@@ -169,7 +169,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry addEntry(long createDate,
 		long fromUserId, long toUserId, java.lang.String content) {
 		Object returnObj = null;
@@ -202,7 +202,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry addEntry(long fromUserId,
 		long toUserId, java.lang.String content) {
 		Object returnObj = null;
@@ -233,7 +233,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry createEntry(long entryId) {
 		Object returnObj = null;
 
@@ -256,7 +256,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry deleteEntry(
 		com.liferay.chat.model.Entry entry) {
 		Object returnObj = null;
@@ -281,7 +281,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry deleteEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -309,7 +309,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry fetchEntry(long entryId) {
 		Object returnObj = null;
 
@@ -332,7 +332,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry getEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -360,7 +360,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry updateEntry(
 		com.liferay.chat.model.Entry entry) {
 		Object returnObj = null;
@@ -385,7 +385,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -408,7 +408,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -431,7 +431,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -454,7 +454,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -484,7 +484,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -514,7 +514,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getEntriesCount() {
 		Object returnObj = null;
 
@@ -537,14 +537,14 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -567,7 +567,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -592,7 +592,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -624,7 +624,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -659,7 +659,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getEntries(int start,
 		int end) {
 		Object returnObj = null;
@@ -683,7 +683,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.chat.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getNewEntries(
 		long userId, long createDate, int start, int end) {
 		Object returnObj = null;
@@ -708,7 +708,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.chat.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getOldEntries(
 		long createDate, int start, int end) {
 		Object returnObj = null;
@@ -733,7 +733,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.chat.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -758,7 +758,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -788,7 +788,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void deleteEntries(long userId) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName25,
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceUtil.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceUtil.java
index 49be3786c7a..9e57da42f34 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceWrapper.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceWrapper.java
index 9c1365203da..43b41baf3ab 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceWrapper.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/EntryLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
@@ -38,20 +38,20 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entry the entry
 	* @return the entry that was added
 	*/
-	@Override
+
 	public com.liferay.chat.model.Entry addEntry(
 		com.liferay.chat.model.Entry entry) {
 		return _entryLocalService.addEntry(entry);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry addEntry(long createDate,
 		long fromUserId, long toUserId, java.lang.String content) {
 		return _entryLocalService.addEntry(createDate, fromUserId, toUserId,
 			content);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry addEntry(long fromUserId,
 		long toUserId, java.lang.String content) {
 		return _entryLocalService.addEntry(fromUserId, toUserId, content);
@@ -63,7 +63,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entryId the primary key for the new entry
 	* @return the new entry
 	*/
-	@Override
+
 	public com.liferay.chat.model.Entry createEntry(long entryId) {
 		return _entryLocalService.createEntry(entryId);
 	}
@@ -74,7 +74,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entry the entry
 	* @return the entry that was removed
 	*/
-	@Override
+
 	public com.liferay.chat.model.Entry deleteEntry(
 		com.liferay.chat.model.Entry entry) {
 		return _entryLocalService.deleteEntry(entry);
@@ -87,13 +87,13 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @return the entry that was removed
 	* @throws PortalException if a entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.chat.model.Entry deleteEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _entryLocalService.deleteEntry(entryId);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry fetchEntry(long entryId) {
 		return _entryLocalService.fetchEntry(entryId);
 	}
@@ -105,7 +105,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @return the entry
 	* @throws PortalException if a entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.chat.model.Entry getEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _entryLocalService.getEntry(entryId);
@@ -117,23 +117,23 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entry the entry
 	* @return the entry that was updated
 	*/
-	@Override
+
 	public com.liferay.chat.model.Entry updateEntry(
 		com.liferay.chat.model.Entry entry) {
 		return _entryLocalService.updateEntry(entry);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _entryLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _entryLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _entryLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -141,14 +141,14 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _entryLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -160,12 +160,12 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	*
 	* @return the number of entries
 	*/
-	@Override
+
 	public int getEntriesCount() {
 		return _entryLocalService.getEntriesCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -177,7 +177,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _entryLocalService.getOSGiServiceIdentifier();
 	}
@@ -188,7 +188,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _entryLocalService.dynamicQuery(dynamicQuery);
@@ -206,7 +206,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -226,7 +226,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -246,19 +246,19 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param end the upper bound of the range of entries (not inclusive)
 	* @return the range of entries
 	*/
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getEntries(int start,
 		int end) {
 		return _entryLocalService.getEntries(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getNewEntries(
 		long userId, long createDate, int start, int end) {
 		return _entryLocalService.getNewEntries(userId, createDate, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getOldEntries(
 		long createDate, int start, int end) {
 		return _entryLocalService.getOldEntries(createDate, start, end);
@@ -270,7 +270,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _entryLocalService.dynamicQueryCount(dynamicQuery);
@@ -283,24 +283,24 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _entryLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public void deleteEntries(long userId) {
 		_entryLocalService.deleteEntries(userId);
 	}
 
-	@Override
+
 	public EntryLocalService getWrappedService() {
 		return _entryLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(EntryLocalService entryLocalService) {
 		_entryLocalService = entryLocalService;
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalService.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalService.java
index f66d7be290c..16e099c8c56 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalService.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
@@ -140,11 +140,11 @@ public interface StatusLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -157,7 +157,7 @@ public interface StatusLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getStatusesCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceClp.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceClp.java
index 3bd660629ed..d9f6a50089e 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceClp.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
@@ -161,7 +161,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status addStatus(
 		com.liferay.chat.model.Status status) {
 		Object returnObj = null;
@@ -186,7 +186,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status createStatus(long statusId) {
 		Object returnObj = null;
 
@@ -209,7 +209,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status deleteStatus(
 		com.liferay.chat.model.Status status) {
 		Object returnObj = null;
@@ -234,7 +234,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status deleteStatus(long statusId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -262,7 +262,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status fetchStatus(long statusId) {
 		Object returnObj = null;
 
@@ -285,7 +285,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status getStatus(long statusId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -313,7 +313,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status getUserStatus(long userId) {
 		Object returnObj = null;
 
@@ -336,7 +336,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status updateStatus(
 		com.liferay.chat.model.Status status) {
 		Object returnObj = null;
@@ -361,7 +361,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status updateStatus(long userId,
 		long modifiedDate) {
 		Object returnObj = null;
@@ -386,7 +386,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status updateStatus(long userId,
 		long modifiedDate, int online, int awake,
 		java.lang.String activePanelIds, java.lang.String message, int playSound) {
@@ -426,7 +426,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -449,7 +449,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -472,7 +472,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -495,7 +495,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -525,7 +525,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -555,7 +555,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getStatusesCount() {
 		Object returnObj = null;
 
@@ -578,14 +578,14 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -608,7 +608,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -633,7 +633,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -665,7 +665,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -700,7 +700,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getAllStatuses(long companyId,
 		long userId, long modifiedDate, int start, int end) {
 		Object returnObj = null;
@@ -725,7 +725,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<java.lang.Object[]>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getGroupStatuses(long userId,
 		long modifiedDate, java.lang.String[] groupNames, int start, int end) {
 		Object returnObj = null;
@@ -760,7 +760,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<java.lang.Object[]>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getSocialStatuses(long userId,
 		int type, long modifiedDate, int start, int end) {
 		Object returnObj = null;
@@ -785,7 +785,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<java.lang.Object[]>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getSocialStatuses(long userId,
 		int[] types, long modifiedDate, int start, int end) {
 		Object returnObj = null;
@@ -820,7 +820,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<java.lang.Object[]>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Status> getStatuses(
 		int start, int end) {
 		Object returnObj = null;
@@ -844,7 +844,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return (java.util.List<com.liferay.chat.model.Status>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -869,7 +869,7 @@ public class StatusLocalServiceClp implements StatusLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceUtil.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceUtil.java
index 0aefc2971d8..13bec92af3e 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceWrapper.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceWrapper.java
index bef5265eda0..dcd13ed0f56 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceWrapper.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/StatusLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service;
@@ -38,7 +38,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param status the status
 	* @return the status that was added
 	*/
-	@Override
+
 	public com.liferay.chat.model.Status addStatus(
 		com.liferay.chat.model.Status status) {
 		return _statusLocalService.addStatus(status);
@@ -50,7 +50,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param statusId the primary key for the new status
 	* @return the new status
 	*/
-	@Override
+
 	public com.liferay.chat.model.Status createStatus(long statusId) {
 		return _statusLocalService.createStatus(statusId);
 	}
@@ -61,7 +61,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param status the status
 	* @return the status that was removed
 	*/
-	@Override
+
 	public com.liferay.chat.model.Status deleteStatus(
 		com.liferay.chat.model.Status status) {
 		return _statusLocalService.deleteStatus(status);
@@ -74,13 +74,13 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @return the status that was removed
 	* @throws PortalException if a status with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.chat.model.Status deleteStatus(long statusId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _statusLocalService.deleteStatus(statusId);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status fetchStatus(long statusId) {
 		return _statusLocalService.fetchStatus(statusId);
 	}
@@ -92,13 +92,13 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @return the status
 	* @throws PortalException if a status with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.chat.model.Status getStatus(long statusId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _statusLocalService.getStatus(statusId);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status getUserStatus(long userId) {
 		return _statusLocalService.getUserStatus(userId);
 	}
@@ -109,19 +109,19 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param status the status
 	* @return the status that was updated
 	*/
-	@Override
+
 	public com.liferay.chat.model.Status updateStatus(
 		com.liferay.chat.model.Status status) {
 		return _statusLocalService.updateStatus(status);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status updateStatus(long userId,
 		long modifiedDate) {
 		return _statusLocalService.updateStatus(userId, modifiedDate);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status updateStatus(long userId,
 		long modifiedDate, int online, int awake,
 		java.lang.String activePanelIds, java.lang.String message, int playSound) {
@@ -129,17 +129,17 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 			awake, activePanelIds, message, playSound);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _statusLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _statusLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _statusLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -147,14 +147,14 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _statusLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -166,12 +166,12 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	*
 	* @return the number of statuses
 	*/
-	@Override
+
 	public int getStatusesCount() {
 		return _statusLocalService.getStatusesCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -183,7 +183,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _statusLocalService.getOSGiServiceIdentifier();
 	}
@@ -194,7 +194,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _statusLocalService.dynamicQuery(dynamicQuery);
@@ -212,7 +212,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -232,7 +232,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -241,28 +241,28 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 			orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getAllStatuses(long companyId,
 		long userId, long modifiedDate, int start, int end) {
 		return _statusLocalService.getAllStatuses(companyId, userId,
 			modifiedDate, start, end);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getGroupStatuses(long userId,
 		long modifiedDate, java.lang.String[] groupNames, int start, int end) {
 		return _statusLocalService.getGroupStatuses(userId, modifiedDate,
 			groupNames, start, end);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getSocialStatuses(long userId,
 		int type, long modifiedDate, int start, int end) {
 		return _statusLocalService.getSocialStatuses(userId, type,
 			modifiedDate, start, end);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.Object[]> getSocialStatuses(long userId,
 		int[] types, long modifiedDate, int start, int end) {
 		return _statusLocalService.getSocialStatuses(userId, types,
@@ -280,7 +280,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param end the upper bound of the range of statuses (not inclusive)
 	* @return the range of statuses
 	*/
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Status> getStatuses(
 		int start, int end) {
 		return _statusLocalService.getStatuses(start, end);
@@ -292,7 +292,7 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _statusLocalService.dynamicQueryCount(dynamicQuery);
@@ -305,19 +305,19 @@ public class StatusLocalServiceWrapper implements StatusLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _statusLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public StatusLocalService getWrappedService() {
 		return _statusLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(StatusLocalService statusLocalService) {
 		_statusLocalService = statusLocalService;
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/messaging/ClpMessageListener.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/messaging/ClpMessageListener.java
index 858859605ef..ffbdc35607e 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/messaging/ClpMessageListener.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.messaging;
@@ -32,7 +32,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinder.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinder.java
index bd9332c5ff2..b3252984b83 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinder.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinderUtil.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinderUtil.java
index e4ed4d22cb6..feebdfb83a6 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinderUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryPersistence.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryPersistence.java
index 8a6ea3c68cd..c53d5676f17 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryPersistence.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
@@ -1233,7 +1233,7 @@ public interface EntryPersistence extends BasePersistence<Entry> {
 	*/
 	public Entry fetchByPrimaryKey(long entryId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, Entry> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryUtil.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryUtil.java
index b29e858f459..2b4f5b8c4ba 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/EntryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinder.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinder.java
index 362a6d5ea74..6ed227c2214 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinder.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinderUtil.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinderUtil.java
index 1b573f5aace..c65fbe534ee 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinderUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusPersistence.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusPersistence.java
index dc223165d42..78aee79f5c7 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusPersistence.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
@@ -539,7 +539,7 @@ public interface StatusPersistence extends BasePersistence<Status> {
 	*/
 	public Status fetchByPrimaryKey(long statusId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, Status> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -607,6 +607,6 @@ public interface StatusPersistence extends BasePersistence<Status> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusUtil.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusUtil.java
index 27471c4548b..0c3539902cd 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/service/persistence/StatusUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/util/comparator/BuddyComparator.java b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/util/comparator/BuddyComparator.java
index 1c63980b10a..baafd558ff3 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/util/comparator/BuddyComparator.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/service/com/liferay/chat/util/comparator/BuddyComparator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util.comparator;
@@ -31,7 +31,7 @@ public class BuddyComparator implements Comparator<Object[]> {
 		_asc = asc;
 	}
 
-	@Override
+
 	public int compare(Object[] buddy1, Object[] buddy2) {
 		long userId1 = 0;
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/LoginPostAction.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/LoginPostAction.java
index e0d74678ad1..000404d1961 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/LoginPostAction.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/LoginPostAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.hook.events;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class LoginPostAction extends Action {
 
-	@Override
+
 	public void run(HttpServletRequest request, HttpServletResponse response) {
 		long userId = PortalUtil.getUserId(request);
 		String password = PortalUtil.getUserPassword(request);
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/SessionDestroyAction.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/SessionDestroyAction.java
index e76bd3e2cdc..7c061d82561 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/SessionDestroyAction.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/events/SessionDestroyAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.hook.events;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession;
  */
 public class SessionDestroyAction extends SessionAction {
 
-	@Override
+
 	public void run(HttpSession session) {
 		Long userId = (Long)session.getAttribute(WebKeys.USER_ID);
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/listeners/UserModelListener.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/listeners/UserModelListener.java
index 4b85230eb4e..3a99d75a5b7 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/listeners/UserModelListener.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/hook/listeners/UserModelListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.hook.listeners;
@@ -29,7 +29,7 @@ import com.liferay.portal.kernel.model.User;
  */
 public class UserModelListener extends BaseModelListener<User> {
 
-	@Override
+
 	public void onAfterRemove(User user) {
 		try {
 			if (_log.isDebugEnabled()) {
@@ -54,7 +54,7 @@ public class UserModelListener extends BaseModelListener<User> {
 		}
 	}
 
-	@Override
+
 	public void onAfterUpdate(User user) {
 		JabberUtil.updatePassword(
 			user.getUserId(), user.getPasswordUnencrypted());
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/Jabber.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/Jabber.java
index 27116c9e295..2ede29054bb 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/Jabber.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/Jabber.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.jabber;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberChatManagerListener.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberChatManagerListener.java
index e8ea697e4e5..336aa1a6de2 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberChatManagerListener.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberChatManagerListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.jabber;
@@ -28,7 +28,7 @@ public class JabberChatManagerListener implements ChatManagerListener {
 		_userId = userId;
 	}
 
-	@Override
+
 	public void chatCreated(Chat chat, boolean createdLocally) {
 		if (!createdLocally) {
 			MessageListener messageListener = new JabberMessageListener(
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberImpl.java
index c1d3ded9814..f0158d266aa 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.jabber;
@@ -59,7 +59,7 @@ import org.jivesoftware.smack.packet.Presence;
  */
 public class JabberImpl implements Jabber {
 
-	@Override
+
 	public void disconnect(long userId) {
 		Connection connection = getConnection(userId);
 
@@ -74,7 +74,7 @@ public class JabberImpl implements Jabber {
 		_onlineUserIds.remove(userId);
 	}
 
-	@Override
+
 	public String getResource(String jabberId) {
 		String resource = StringUtil.extractLast(jabberId, StringPool.AT);
 
@@ -87,12 +87,12 @@ public class JabberImpl implements Jabber {
 		return resource;
 	}
 
-	@Override
+
 	public String getScreenName(String jabberId) {
 		return StringUtil.extractFirst(jabberId, StringPool.AT);
 	}
 
-	@Override
+
 	public List<Object[]> getStatuses(
 		long companyId, long userId, List<Object[]> buddies) {
 
@@ -176,7 +176,7 @@ public class JabberImpl implements Jabber {
 		}
 	}
 
-	@Override
+
 	public void login(long userId, String password) {
 		try {
 			connect(userId, password);
@@ -226,7 +226,7 @@ public class JabberImpl implements Jabber {
 		}
 	}
 
-	@Override
+
 	public void sendMessage(long fromUserId, long toUserId, String content) {
 		try {
 			if (Validator.isNull(content)) {
@@ -294,7 +294,7 @@ public class JabberImpl implements Jabber {
 		}
 	}
 
-	@Override
+
 	public void updatePassword(long userId, String password) {
 		if (!PortletPropsValues.JABBER_IMPORT_USER_ENABLED ||
 			(password == null)) {
@@ -318,7 +318,7 @@ public class JabberImpl implements Jabber {
 		}
 	}
 
-	@Override
+
 	public void updateStatus(long userId, int online) {
 		updateStatus(userId, online, null);
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberMessageListener.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberMessageListener.java
index 62b20ab8309..56a1db7892f 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberMessageListener.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.jabber;
@@ -36,7 +36,7 @@ public class JabberMessageListener implements MessageListener {
 		_userId = userId;
 	}
 
-	@Override
+
 	public void processMessage(Chat chat, Message message) {
 		try {
 			String body = message.getBody();
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberUtil.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberUtil.java
index 8e1e4fb7ac5..eb21f161a61 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/jabber/JabberUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.jabber;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/messaging/ChatHotDeployMessageListener.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/messaging/ChatHotDeployMessageListener.java
index 324f19b1a27..20da1cd309e 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/messaging/ChatHotDeployMessageListener.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/messaging/ChatHotDeployMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.messaging;
@@ -23,7 +23,7 @@ import com.liferay.portal.kernel.messaging.Message;
  */
 public class ChatHotDeployMessageListener extends HotDeployMessageListener {
 
-	@Override
+
 	protected void onUndeploy(Message message) throws Exception {
 		ChatExtensionsUtil.unregister(message.getString("servletContextName"));
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/EntryConstants.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/EntryConstants.java
index ee35dbbd982..0ac9f1ba161 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/EntryConstants.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/EntryConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryBaseImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryBaseImpl.java
index 197f5180c90..6dc13fd5f60 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryBaseImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
@@ -38,7 +38,7 @@ public abstract class EntryBaseImpl extends EntryModelImpl implements Entry {
 	 *
 	 * Never modify or reference this class directly. All methods that expect a entry model instance should use the {@link Entry} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			EntryLocalServiceUtil.addEntry(this);
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryCacheModel.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryCacheModel.java
index e01494c0486..a3c06f5b5c8 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryCacheModel.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
@@ -37,7 +37,7 @@ import java.io.ObjectOutput;
  */
 @ProviderType
 public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -56,12 +56,12 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, entryId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(13);
 
@@ -82,7 +82,7 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		return sb.toString();
 	}
 
-	@Override
+
 	public Entry toEntityModel() {
 		EntryImpl entryImpl = new EntryImpl();
 
@@ -105,7 +105,7 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		return entryImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		entryId = objectInput.readLong();
 
@@ -119,7 +119,7 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		flag = objectInput.readInt();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(entryId);
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryImpl.java
index 70710be8b4e..01a7f085065 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryModelImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryModelImpl.java
index 8d2b8e0bb7a..a6dd2fd1e40 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryModelImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/EntryModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
@@ -107,37 +107,37 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	public EntryModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Entry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Entry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -154,7 +154,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long entryId = (Long)attributes.get("entryId");
 
@@ -193,22 +193,22 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public long getEntryId() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setEntryId(long entryId) {
 		_entryId = entryId;
 	}
 
-	@Override
+
 	public long getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(long createDate) {
 		_columnBitmask = -1L;
 
@@ -225,12 +225,12 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _originalCreateDate;
 	}
 
-	@Override
+
 	public long getFromUserId() {
 		return _fromUserId;
 	}
 
-	@Override
+
 	public void setFromUserId(long fromUserId) {
 		_columnBitmask |= FROMUSERID_COLUMN_BITMASK;
 
@@ -243,7 +243,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		_fromUserId = fromUserId;
 	}
 
-	@Override
+
 	public String getFromUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getFromUserId());
@@ -255,7 +255,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setFromUserUuid(String fromUserUuid) {
 	}
 
@@ -263,12 +263,12 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _originalFromUserId;
 	}
 
-	@Override
+
 	public long getToUserId() {
 		return _toUserId;
 	}
 
-	@Override
+
 	public void setToUserId(long toUserId) {
 		_columnBitmask |= TOUSERID_COLUMN_BITMASK;
 
@@ -281,7 +281,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		_toUserId = toUserId;
 	}
 
-	@Override
+
 	public String getToUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getToUserId());
@@ -293,7 +293,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setToUserUuid(String toUserUuid) {
 	}
 
@@ -301,7 +301,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _originalToUserId;
 	}
 
-	@Override
+
 	public String getContent() {
 		if (_content == null) {
 			return StringPool.BLANK;
@@ -311,7 +311,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setContent(String content) {
 		_columnBitmask |= CONTENT_COLUMN_BITMASK;
 
@@ -326,12 +326,12 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return GetterUtil.getString(_originalContent);
 	}
 
-	@Override
+
 	public int getFlag() {
 		return _flag;
 	}
 
-	@Override
+
 	public void setFlag(int flag) {
 		_flag = flag;
 	}
@@ -340,20 +340,20 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			Entry.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public Entry toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (Entry)ProxyUtil.newProxyInstance(_classLoader,
@@ -363,7 +363,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		EntryImpl entryImpl = new EntryImpl();
 
@@ -379,7 +379,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return entryImpl;
 	}
 
-	@Override
+
 	public int compareTo(Entry entry) {
 		int value = 0;
 
@@ -402,7 +402,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -424,22 +424,22 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		EntryModelImpl entryModelImpl = this;
 
@@ -460,7 +460,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		entryModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<Entry> toCacheModel() {
 		EntryCacheModel entryCacheModel = new EntryCacheModel();
 
@@ -485,7 +485,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return entryCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(13);
 
@@ -506,7 +506,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(22);
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusBaseImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusBaseImpl.java
index 528925ab503..bd8e62e1792 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusBaseImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
@@ -38,7 +38,7 @@ public abstract class StatusBaseImpl extends StatusModelImpl implements Status {
 	 *
 	 * Never modify or reference this class directly. All methods that expect a status model instance should use the {@link Status} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			StatusLocalServiceUtil.addStatus(this);
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusCacheModel.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusCacheModel.java
index b0e1821219c..5088a0e7879 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusCacheModel.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
@@ -37,7 +37,7 @@ import java.io.ObjectOutput;
  */
 @ProviderType
 public class StatusCacheModel implements CacheModel<Status>, Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -56,12 +56,12 @@ public class StatusCacheModel implements CacheModel<Status>, Externalizable {
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, statusId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(17);
 
@@ -86,7 +86,7 @@ public class StatusCacheModel implements CacheModel<Status>, Externalizable {
 		return sb.toString();
 	}
 
-	@Override
+
 	public Status toEntityModel() {
 		StatusImpl statusImpl = new StatusImpl();
 
@@ -117,7 +117,7 @@ public class StatusCacheModel implements CacheModel<Status>, Externalizable {
 		return statusImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		statusId = objectInput.readLong();
 
@@ -134,7 +134,7 @@ public class StatusCacheModel implements CacheModel<Status>, Externalizable {
 		playSound = objectInput.readBoolean();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(statusId);
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusImpl.java
index b3500e4ce09..434945aeb20 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusModelImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusModelImpl.java
index d692bfc7cb4..cf1737f36ed 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusModelImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/model/impl/StatusModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.model.impl;
@@ -112,37 +112,37 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 	public StatusModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _statusId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setStatusId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _statusId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Status.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Status.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -161,7 +161,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long statusId = (Long)attributes.get("statusId");
 
@@ -212,22 +212,22 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		}
 	}
 
-	@Override
+
 	public long getStatusId() {
 		return _statusId;
 	}
 
-	@Override
+
 	public void setStatusId(long statusId) {
 		_statusId = statusId;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_columnBitmask |= USERID_COLUMN_BITMASK;
 
@@ -240,7 +240,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -252,7 +252,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
@@ -260,12 +260,12 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return _originalUserId;
 	}
 
-	@Override
+
 	public long getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(long modifiedDate) {
 		_columnBitmask |= MODIFIEDDATE_COLUMN_BITMASK;
 
@@ -282,17 +282,17 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return _originalModifiedDate;
 	}
 
-	@Override
+
 	public boolean getOnline() {
 		return _online;
 	}
 
-	@Override
+
 	public boolean isOnline() {
 		return _online;
 	}
 
-	@Override
+
 	public void setOnline(boolean online) {
 		_columnBitmask |= ONLINE_COLUMN_BITMASK;
 
@@ -309,22 +309,22 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return _originalOnline;
 	}
 
-	@Override
+
 	public boolean getAwake() {
 		return _awake;
 	}
 
-	@Override
+
 	public boolean isAwake() {
 		return _awake;
 	}
 
-	@Override
+
 	public void setAwake(boolean awake) {
 		_awake = awake;
 	}
 
-	@Override
+
 	public String getActivePanelIds() {
 		if (_activePanelIds == null) {
 			return StringPool.BLANK;
@@ -334,12 +334,12 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		}
 	}
 
-	@Override
+
 	public void setActivePanelIds(String activePanelIds) {
 		_activePanelIds = activePanelIds;
 	}
 
-	@Override
+
 	public String getMessage() {
 		if (_message == null) {
 			return StringPool.BLANK;
@@ -349,22 +349,22 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		}
 	}
 
-	@Override
+
 	public void setMessage(String message) {
 		_message = message;
 	}
 
-	@Override
+
 	public boolean getPlaySound() {
 		return _playSound;
 	}
 
-	@Override
+
 	public boolean isPlaySound() {
 		return _playSound;
 	}
 
-	@Override
+
 	public void setPlaySound(boolean playSound) {
 		_playSound = playSound;
 	}
@@ -373,20 +373,20 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			Status.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public Status toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (Status)ProxyUtil.newProxyInstance(_classLoader,
@@ -396,7 +396,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		StatusImpl statusImpl = new StatusImpl();
 
@@ -414,7 +414,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return statusImpl;
 	}
 
-	@Override
+
 	public int compareTo(Status status) {
 		long primaryKey = status.getPrimaryKey();
 
@@ -429,7 +429,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -451,22 +451,22 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		StatusModelImpl statusModelImpl = this;
 
@@ -485,7 +485,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		statusModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<Status> toCacheModel() {
 		StatusCacheModel statusCacheModel = new StatusCacheModel();
 
@@ -520,7 +520,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return statusCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(17);
 
@@ -545,7 +545,7 @@ public class StatusModelImpl extends BaseModelImpl<Status>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(28);
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/poller/ChatPollerProcessor.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/poller/ChatPollerProcessor.java
index bd556e722c5..28c2670cc1b 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/poller/ChatPollerProcessor.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/poller/ChatPollerProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.poller;
@@ -61,7 +61,7 @@ public class ChatPollerProcessor extends BasePollerProcessor {
 		}
 	}
 
-	@Override
+
 	protected PollerResponse doReceive(PollerRequest pollerRequest)
 		throws Exception {
 
@@ -73,7 +73,7 @@ public class ChatPollerProcessor extends BasePollerProcessor {
 		return pollerResponse;
 	}
 
-	@Override
+
 	protected void doSend(PollerRequest pollerRequest) throws Exception {
 		addEntry(pollerRequest);
 		updateStatus(pollerRequest);
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceBaseImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceBaseImpl.java
index 5e7fafa1394..26e36796078 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceBaseImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.base;
@@ -81,7 +81,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Entry addEntry(Entry entry) {
 		entry.setNew(true);
 
@@ -94,7 +94,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param entryId the primary key for the new entry
 	 * @return the new entry
 	 */
-	@Override
+
 	public Entry createEntry(long entryId) {
 		return entryPersistence.create(entryId);
 	}
@@ -107,7 +107,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a entry with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Entry deleteEntry(long entryId) throws PortalException {
 		return entryPersistence.remove(entryId);
 	}
@@ -119,12 +119,12 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Entry deleteEntry(Entry entry) {
 		return entryPersistence.remove(entry);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -138,7 +138,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return entryPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -155,7 +155,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return entryPersistence.findWithDynamicQuery(dynamicQuery, start, end);
@@ -174,7 +174,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return entryPersistence.findWithDynamicQuery(dynamicQuery, start, end,
@@ -187,7 +187,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return entryPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -199,13 +199,13 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return entryPersistence.countWithDynamicQuery(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public Entry fetchEntry(long entryId) {
 		return entryPersistence.fetchByPrimaryKey(entryId);
 	}
@@ -217,12 +217,12 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry
 	 * @throws PortalException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry getEntry(long entryId) throws PortalException {
 		return entryPersistence.findByPrimaryKey(entryId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -235,7 +235,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -260,13 +260,13 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return entryLocalService.deleteEntry((Entry)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return entryPersistence.findByPrimaryKey(primaryKeyObj);
@@ -283,7 +283,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of entries
 	 */
-	@Override
+
 	public List<Entry> getEntries(int start, int end) {
 		return entryPersistence.findAll(start, end);
 	}
@@ -293,7 +293,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of entries
 	 */
-	@Override
+
 	public int getEntriesCount() {
 		return entryPersistence.countAll();
 	}
@@ -305,7 +305,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Entry updateEntry(Entry entry) {
 		return entryPersistence.update(entry);
 	}
@@ -551,12 +551,12 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return EntryLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceClpInvoker.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceClpInvoker.java
index da0a53c3a69..d2c7dba0fc4 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceClpInvoker.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/EntryLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.base;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceBaseImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceBaseImpl.java
index 8d9bfdabb34..5d0376986b8 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceBaseImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.base;
@@ -81,7 +81,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the status that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Status addStatus(Status status) {
 		status.setNew(true);
 
@@ -94,7 +94,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param statusId the primary key for the new status
 	 * @return the new status
 	 */
-	@Override
+
 	public Status createStatus(long statusId) {
 		return statusPersistence.create(statusId);
 	}
@@ -107,7 +107,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a status with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Status deleteStatus(long statusId) throws PortalException {
 		return statusPersistence.remove(statusId);
 	}
@@ -119,12 +119,12 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the status that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Status deleteStatus(Status status) {
 		return statusPersistence.remove(status);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -138,7 +138,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return statusPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -155,7 +155,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return statusPersistence.findWithDynamicQuery(dynamicQuery, start, end);
@@ -174,7 +174,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return statusPersistence.findWithDynamicQuery(dynamicQuery, start, end,
@@ -187,7 +187,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return statusPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -199,13 +199,13 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return statusPersistence.countWithDynamicQuery(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public Status fetchStatus(long statusId) {
 		return statusPersistence.fetchByPrimaryKey(statusId);
 	}
@@ -217,12 +217,12 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the status
 	 * @throws PortalException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status getStatus(long statusId) throws PortalException {
 		return statusPersistence.findByPrimaryKey(statusId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -235,7 +235,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -260,13 +260,13 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return statusLocalService.deleteStatus((Status)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return statusPersistence.findByPrimaryKey(primaryKeyObj);
@@ -283,7 +283,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of statuses (not inclusive)
 	 * @return the range of statuses
 	 */
-	@Override
+
 	public List<Status> getStatuses(int start, int end) {
 		return statusPersistence.findAll(start, end);
 	}
@@ -293,7 +293,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of statuses
 	 */
-	@Override
+
 	public int getStatusesCount() {
 		return statusPersistence.countAll();
 	}
@@ -305,7 +305,7 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the status that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Status updateStatus(Status status) {
 		return statusPersistence.update(status);
 	}
@@ -551,12 +551,12 @@ public abstract class StatusLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return StatusLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceClpInvoker.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceClpInvoker.java
index 89512c71c56..f35077fef4b 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceClpInvoker.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/base/StatusLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.base;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/EntryLocalServiceImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/EntryLocalServiceImpl.java
index 716b3ed2435..e8108002089 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/EntryLocalServiceImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/EntryLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.impl;
@@ -30,7 +30,7 @@ import java.util.List;
  */
 public class EntryLocalServiceImpl extends EntryLocalServiceBaseImpl {
 
-	@Override
+
 	public Entry addEntry(
 		long createDate, long fromUserId, long toUserId, String content) {
 
@@ -76,27 +76,27 @@ public class EntryLocalServiceImpl extends EntryLocalServiceBaseImpl {
 		return entry;
 	}
 
-	@Override
+
 	public Entry addEntry(long fromUserId, long toUserId, String content) {
 		long createDate = System.currentTimeMillis();
 
 		return addEntry(createDate, fromUserId, toUserId, content);
 	}
 
-	@Override
+
 	public void deleteEntries(long userId) {
 		entryPersistence.removeByFromUserId(userId);
 		entryPersistence.removeByToUserId(userId);
 	}
 
-	@Override
+
 	public List<Entry> getNewEntries(
 		long userId, long createDate, int start, int end) {
 
 		return entryFinder.findByNew(userId, createDate, start, end);
 	}
 
-	@Override
+
 	public List<Entry> getOldEntries(long createDate, int start, int end) {
 		return entryFinder.findByOld(createDate, start, end);
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/StatusLocalServiceImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/StatusLocalServiceImpl.java
index 7cc4ee28a3a..03e0dcfd0ae 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/StatusLocalServiceImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/impl/StatusLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.impl;
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class StatusLocalServiceImpl extends StatusLocalServiceBaseImpl {
 
-	@Override
+
 	public List<Object[]> getAllStatuses(
 		long companyId, long userId, long modifiedDate, int start, int end) {
 
@@ -44,7 +44,7 @@ public class StatusLocalServiceImpl extends StatusLocalServiceBaseImpl {
 			companyId, userId, modifiedDate, start, end);
 	}
 
-	@Override
+
 	public List<Object[]> getGroupStatuses(
 		long userId, long modifiedDate, String[] groupNames, int start,
 		int end) {
@@ -53,7 +53,7 @@ public class StatusLocalServiceImpl extends StatusLocalServiceBaseImpl {
 			userId, modifiedDate, groupNames, start, end);
 	}
 
-	@Override
+
 	public List<Object[]> getSocialStatuses(
 		long userId, int type, long modifiedDate, int start, int end) {
 
@@ -61,7 +61,7 @@ public class StatusLocalServiceImpl extends StatusLocalServiceBaseImpl {
 			userId, new int[] {type}, modifiedDate, start, end);
 	}
 
-	@Override
+
 	public List<Object[]> getSocialStatuses(
 		long userId, int[] types, long modifiedDate, int start, int end) {
 
@@ -69,7 +69,7 @@ public class StatusLocalServiceImpl extends StatusLocalServiceBaseImpl {
 			userId, types, modifiedDate, start, end);
 	}
 
-	@Override
+
 	public Status getUserStatus(long userId) {
 		Status status = statusPersistence.fetchByUserId(userId);
 
@@ -82,12 +82,12 @@ public class StatusLocalServiceImpl extends StatusLocalServiceBaseImpl {
 		return status;
 	}
 
-	@Override
+
 	public Status updateStatus(long userId, long modifiedDate) {
 		return updateStatus(userId, modifiedDate, -1, -1, null, null, -1);
 	}
 
-	@Override
+
 	public Status updateStatus(
 		long userId, long modifiedDate, int online, int awake,
 		String activePanelIds, String message, int playSound) {
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderBaseImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderBaseImpl.java
index c42d3ac2282..538e344b80c 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderBaseImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence.impl;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderImpl.java
index ecc3a78c4eb..81d92144898 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryFinderImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence.impl;
@@ -43,7 +43,7 @@ public class EntryFinderImpl
 	public static final String FIND_BY_OLD =
 		EntryFinder.class.getName() + ".findByOld";
 
-	@Override
+
 	public List<Entry> findByEmptyContent(
 		long fromUserId, long toUserId, int start, int end) {
 
@@ -73,7 +73,7 @@ public class EntryFinderImpl
 		}
 	}
 
-	@Override
+
 	public List<Entry> findByNew(
 		long userId, long createDate, int start, int end) {
 
@@ -114,7 +114,7 @@ public class EntryFinderImpl
 		}
 	}
 
-	@Override
+
 	public List<Entry> findByOld(long createDate, int start, int end) {
 		Session session = null;
 
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryPersistenceImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryPersistenceImpl.java
index cb299c3b326..86f01aff8f2 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryPersistenceImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/EntryPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence.impl;
@@ -111,7 +111,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param createDate the create date
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByCreateDate(long createDate) {
 		return findByCreateDate(createDate, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -129,7 +129,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByCreateDate(long createDate, int start, int end) {
 		return findByCreateDate(createDate, start, end, null);
 	}
@@ -147,7 +147,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByCreateDate(long createDate, int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
 		return findByCreateDate(createDate, start, end, orderByComparator, true);
@@ -167,7 +167,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByCreateDate(long createDate, int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -277,7 +277,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByCreateDate_First(long createDate,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByCreateDate_First(createDate, orderByComparator);
@@ -305,7 +305,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByCreateDate_First(long createDate,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByCreateDate(createDate, 0, 1, orderByComparator);
@@ -325,7 +325,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByCreateDate_Last(long createDate,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByCreateDate_Last(createDate, orderByComparator);
@@ -353,7 +353,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByCreateDate_Last(long createDate,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByCreateDate(createDate);
@@ -381,7 +381,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByCreateDate_PrevAndNext(long entryId, long createDate,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = findByPrimaryKey(entryId);
@@ -522,7 +522,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param createDate the create date
 	 */
-	@Override
+
 	public void removeByCreateDate(long createDate) {
 		for (Entry entry : findByCreateDate(createDate, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -536,7 +536,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param createDate the create date
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByCreateDate(long createDate) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_CREATEDATE;
 
@@ -610,7 +610,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param fromUserId the from user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByFromUserId(long fromUserId) {
 		return findByFromUserId(fromUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -628,7 +628,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByFromUserId(long fromUserId, int start, int end) {
 		return findByFromUserId(fromUserId, start, end, null);
 	}
@@ -646,7 +646,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByFromUserId(long fromUserId, int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
 		return findByFromUserId(fromUserId, start, end, orderByComparator, true);
@@ -666,7 +666,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByFromUserId(long fromUserId, int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -776,7 +776,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByFromUserId_First(long fromUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByFromUserId_First(fromUserId, orderByComparator);
@@ -804,7 +804,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByFromUserId_First(long fromUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByFromUserId(fromUserId, 0, 1, orderByComparator);
@@ -824,7 +824,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByFromUserId_Last(long fromUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByFromUserId_Last(fromUserId, orderByComparator);
@@ -852,7 +852,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByFromUserId_Last(long fromUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByFromUserId(fromUserId);
@@ -880,7 +880,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByFromUserId_PrevAndNext(long entryId, long fromUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = findByPrimaryKey(entryId);
@@ -1021,7 +1021,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param fromUserId the from user ID
 	 */
-	@Override
+
 	public void removeByFromUserId(long fromUserId) {
 		for (Entry entry : findByFromUserId(fromUserId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1035,7 +1035,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param fromUserId the from user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByFromUserId(long fromUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_FROMUSERID;
 
@@ -1108,7 +1108,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByToUserId(long toUserId) {
 		return findByToUserId(toUserId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -1126,7 +1126,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByToUserId(long toUserId, int start, int end) {
 		return findByToUserId(toUserId, start, end, null);
 	}
@@ -1144,7 +1144,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByToUserId(long toUserId, int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
 		return findByToUserId(toUserId, start, end, orderByComparator, true);
@@ -1164,7 +1164,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByToUserId(long toUserId, int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -1274,7 +1274,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByToUserId_First(long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByToUserId_First(toUserId, orderByComparator);
@@ -1302,7 +1302,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByToUserId_First(long toUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByToUserId(toUserId, 0, 1, orderByComparator);
@@ -1322,7 +1322,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByToUserId_Last(long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByToUserId_Last(toUserId, orderByComparator);
@@ -1350,7 +1350,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByToUserId_Last(long toUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByToUserId(toUserId);
@@ -1378,7 +1378,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByToUserId_PrevAndNext(long entryId, long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = findByPrimaryKey(entryId);
@@ -1519,7 +1519,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param toUserId the to user ID
 	 */
-	@Override
+
 	public void removeByToUserId(long toUserId) {
 		for (Entry entry : findByToUserId(toUserId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1533,7 +1533,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByToUserId(long toUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_TOUSERID;
 
@@ -1606,7 +1606,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param fromUserId the from user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F(long createDate, long fromUserId) {
 		return findByC_F(createDate, fromUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1625,7 +1625,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F(long createDate, long fromUserId, int start,
 		int end) {
 		return findByC_F(createDate, fromUserId, start, end, null);
@@ -1645,7 +1645,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F(long createDate, long fromUserId, int start,
 		int end, OrderByComparator<Entry> orderByComparator) {
 		return findByC_F(createDate, fromUserId, start, end, orderByComparator,
@@ -1667,7 +1667,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F(long createDate, long fromUserId, int start,
 		int end, OrderByComparator<Entry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1788,7 +1788,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByC_F_First(long createDate, long fromUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByC_F_First(createDate, fromUserId, orderByComparator);
@@ -1820,7 +1820,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByC_F_First(long createDate, long fromUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByC_F(createDate, fromUserId, 0, 1,
@@ -1842,7 +1842,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByC_F_Last(long createDate, long fromUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByC_F_Last(createDate, fromUserId, orderByComparator);
@@ -1874,7 +1874,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByC_F_Last(long createDate, long fromUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByC_F(createDate, fromUserId);
@@ -1903,7 +1903,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByC_F_PrevAndNext(long entryId, long createDate,
 		long fromUserId, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -2050,7 +2050,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param createDate the create date
 	 * @param fromUserId the from user ID
 	 */
-	@Override
+
 	public void removeByC_F(long createDate, long fromUserId) {
 		for (Entry entry : findByC_F(createDate, fromUserId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -2065,7 +2065,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param fromUserId the from user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByC_F(long createDate, long fromUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_C_F;
 
@@ -2143,7 +2143,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_T(long createDate, long toUserId) {
 		return findByC_T(createDate, toUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -2162,7 +2162,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_T(long createDate, long toUserId, int start,
 		int end) {
 		return findByC_T(createDate, toUserId, start, end, null);
@@ -2182,7 +2182,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_T(long createDate, long toUserId, int start,
 		int end, OrderByComparator<Entry> orderByComparator) {
 		return findByC_T(createDate, toUserId, start, end, orderByComparator,
@@ -2204,7 +2204,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_T(long createDate, long toUserId, int start,
 		int end, OrderByComparator<Entry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2325,7 +2325,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByC_T_First(long createDate, long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByC_T_First(createDate, toUserId, orderByComparator);
@@ -2357,7 +2357,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByC_T_First(long createDate, long toUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByC_T(createDate, toUserId, 0, 1,
@@ -2379,7 +2379,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByC_T_Last(long createDate, long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByC_T_Last(createDate, toUserId, orderByComparator);
@@ -2411,7 +2411,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByC_T_Last(long createDate, long toUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByC_T(createDate, toUserId);
@@ -2440,7 +2440,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByC_T_PrevAndNext(long entryId, long createDate,
 		long toUserId, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -2587,7 +2587,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param createDate the create date
 	 * @param toUserId the to user ID
 	 */
-	@Override
+
 	public void removeByC_T(long createDate, long toUserId) {
 		for (Entry entry : findByC_T(createDate, toUserId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -2602,7 +2602,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByC_T(long createDate, long toUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_C_T;
 
@@ -2681,7 +2681,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T(long fromUserId, long toUserId) {
 		return findByF_T(fromUserId, toUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -2700,7 +2700,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T(long fromUserId, long toUserId, int start,
 		int end) {
 		return findByF_T(fromUserId, toUserId, start, end, null);
@@ -2720,7 +2720,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T(long fromUserId, long toUserId, int start,
 		int end, OrderByComparator<Entry> orderByComparator) {
 		return findByF_T(fromUserId, toUserId, start, end, orderByComparator,
@@ -2742,7 +2742,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T(long fromUserId, long toUserId, int start,
 		int end, OrderByComparator<Entry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2863,7 +2863,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByF_T_First(long fromUserId, long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByF_T_First(fromUserId, toUserId, orderByComparator);
@@ -2895,7 +2895,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByF_T_First(long fromUserId, long toUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByF_T(fromUserId, toUserId, 0, 1,
@@ -2917,7 +2917,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByF_T_Last(long fromUserId, long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByF_T_Last(fromUserId, toUserId, orderByComparator);
@@ -2949,7 +2949,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByF_T_Last(long fromUserId, long toUserId,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByF_T(fromUserId, toUserId);
@@ -2978,7 +2978,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByF_T_PrevAndNext(long entryId, long fromUserId,
 		long toUserId, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -3125,7 +3125,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param fromUserId the from user ID
 	 * @param toUserId the to user ID
 	 */
-	@Override
+
 	public void removeByF_T(long fromUserId, long toUserId) {
 		for (Entry entry : findByF_T(fromUserId, toUserId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -3140,7 +3140,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByF_T(long fromUserId, long toUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_F_T;
 
@@ -3224,7 +3224,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F_T(long createDate, long fromUserId,
 		long toUserId) {
 		return findByC_F_T(createDate, fromUserId, toUserId, QueryUtil.ALL_POS,
@@ -3245,7 +3245,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F_T(long createDate, long fromUserId,
 		long toUserId, int start, int end) {
 		return findByC_F_T(createDate, fromUserId, toUserId, start, end, null);
@@ -3266,7 +3266,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F_T(long createDate, long fromUserId,
 		long toUserId, int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
@@ -3290,7 +3290,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByC_F_T(long createDate, long fromUserId,
 		long toUserId, int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
@@ -3417,7 +3417,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByC_F_T_First(long createDate, long fromUserId,
 		long toUserId, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -3455,7 +3455,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByC_F_T_First(long createDate, long fromUserId,
 		long toUserId, OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByC_F_T(createDate, fromUserId, toUserId, 0, 1,
@@ -3478,7 +3478,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByC_F_T_Last(long createDate, long fromUserId,
 		long toUserId, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -3516,7 +3516,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByC_F_T_Last(long createDate, long fromUserId,
 		long toUserId, OrderByComparator<Entry> orderByComparator) {
 		int count = countByC_F_T(createDate, fromUserId, toUserId);
@@ -3546,7 +3546,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByC_F_T_PrevAndNext(long entryId, long createDate,
 		long fromUserId, long toUserId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
@@ -3698,7 +3698,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param fromUserId the from user ID
 	 * @param toUserId the to user ID
 	 */
-	@Override
+
 	public void removeByC_F_T(long createDate, long fromUserId, long toUserId) {
 		for (Entry entry : findByC_F_T(createDate, fromUserId, toUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -3714,7 +3714,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByC_F_T(long createDate, long fromUserId, long toUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_C_F_T;
 
@@ -3807,7 +3807,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param content the content
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T_C(long fromUserId, long toUserId,
 		String content) {
 		return findByF_T_C(fromUserId, toUserId, content, QueryUtil.ALL_POS,
@@ -3828,7 +3828,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T_C(long fromUserId, long toUserId,
 		String content, int start, int end) {
 		return findByF_T_C(fromUserId, toUserId, content, start, end, null);
@@ -3849,7 +3849,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T_C(long fromUserId, long toUserId,
 		String content, int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
@@ -3873,7 +3873,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByF_T_C(long fromUserId, long toUserId,
 		String content, int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
@@ -4014,7 +4014,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByF_T_C_First(long fromUserId, long toUserId,
 		String content, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -4052,7 +4052,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByF_T_C_First(long fromUserId, long toUserId,
 		String content, OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByF_T_C(fromUserId, toUserId, content, 0, 1,
@@ -4075,7 +4075,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByF_T_C_Last(long fromUserId, long toUserId,
 		String content, OrderByComparator<Entry> orderByComparator)
 		throws NoSuchEntryException {
@@ -4113,7 +4113,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByF_T_C_Last(long fromUserId, long toUserId,
 		String content, OrderByComparator<Entry> orderByComparator) {
 		int count = countByF_T_C(fromUserId, toUserId, content);
@@ -4143,7 +4143,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByF_T_C_PrevAndNext(long entryId, long fromUserId,
 		long toUserId, String content,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
@@ -4309,7 +4309,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param toUserId the to user ID
 	 * @param content the content
 	 */
-	@Override
+
 	public void removeByF_T_C(long fromUserId, long toUserId, String content) {
 		for (Entry entry : findByF_T_C(fromUserId, toUserId, content,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -4325,7 +4325,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param content the content
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByF_T_C(long fromUserId, long toUserId, String content) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_F_T_C;
 
@@ -4407,7 +4407,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param entry the entry
 	 */
-	@Override
+
 	public void cacheResult(Entry entry) {
 		entityCache.putResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
 			EntryImpl.class, entry.getPrimaryKey(), entry);
@@ -4420,7 +4420,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param entries the entries
 	 */
-	@Override
+
 	public void cacheResult(List<Entry> entries) {
 		for (Entry entry : entries) {
 			if (entityCache.getResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
@@ -4440,7 +4440,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(EntryImpl.class);
 
@@ -4456,7 +4456,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(Entry entry) {
 		entityCache.removeResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
 			EntryImpl.class, entry.getPrimaryKey());
@@ -4465,7 +4465,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<Entry> entries) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -4482,7 +4482,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param entryId the primary key for the new entry
 	 * @return the new entry
 	 */
-	@Override
+
 	public Entry create(long entryId) {
 		Entry entry = new EntryImpl();
 
@@ -4499,7 +4499,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry that was removed
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry remove(long entryId) throws NoSuchEntryException {
 		return remove((Serializable)entryId);
 	}
@@ -4511,7 +4511,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry that was removed
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry remove(Serializable primaryKey) throws NoSuchEntryException {
 		Session session = null;
 
@@ -4542,7 +4542,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		}
 	}
 
-	@Override
+
 	protected Entry removeImpl(Entry entry) {
 		entry = toUnwrappedModel(entry);
 
@@ -4574,7 +4574,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		return entry;
 	}
 
-	@Override
+
 	public Entry updateImpl(Entry entry) {
 		entry = toUnwrappedModel(entry);
 
@@ -4806,7 +4806,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchEntryException {
 		Entry entry = fetchByPrimaryKey(primaryKey);
@@ -4830,7 +4830,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry findByPrimaryKey(long entryId) throws NoSuchEntryException {
 		return findByPrimaryKey((Serializable)entryId);
 	}
@@ -4841,7 +4841,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param primaryKey the primary key of the entry
 	 * @return the entry, or <code>null</code> if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry fetchByPrimaryKey(Serializable primaryKey) {
 		Entry entry = (Entry)entityCache.getResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
 				EntryImpl.class, primaryKey);
@@ -4886,12 +4886,12 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param entryId the primary key of the entry
 	 * @return the entry, or <code>null</code> if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry fetchByPrimaryKey(long entryId) {
 		return fetchByPrimaryKey((Serializable)entryId);
 	}
 
-	@Override
+
 	public Map<Serializable, Entry> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -4988,7 +4988,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @return the entries
 	 */
-	@Override
+
 	public List<Entry> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -5004,7 +5004,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of entries
 	 */
-	@Override
+
 	public List<Entry> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -5021,7 +5021,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of entries
 	 */
-	@Override
+
 	public List<Entry> findAll(int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -5040,7 +5040,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of entries
 	 */
-	@Override
+
 	public List<Entry> findAll(int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -5129,7 +5129,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * Removes all the entries from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (Entry entry : findAll()) {
 			remove(entry);
@@ -5141,7 +5141,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @return the number of entries
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -5173,7 +5173,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return EntryModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -5203,19 +5203,19 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No Entry exists with the key {";
 	private static final Log _log = LogFactoryUtil.getLog(EntryPersistenceImpl.class);
 	private static final Entry _nullEntry = new EntryImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<Entry> toCacheModel() {
 				return _nullEntryCacheModel;
 			}
 		};
 
 	private static final CacheModel<Entry> _nullEntryCacheModel = new CacheModel<Entry>() {
-			@Override
+
 			public Entry toEntityModel() {
 				return _nullEntry;
 			}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderBaseImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderBaseImpl.java
index 997a6b0b02b..77a6b7edd96 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderBaseImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence.impl;
@@ -27,7 +27,7 @@ import java.util.Set;
  * @generated
  */
 public class StatusFinderBaseImpl extends BasePersistenceImpl<Status> {
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return getStatusPersistence().getBadColumnNames();
 	}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderImpl.java
index 43bc0d1354c..7fc0d6048a4 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusFinderImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence.impl;
@@ -49,7 +49,7 @@ public class StatusFinderImpl
 	public static final String FIND_BY_USERS_GROUPS =
 		StatusFinder.class.getName() + ".findByUsersGroups";
 
-	@Override
+
 	public List<Object[]> findByModifiedDate(
 		long companyId, long userId, long modifiedDate, int start, int end) {
 
@@ -81,7 +81,7 @@ public class StatusFinderImpl
 		}
 	}
 
-	@Override
+
 	public List<Object[]> findBySocialRelationTypes(
 		long userId, int[] types, long modifiedDate, int start, int end) {
 
@@ -119,7 +119,7 @@ public class StatusFinderImpl
 		}
 	}
 
-	@Override
+
 	public List<Object[]> findByUsersGroups(
 		long userId, long modifiedDate, String[] groupNames, int start,
 		int end) {
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusPersistenceImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusPersistenceImpl.java
index febf8a473ee..585d6055dd5 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusPersistenceImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/service/persistence/impl/StatusPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.service.persistence.impl;
@@ -101,7 +101,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByUserId(long userId) throws NoSuchStatusException {
 		Status status = fetchByUserId(userId);
 
@@ -131,7 +131,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param userId the user ID
 	 * @return the matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByUserId(long userId) {
 		return fetchByUserId(userId, true);
 	}
@@ -143,7 +143,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByUserId(long userId, boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { userId };
 
@@ -225,7 +225,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param userId the user ID
 	 * @return the status that was removed
 	 */
-	@Override
+
 	public Status removeByUserId(long userId) throws NoSuchStatusException {
 		Status status = findByUserId(userId);
 
@@ -238,7 +238,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param userId the user ID
 	 * @return the number of matching statuses
 	 */
-	@Override
+
 	public int countByUserId(long userId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_USERID;
 
@@ -311,7 +311,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param modifiedDate the modified date
 	 * @return the matching statuses
 	 */
-	@Override
+
 	public List<Status> findByModifiedDate(long modifiedDate) {
 		return findByModifiedDate(modifiedDate, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -329,7 +329,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param end the upper bound of the range of statuses (not inclusive)
 	 * @return the range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByModifiedDate(long modifiedDate, int start, int end) {
 		return findByModifiedDate(modifiedDate, start, end, null);
 	}
@@ -347,7 +347,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByModifiedDate(long modifiedDate, int start,
 		int end, OrderByComparator<Status> orderByComparator) {
 		return findByModifiedDate(modifiedDate, start, end, orderByComparator,
@@ -368,7 +368,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByModifiedDate(long modifiedDate, int start,
 		int end, OrderByComparator<Status> orderByComparator,
 		boolean retrieveFromCache) {
@@ -483,7 +483,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the first matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByModifiedDate_First(long modifiedDate,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -513,7 +513,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByModifiedDate_First(long modifiedDate,
 		OrderByComparator<Status> orderByComparator) {
 		List<Status> list = findByModifiedDate(modifiedDate, 0, 1,
@@ -534,7 +534,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the last matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByModifiedDate_Last(long modifiedDate,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -563,7 +563,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByModifiedDate_Last(long modifiedDate,
 		OrderByComparator<Status> orderByComparator) {
 		int count = countByModifiedDate(modifiedDate);
@@ -591,7 +591,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the previous, current, and next status
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status[] findByModifiedDate_PrevAndNext(long statusId,
 		long modifiedDate, OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -733,7 +733,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 *
 	 * @param modifiedDate the modified date
 	 */
-	@Override
+
 	public void removeByModifiedDate(long modifiedDate) {
 		for (Status status : findByModifiedDate(modifiedDate,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -747,7 +747,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param modifiedDate the modified date
 	 * @return the number of matching statuses
 	 */
-	@Override
+
 	public int countByModifiedDate(long modifiedDate) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_MODIFIEDDATE;
 
@@ -819,7 +819,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param online the online
 	 * @return the matching statuses
 	 */
-	@Override
+
 	public List<Status> findByOnline(boolean online) {
 		return findByOnline(online, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -836,7 +836,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param end the upper bound of the range of statuses (not inclusive)
 	 * @return the range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByOnline(boolean online, int start, int end) {
 		return findByOnline(online, start, end, null);
 	}
@@ -854,7 +854,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByOnline(boolean online, int start, int end,
 		OrderByComparator<Status> orderByComparator) {
 		return findByOnline(online, start, end, orderByComparator, true);
@@ -874,7 +874,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByOnline(boolean online, int start, int end,
 		OrderByComparator<Status> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -984,7 +984,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the first matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByOnline_First(boolean online,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -1013,7 +1013,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByOnline_First(boolean online,
 		OrderByComparator<Status> orderByComparator) {
 		List<Status> list = findByOnline(online, 0, 1, orderByComparator);
@@ -1033,7 +1033,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the last matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByOnline_Last(boolean online,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -1062,7 +1062,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByOnline_Last(boolean online,
 		OrderByComparator<Status> orderByComparator) {
 		int count = countByOnline(online);
@@ -1090,7 +1090,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the previous, current, and next status
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status[] findByOnline_PrevAndNext(long statusId, boolean online,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -1232,7 +1232,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 *
 	 * @param online the online
 	 */
-	@Override
+
 	public void removeByOnline(boolean online) {
 		for (Status status : findByOnline(online, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1246,7 +1246,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param online the online
 	 * @return the number of matching statuses
 	 */
-	@Override
+
 	public int countByOnline(boolean online) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_ONLINE;
 
@@ -1319,7 +1319,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param online the online
 	 * @return the matching statuses
 	 */
-	@Override
+
 	public List<Status> findByM_O(long modifiedDate, boolean online) {
 		return findByM_O(modifiedDate, online, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1338,7 +1338,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param end the upper bound of the range of statuses (not inclusive)
 	 * @return the range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByM_O(long modifiedDate, boolean online, int start,
 		int end) {
 		return findByM_O(modifiedDate, online, start, end, null);
@@ -1358,7 +1358,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByM_O(long modifiedDate, boolean online, int start,
 		int end, OrderByComparator<Status> orderByComparator) {
 		return findByM_O(modifiedDate, online, start, end, orderByComparator,
@@ -1380,7 +1380,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching statuses
 	 */
-	@Override
+
 	public List<Status> findByM_O(long modifiedDate, boolean online, int start,
 		int end, OrderByComparator<Status> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1501,7 +1501,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the first matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByM_O_First(long modifiedDate, boolean online,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -1534,7 +1534,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByM_O_First(long modifiedDate, boolean online,
 		OrderByComparator<Status> orderByComparator) {
 		List<Status> list = findByM_O(modifiedDate, online, 0, 1,
@@ -1556,7 +1556,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the last matching status
 	 * @throws NoSuchStatusException if a matching status could not be found
 	 */
-	@Override
+
 	public Status findByM_O_Last(long modifiedDate, boolean online,
 		OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -1589,7 +1589,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching status, or <code>null</code> if a matching status could not be found
 	 */
-	@Override
+
 	public Status fetchByM_O_Last(long modifiedDate, boolean online,
 		OrderByComparator<Status> orderByComparator) {
 		int count = countByM_O(modifiedDate, online);
@@ -1618,7 +1618,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the previous, current, and next status
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status[] findByM_O_PrevAndNext(long statusId, long modifiedDate,
 		boolean online, OrderByComparator<Status> orderByComparator)
 		throws NoSuchStatusException {
@@ -1765,7 +1765,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param modifiedDate the modified date
 	 * @param online the online
 	 */
-	@Override
+
 	public void removeByM_O(long modifiedDate, boolean online) {
 		for (Status status : findByM_O(modifiedDate, online, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1780,7 +1780,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param online the online
 	 * @return the number of matching statuses
 	 */
-	@Override
+
 	public int countByM_O(long modifiedDate, boolean online) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_M_O;
 
@@ -1841,7 +1841,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 *
 	 * @param status the status
 	 */
-	@Override
+
 	public void cacheResult(Status status) {
 		entityCache.putResult(StatusModelImpl.ENTITY_CACHE_ENABLED,
 			StatusImpl.class, status.getPrimaryKey(), status);
@@ -1857,7 +1857,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 *
 	 * @param statuses the statuses
 	 */
-	@Override
+
 	public void cacheResult(List<Status> statuses) {
 		for (Status status : statuses) {
 			if (entityCache.getResult(StatusModelImpl.ENTITY_CACHE_ENABLED,
@@ -1877,7 +1877,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(StatusImpl.class);
 
@@ -1893,7 +1893,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(Status status) {
 		entityCache.removeResult(StatusModelImpl.ENTITY_CACHE_ENABLED,
 			StatusImpl.class, status.getPrimaryKey());
@@ -1904,7 +1904,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 		clearUniqueFindersCache((StatusModelImpl)status);
 	}
 
-	@Override
+
 	public void clearCache(List<Status> statuses) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -1961,7 +1961,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param statusId the primary key for the new status
 	 * @return the new status
 	 */
-	@Override
+
 	public Status create(long statusId) {
 		Status status = new StatusImpl();
 
@@ -1978,7 +1978,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the status that was removed
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status remove(long statusId) throws NoSuchStatusException {
 		return remove((Serializable)statusId);
 	}
@@ -1990,7 +1990,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the status that was removed
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status remove(Serializable primaryKey) throws NoSuchStatusException {
 		Session session = null;
 
@@ -2021,7 +2021,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 		}
 	}
 
-	@Override
+
 	protected Status removeImpl(Status status) {
 		status = toUnwrappedModel(status);
 
@@ -2053,7 +2053,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 		return status;
 	}
 
-	@Override
+
 	public Status updateImpl(Status status) {
 		status = toUnwrappedModel(status);
 
@@ -2183,7 +2183,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the status
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchStatusException {
 		Status status = fetchByPrimaryKey(primaryKey);
@@ -2207,7 +2207,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @return the status
 	 * @throws NoSuchStatusException if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status findByPrimaryKey(long statusId) throws NoSuchStatusException {
 		return findByPrimaryKey((Serializable)statusId);
 	}
@@ -2218,7 +2218,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param primaryKey the primary key of the status
 	 * @return the status, or <code>null</code> if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status fetchByPrimaryKey(Serializable primaryKey) {
 		Status status = (Status)entityCache.getResult(StatusModelImpl.ENTITY_CACHE_ENABLED,
 				StatusImpl.class, primaryKey);
@@ -2263,12 +2263,12 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param statusId the primary key of the status
 	 * @return the status, or <code>null</code> if a status with the primary key could not be found
 	 */
-	@Override
+
 	public Status fetchByPrimaryKey(long statusId) {
 		return fetchByPrimaryKey((Serializable)statusId);
 	}
 
-	@Override
+
 	public Map<Serializable, Status> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -2365,7 +2365,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 *
 	 * @return the statuses
 	 */
-	@Override
+
 	public List<Status> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -2381,7 +2381,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param end the upper bound of the range of statuses (not inclusive)
 	 * @return the range of statuses
 	 */
-	@Override
+
 	public List<Status> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -2398,7 +2398,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of statuses
 	 */
-	@Override
+
 	public List<Status> findAll(int start, int end,
 		OrderByComparator<Status> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -2417,7 +2417,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of statuses
 	 */
-	@Override
+
 	public List<Status> findAll(int start, int end,
 		OrderByComparator<Status> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -2506,7 +2506,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 * Removes all the statuses from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (Status status : findAll()) {
 			remove(status);
@@ -2518,7 +2518,7 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 	 *
 	 * @return the number of statuses
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -2550,12 +2550,12 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return StatusModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -2588,19 +2588,19 @@ public class StatusPersistenceImpl extends BasePersistenceImpl<Status>
 				"online"
 			});
 	private static final Status _nullStatus = new StatusImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<Status> toCacheModel() {
 				return _nullStatusCacheModel;
 			}
 		};
 
 	private static final CacheModel<Status> _nullStatusCacheModel = new CacheModel<Status>() {
-			@Override
+
 			public Status toEntityModel() {
 				return _nullStatus;
 			}
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinder.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinder.java
index cb2417598cf..b5310561808 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinder.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinderUtil.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinderUtil.java
index 94ffa9f4efe..86a84eae053 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinderUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/BuddyFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatConstants.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatConstants.java
index 4387d16839e..bf4f22bdf25 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatConstants.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatExtensionsUtil.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatExtensionsUtil.java
index c8270b1a1d9..91072c51bf4 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatExtensionsUtil.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/ChatExtensionsUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/DefaultBuddyFinderImpl.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/DefaultBuddyFinderImpl.java
index e77ccc29df9..7e047315d04 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/DefaultBuddyFinderImpl.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/DefaultBuddyFinderImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
@@ -28,7 +28,7 @@ import java.util.List;
  */
 public class DefaultBuddyFinderImpl implements BuddyFinder {
 
-	@Override
+
 	public List<Object[]> getBuddies(long companyId, long userId) {
 		long modifiedDate =
 			System.currentTimeMillis() - ChatConstants.ONLINE_DELTA;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsKeys.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsKeys.java
index 1ad1fbdc728..76dc6586ccc 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsKeys.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
diff --git a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsValues.java b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsValues.java
index abf7ad8cabb..06c63eb74ab 100644
--- a/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsValues.java
+++ b/portlets/chat-portlet/docroot/WEB-INF/src/com/liferay/chat/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.util;
diff --git a/portlets/chat-portlet/docroot/init.jsp b/portlets/chat-portlet/docroot/init.jsp
index 48ad3f81d1a..c56b4efc022 100644
--- a/portlets/chat-portlet/docroot/init.jsp
+++ b/portlets/chat-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/chat-portlet/docroot/view.jsp b/portlets/chat-portlet/docroot/view.jsp
index ef7f71cc3ff..290d487e588 100644
--- a/portlets/chat-portlet/docroot/view.jsp
+++ b/portlets/chat-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ConnectionStateWebRTCMail.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ConnectionStateWebRTCMail.java
index 6adb5db558a..9c343acff4d 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ConnectionStateWebRTCMail.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ConnectionStateWebRTCMail.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
@@ -36,7 +36,7 @@ public class ConnectionStateWebRTCMail extends WebRTCMail {
 		super(sourceUserId, messageJSONObject);
 	}
 
-	@Override
+
 	public String getMessageType() {
 		return _MESSAGE_TYPE;
 	}
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/DescriptionWebRTCSDPMail.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/DescriptionWebRTCSDPMail.java
index 8731e3e981d..2fda3f8d4ec 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/DescriptionWebRTCSDPMail.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/DescriptionWebRTCSDPMail.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
@@ -36,7 +36,7 @@ public class DescriptionWebRTCSDPMail extends WebRTCMail {
 		super(sourceUserId, messageJSONObject);
 	}
 
-	@Override
+
 	public String getMessageType() {
 		return _MESSAGE_TYPE;
 	}
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ErrorWebRTCMail.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ErrorWebRTCMail.java
index f8a4cd7a3b9..0e0dd63b361 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ErrorWebRTCMail.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ErrorWebRTCMail.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
@@ -32,7 +32,7 @@ public class ErrorWebRTCMail extends WebRTCMail {
 		super(sourceUserId, messageJSONObject);
 	}
 
-	@Override
+
 	public String getMessageType() {
 		return _MESSAGE_TYPE;
 	}
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ICECandidateWebRTCMail.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ICECandidateWebRTCMail.java
index 1661c994485..2f8e4a6093e 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ICECandidateWebRTCMail.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/ICECandidateWebRTCMail.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
@@ -36,7 +36,7 @@ public class ICECandidateWebRTCMail extends WebRTCMail {
 		super(sourceUserId, messageJSONObject);
 	}
 
-	@Override
+
 	public String getMessageType() {
 		return _MESSAGE_TYPE;
 	}
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCClient.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCClient.java
index 17d42d16206..325a05b1ca5 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCClient.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCClient.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCConnection.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCConnection.java
index d5813ecb2ce..905e8f1e771 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCConnection.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCConnection.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMail.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMail.java
index 3d572374f60..93e69bbfaee 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMail.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMail.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMailbox.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMailbox.java
index 7d2a4a37e69..7879cba42a9 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMailbox.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCMailbox.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManager.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManager.java
index d33865cd8b6..0fe0eebb222 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManager.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManager.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManagerFactory.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManagerFactory.java
index ea580671b50..f6f534788bd 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManagerFactory.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/WebRTCManagerFactory.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video;
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCConnectionStateMessageListener.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCConnectionStateMessageListener.java
index d17964f4f46..6ff282e1512 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCConnectionStateMessageListener.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCConnectionStateMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video.messaging;
@@ -28,7 +28,7 @@ import java.util.List;
  */
 public class WebRTCConnectionStateMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		List<WebRTCManager> webRTCManagers =
 			WebRTCManagerFactory.getWebRTCManagers();
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCPresenceMessageListener.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCPresenceMessageListener.java
index af74030ca5d..2736a765f30 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCPresenceMessageListener.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/messaging/WebRTCPresenceMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video.messaging;
@@ -28,7 +28,7 @@ import java.util.List;
  */
 public class WebRTCPresenceMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		List<WebRTCManager> webRTCManagers =
 			WebRTCManagerFactory.getWebRTCManagers();
diff --git a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/poller/ChatVideoPollerProcessor.java b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/poller/ChatVideoPollerProcessor.java
index cbebaf29754..a44bd3c5c4c 100644
--- a/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/poller/ChatVideoPollerProcessor.java
+++ b/portlets/chat-video-portlet/docroot/WEB-INF/src/com/liferay/chat/video/poller/ChatVideoPollerProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.chat.video.poller;
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class ChatVideoPollerProcessor extends BasePollerProcessor {
 
-	@Override
+
 	protected PollerResponse doReceive(PollerRequest pollerRequest)
 		throws Exception {
 
@@ -83,7 +83,7 @@ public class ChatVideoPollerProcessor extends BasePollerProcessor {
 		return pollerResponse;
 	}
 
-	@Override
+
 	protected void doSend(PollerRequest pollerRequest) throws Exception {
 		long destinationUserId = getLong(pollerRequest, "destinationUserId");
 
diff --git a/portlets/chat-video-portlet/docroot/init.jsp b/portlets/chat-video-portlet/docroot/init.jsp
index 5febe5d257d..663370db629 100644
--- a/portlets/chat-video-portlet/docroot/init.jsp
+++ b/portlets/chat-video-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/chat-video-portlet/docroot/view.jsp b/portlets/chat-video-portlet/docroot/view.jsp
index 0ee794be458..2be214ef803 100644
--- a/portlets/chat-video-portlet/docroot/view.jsp
+++ b/portlets/chat-video-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/contacts-portlet/copyright.txt b/portlets/contacts-portlet/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/portlets/contacts-portlet/copyright.txt
+++ b/portlets/contacts-portlet/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/DuplicateEntryEmailAddressException.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/DuplicateEntryEmailAddressException.java
index 0098fc5dc78..7aaf1cb4422 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/DuplicateEntryEmailAddressException.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/DuplicateEntryEmailAddressException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryEmailAddressException.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryEmailAddressException.java
index e9238027594..e03d9383c9d 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryEmailAddressException.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryEmailAddressException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryFullNameException.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryFullNameException.java
index 2cf5a26fd27..eab4f0b117d 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryFullNameException.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/EntryFullNameException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/NoSuchEntryException.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/NoSuchEntryException.java
index 9377747bc63..b0c2e46342e 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/NoSuchEntryException.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/NoSuchEntryException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.exception;
 
 import com.liferay.portal.kernel.exception.NoSuchModelException;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/RequiredEntryEmailAddressException.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/RequiredEntryEmailAddressException.java
index 34c98e1fc84..8da7fec744d 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/RequiredEntryEmailAddressException.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/exception/RequiredEntryEmailAddressException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/Entry.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/Entry.java
index 229bb3613cf..aa13f1efa4c 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/Entry.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/Entry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model;
@@ -38,17 +38,17 @@ public interface Entry extends EntryModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.contacts.model.impl.EntryImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<Entry, Long> ENTRY_ID_ACCESSOR = new Accessor<Entry, Long>() {
-			@Override
+
 			public Long get(Entry entry) {
 				return entry.getEntryId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<Entry> getTypeClass() {
 				return Entry.class;
 			}
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryClp.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryClp.java
index e4411f3b0f9..2931c0aaac7 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryClp.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model;
@@ -46,37 +46,37 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 	public EntryClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Entry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Entry.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -97,7 +97,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long entryId = (Long)attributes.get("entryId");
 
@@ -163,12 +163,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getEntryId() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setEntryId(long entryId) {
 		_entryId = entryId;
 
@@ -186,12 +186,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -209,12 +209,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -232,12 +232,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -255,7 +255,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -267,16 +267,16 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -294,12 +294,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -317,12 +317,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -340,12 +340,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public String getFullName() {
 		return _fullName;
 	}
 
-	@Override
+
 	public void setFullName(String fullName) {
 		_fullName = fullName;
 
@@ -363,12 +363,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public String getEmailAddress() {
 		return _emailAddress;
 	}
 
-	@Override
+
 	public void setEmailAddress(String emailAddress) {
 		_emailAddress = emailAddress;
 
@@ -386,12 +386,12 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public String getComments() {
 		return _comments;
 	}
 
-	@Override
+
 	public void setComments(String comments) {
 		_comments = comments;
 
@@ -458,7 +458,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			EntryLocalServiceUtil.addEntry(this);
@@ -468,13 +468,13 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		}
 	}
 
-	@Override
+
 	public Entry toEscapedModel() {
 		return (Entry)ProxyUtil.newProxyInstance(Entry.class.getClassLoader(),
 			new Class[] { Entry.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		EntryClp clone = new EntryClp();
 
@@ -492,7 +492,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(Entry entry) {
 		int value = 0;
 
@@ -505,7 +505,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -531,22 +531,22 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -575,7 +575,7 @@ public class EntryClp extends BaseModelImpl<Entry> implements Entry {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryModel.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryModel.java
index 7c1b84e6a2a..805218f193a 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryModel.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model;
@@ -83,7 +83,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @return the group ID of this entry
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -91,7 +91,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param groupId the group ID of this entry
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -99,7 +99,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @return the company ID of this entry
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -107,7 +107,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param companyId the company ID of this entry
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -115,7 +115,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @return the user ID of this entry
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -123,7 +123,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param userId the user ID of this entry
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -131,7 +131,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @return the user uuid of this entry
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -139,7 +139,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param userUuid the user uuid of this entry
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -148,7 +148,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 * @return the user name of this entry
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -156,7 +156,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param userName the user name of this entry
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -164,7 +164,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @return the create date of this entry
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -172,7 +172,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param createDate the create date of this entry
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -180,7 +180,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @return the modified date of this entry
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -188,7 +188,7 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 *
 	 * @param modifiedDate the modified date of this entry
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -236,60 +236,60 @@ public interface EntryModel extends BaseModel<Entry>, GroupedModel, ShardedModel
 	 */
 	public void setComments(String comments);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.contacts.model.Entry entry);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.contacts.model.Entry> toCacheModel();
 
-	@Override
+
 	public com.liferay.contacts.model.Entry toEscapedModel();
 
-	@Override
+
 	public com.liferay.contacts.model.Entry toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntrySoap.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntrySoap.java
index a3c6d2fd60f..8175a3188cc 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntrySoap.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntrySoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryWrapper.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryWrapper.java
index c71f43e8c85..1340d871443 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryWrapper.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/model/EntryWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model;
@@ -43,17 +43,17 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		_entry = entry;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Entry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Entry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -71,7 +71,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long entryId = (Long)attributes.get("entryId");
 
@@ -134,57 +134,57 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _entry.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _entry.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _entry.isNew();
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry toEscapedModel() {
 		return new EntryWrapper(_entry.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry toUnescapedModel() {
 		return new EntryWrapper(_entry.toUnescapedModel());
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _entry.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.contacts.model.Entry> toCacheModel() {
 		return _entry.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.contacts.model.Entry entry) {
 		return _entry.compareTo(entry);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _entry.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _entry.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new EntryWrapper((Entry)_entry.clone());
 	}
@@ -194,7 +194,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the comments of this entry
 	*/
-	@Override
+
 	public java.lang.String getComments() {
 		return _entry.getComments();
 	}
@@ -204,7 +204,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the email address of this entry
 	*/
-	@Override
+
 	public java.lang.String getEmailAddress() {
 		return _entry.getEmailAddress();
 	}
@@ -214,7 +214,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the full name of this entry
 	*/
-	@Override
+
 	public java.lang.String getFullName() {
 		return _entry.getFullName();
 	}
@@ -224,7 +224,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the user name of this entry
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _entry.getUserName();
 	}
@@ -234,17 +234,17 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the user uuid of this entry
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _entry.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _entry.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _entry.toXmlString();
 	}
@@ -254,7 +254,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the create date of this entry
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _entry.getCreateDate();
 	}
@@ -264,7 +264,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the modified date of this entry
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _entry.getModifiedDate();
 	}
@@ -274,7 +274,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the company ID of this entry
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _entry.getCompanyId();
 	}
@@ -284,7 +284,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the entry ID of this entry
 	*/
-	@Override
+
 	public long getEntryId() {
 		return _entry.getEntryId();
 	}
@@ -294,7 +294,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the group ID of this entry
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _entry.getGroupId();
 	}
@@ -304,7 +304,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the primary key of this entry
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _entry.getPrimaryKey();
 	}
@@ -314,17 +314,17 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @return the user ID of this entry
 	*/
-	@Override
+
 	public long getUserId() {
 		return _entry.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_entry.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_entry.setCachedModel(cachedModel);
 	}
@@ -334,7 +334,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param comments the comments of this entry
 	*/
-	@Override
+
 	public void setComments(java.lang.String comments) {
 		_entry.setComments(comments);
 	}
@@ -344,7 +344,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param companyId the company ID of this entry
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_entry.setCompanyId(companyId);
 	}
@@ -354,7 +354,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param createDate the create date of this entry
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_entry.setCreateDate(createDate);
 	}
@@ -364,7 +364,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param emailAddress the email address of this entry
 	*/
-	@Override
+
 	public void setEmailAddress(java.lang.String emailAddress) {
 		_entry.setEmailAddress(emailAddress);
 	}
@@ -374,23 +374,23 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param entryId the entry ID of this entry
 	*/
-	@Override
+
 	public void setEntryId(long entryId) {
 		_entry.setEntryId(entryId);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_entry.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_entry.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_entry.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -400,7 +400,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param fullName the full name of this entry
 	*/
-	@Override
+
 	public void setFullName(java.lang.String fullName) {
 		_entry.setFullName(fullName);
 	}
@@ -410,7 +410,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param groupId the group ID of this entry
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_entry.setGroupId(groupId);
 	}
@@ -420,12 +420,12 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param modifiedDate the modified date of this entry
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_entry.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_entry.setNew(n);
 	}
@@ -435,12 +435,12 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param primaryKey the primary key of this entry
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_entry.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_entry.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -450,7 +450,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param userId the user ID of this entry
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_entry.setUserId(userId);
 	}
@@ -460,7 +460,7 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param userName the user name of this entry
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_entry.setUserName(userName);
 	}
@@ -470,12 +470,12 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 	*
 	* @param userUuid the user uuid of this entry
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_entry.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -494,22 +494,22 @@ public class EntryWrapper implements Entry, ModelWrapper<Entry> {
 		return false;
 	}
 
-	@Override
+
 	public Entry getWrappedModel() {
 		return _entry;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entry.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _entry.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_entry.resetOriginalValues();
 	}
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/ClpSerializer.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/ClpSerializer.java
index d68c3dba312..68094de8c65 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/ClpSerializer.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalService.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalService.java
index b072b4f75e3..b9387250034 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalService.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
@@ -140,11 +140,11 @@ public interface EntryLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -167,7 +167,7 @@ public interface EntryLocalService extends BaseLocalService,
 	public int searchUsersAndContactsCount(long companyId, long userId,
 		java.lang.String keywords);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceClp.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceClp.java
index e449282d295..7323642d750 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceClp.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
@@ -166,7 +166,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry addEntry(
 		com.liferay.contacts.model.Entry entry) {
 		Object returnObj = null;
@@ -191,7 +191,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry addEntry(long userId,
 		java.lang.String fullName, java.lang.String emailAddress,
 		java.lang.String comments)
@@ -230,7 +230,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry createEntry(long entryId) {
 		Object returnObj = null;
 
@@ -253,7 +253,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry deleteEntry(
 		com.liferay.contacts.model.Entry entry) {
 		Object returnObj = null;
@@ -278,7 +278,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry deleteEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -306,7 +306,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry fetchEntry(long entryId) {
 		Object returnObj = null;
 
@@ -329,7 +329,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry getEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -357,7 +357,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry updateEntry(
 		com.liferay.contacts.model.Entry entry) {
 		Object returnObj = null;
@@ -382,7 +382,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry updateEntry(long entryId,
 		java.lang.String fullName, java.lang.String emailAddress,
 		java.lang.String comments)
@@ -421,7 +421,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.contacts.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -444,7 +444,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -467,7 +467,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -490,7 +490,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -520,7 +520,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -550,7 +550,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getEntriesCount() {
 		Object returnObj = null;
 
@@ -573,7 +573,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getEntriesCount(long userId) {
 		Object returnObj = null;
 
@@ -596,7 +596,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int searchCount(long userId, java.lang.String keywords) {
 		Object returnObj = null;
 
@@ -621,7 +621,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int searchUsersAndContactsCount(long companyId, long userId,
 		java.lang.String keywords) {
 		Object returnObj = null;
@@ -652,14 +652,14 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -682,7 +682,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -707,7 +707,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -739,7 +739,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -774,7 +774,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.contacts.model.Entry> getEntries(
 		int start, int end) {
 		Object returnObj = null;
@@ -798,7 +798,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.contacts.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.contacts.model.Entry> getEntries(
 		long userId, int start, int end) {
 		Object returnObj = null;
@@ -822,7 +822,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.contacts.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.contacts.model.Entry> search(
 		long userId, java.lang.String keywords, int start, int end) {
 		Object returnObj = null;
@@ -855,7 +855,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.contacts.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.portal.kernel.model.BaseModel<?>> searchUsersAndContacts(
 		long companyId, long userId, java.lang.String keywords, int start,
 		int end) {
@@ -891,7 +891,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return (java.util.List<com.liferay.portal.kernel.model.BaseModel<?>>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -916,7 +916,7 @@ public class EntryLocalServiceClp implements EntryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceUtil.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceUtil.java
index 9f978756658..0b34df4bdd5 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceUtil.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceWrapper.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceWrapper.java
index b77f0ef14cc..95c728001f3 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceWrapper.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
@@ -38,13 +38,13 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entry the entry
 	* @return the entry that was added
 	*/
-	@Override
+
 	public com.liferay.contacts.model.Entry addEntry(
 		com.liferay.contacts.model.Entry entry) {
 		return _entryLocalService.addEntry(entry);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry addEntry(long userId,
 		java.lang.String fullName, java.lang.String emailAddress,
 		java.lang.String comments)
@@ -59,7 +59,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entryId the primary key for the new entry
 	* @return the new entry
 	*/
-	@Override
+
 	public com.liferay.contacts.model.Entry createEntry(long entryId) {
 		return _entryLocalService.createEntry(entryId);
 	}
@@ -70,7 +70,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entry the entry
 	* @return the entry that was removed
 	*/
-	@Override
+
 	public com.liferay.contacts.model.Entry deleteEntry(
 		com.liferay.contacts.model.Entry entry) {
 		return _entryLocalService.deleteEntry(entry);
@@ -83,13 +83,13 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @return the entry that was removed
 	* @throws PortalException if a entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.contacts.model.Entry deleteEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _entryLocalService.deleteEntry(entryId);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry fetchEntry(long entryId) {
 		return _entryLocalService.fetchEntry(entryId);
 	}
@@ -101,7 +101,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @return the entry
 	* @throws PortalException if a entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.contacts.model.Entry getEntry(long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _entryLocalService.getEntry(entryId);
@@ -113,13 +113,13 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param entry the entry
 	* @return the entry that was updated
 	*/
-	@Override
+
 	public com.liferay.contacts.model.Entry updateEntry(
 		com.liferay.contacts.model.Entry entry) {
 		return _entryLocalService.updateEntry(entry);
 	}
 
-	@Override
+
 	public com.liferay.contacts.model.Entry updateEntry(long entryId,
 		java.lang.String fullName, java.lang.String emailAddress,
 		java.lang.String comments)
@@ -128,17 +128,17 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 			comments);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _entryLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _entryLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _entryLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -146,14 +146,14 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _entryLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -165,29 +165,29 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	*
 	* @return the number of entries
 	*/
-	@Override
+
 	public int getEntriesCount() {
 		return _entryLocalService.getEntriesCount();
 	}
 
-	@Override
+
 	public int getEntriesCount(long userId) {
 		return _entryLocalService.getEntriesCount(userId);
 	}
 
-	@Override
+
 	public int searchCount(long userId, java.lang.String keywords) {
 		return _entryLocalService.searchCount(userId, keywords);
 	}
 
-	@Override
+
 	public int searchUsersAndContactsCount(long companyId, long userId,
 		java.lang.String keywords) {
 		return _entryLocalService.searchUsersAndContactsCount(companyId,
 			userId, keywords);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -199,7 +199,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _entryLocalService.getOSGiServiceIdentifier();
 	}
@@ -210,7 +210,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _entryLocalService.dynamicQuery(dynamicQuery);
@@ -228,7 +228,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -248,7 +248,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -268,25 +268,25 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param end the upper bound of the range of entries (not inclusive)
 	* @return the range of entries
 	*/
-	@Override
+
 	public java.util.List<com.liferay.contacts.model.Entry> getEntries(
 		int start, int end) {
 		return _entryLocalService.getEntries(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.contacts.model.Entry> getEntries(
 		long userId, int start, int end) {
 		return _entryLocalService.getEntries(userId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.contacts.model.Entry> search(
 		long userId, java.lang.String keywords, int start, int end) {
 		return _entryLocalService.search(userId, keywords, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.portal.kernel.model.BaseModel<?>> searchUsersAndContacts(
 		long companyId, long userId, java.lang.String keywords, int start,
 		int end) {
@@ -300,7 +300,7 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _entryLocalService.dynamicQueryCount(dynamicQuery);
@@ -313,19 +313,19 @@ public class EntryLocalServiceWrapper implements EntryLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _entryLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public EntryLocalService getWrappedService() {
 		return _entryLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(EntryLocalService entryLocalService) {
 		_entryLocalService = entryLocalService;
 	}
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryService.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryService.java
index d2c6df85b7c..7d3bfb9ce4b 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryService.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
@@ -54,7 +54,7 @@ public interface EntryService extends BaseService, InvokableService {
 		java.lang.String keywords, int start, int end)
 		throws PortalException;
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceClp.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceClp.java
index 131054531b9..5c97c7a49c4 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceClp.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
@@ -38,7 +38,7 @@ public class EntryServiceClp implements EntryService {
 		_methodParameterTypes2 = new String[] {  };
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.json.JSONArray searchUsersAndContacts(
 		long companyId, java.lang.String keywords, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -76,14 +76,14 @@ public class EntryServiceClp implements EntryService {
 		return (com.liferay.portal.kernel.json.JSONArray)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceUtil.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceUtil.java
index 18cef45496b..ed2b08cd475 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceUtil.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceWrapper.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceWrapper.java
index f0f9f71bbc5..e86386f1d62 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceWrapper.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/EntryServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service;
@@ -32,7 +32,7 @@ public class EntryServiceWrapper implements EntryService,
 		_entryService = entryService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.json.JSONArray searchUsersAndContacts(
 		long companyId, java.lang.String keywords, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -40,7 +40,7 @@ public class EntryServiceWrapper implements EntryService,
 			end);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -52,17 +52,17 @@ public class EntryServiceWrapper implements EntryService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _entryService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public EntryService getWrappedService() {
 		return _entryService;
 	}
 
-	@Override
+
 	public void setWrappedService(EntryService entryService) {
 		_entryService = entryService;
 	}
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/messaging/ClpMessageListener.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/messaging/ClpMessageListener.java
index ba5abc75c0d..3fa521f584f 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/messaging/ClpMessageListener.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.messaging;
@@ -32,7 +32,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinder.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinder.java
index 2a0005b28e2..0d7e5452e6a 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinder.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.persistence;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinderUtil.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinderUtil.java
index dbe8ad2595e..36a6394ff56 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinderUtil.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.persistence;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryPersistence.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryPersistence.java
index d566e29f316..bef8a07569e 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryPersistence.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.persistence;
@@ -269,7 +269,7 @@ public interface EntryPersistence extends BasePersistence<Entry> {
 	*/
 	public Entry fetchByPrimaryKey(long entryId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, Entry> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryUtil.java b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryUtil.java
index c82a8e51694..6a8263d5bbf 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryUtil.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/service/com/liferay/contacts/service/persistence/EntryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.persistence;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/notifications/ContactsCenterUserNotificationHandler.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/notifications/ContactsCenterUserNotificationHandler.java
index 3c9a78ba493..13964b4824a 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/notifications/ContactsCenterUserNotificationHandler.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/notifications/ContactsCenterUserNotificationHandler.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.contactscenter.notifications;
 
 import com.liferay.contacts.util.PortletKeys;
@@ -50,7 +51,7 @@ public class ContactsCenterUserNotificationHandler
 		setPortletId(PortletKeys.CONTACTS_CENTER);
 	}
 
-	@Override
+
 	protected String getBody(
 			UserNotificationEvent userNotificationEvent,
 			ServiceContext serviceContext)
@@ -129,7 +130,7 @@ public class ContactsCenterUserNotificationHandler
 			});
 	}
 
-	@Override
+
 	protected String getLink(
 			UserNotificationEvent userNotificationEvent,
 			ServiceContext serviceContext)
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/portlet/ContactsCenterPortlet.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/portlet/ContactsCenterPortlet.java
index c2cb20aa740..761714fd947 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/portlet/ContactsCenterPortlet.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/portlet/ContactsCenterPortlet.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.contactscenter.portlet;
 
 import com.liferay.announcements.kernel.model.AnnouncementsDelivery;
@@ -291,7 +292,7 @@ public class ContactsCenterPortlet extends MVCPortlet {
 		writeJSON(resourceRequest, resourceResponse, jsonObject);
 	}
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws PortletException {
@@ -391,7 +392,7 @@ public class ContactsCenterPortlet extends MVCPortlet {
 		}
 	}
 
-	@Override
+
 	public void serveResource(
 			ResourceRequest resourceRequest, ResourceResponse resourceResponse)
 		throws PortletException {
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterActivityInterpreter.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterActivityInterpreter.java
index f0b762a71a8..339f077fe6b 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterActivityInterpreter.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterActivityInterpreter.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.contactscenter.social;
 
 import com.liferay.portal.kernel.model.User;
@@ -33,24 +34,24 @@ import com.liferay.social.kernel.model.SocialRelationConstants;
 public class ContactsCenterActivityInterpreter
 	extends BaseSocialActivityInterpreter {
 
-	@Override
+
 	public String[] getClassNames() {
 		return _CLASS_NAMES;
 	}
 
-	@Override
+
 	protected String getLink(
 		SocialActivity activity, ServiceContext serviceContext) {
 
 		return getUserName(activity.getReceiverUserId(), serviceContext);
 	}
 
-	@Override
+
 	protected ResourceBundleLoader getResourceBundleLoader() {
 		return _resourceBundleLoader;
 	}
 
-	@Override
+
 	protected Object[] getTitleArguments(
 		String groupName, SocialActivity activity, String link, String title,
 		ServiceContext serviceContext) {
@@ -67,7 +68,7 @@ public class ContactsCenterActivityInterpreter
 		return new Object[] {creatorUserName, receiverUserName};
 	}
 
-	@Override
+
 	protected String getTitlePattern(
 		String groupName, SocialActivity activity) {
 
@@ -78,7 +79,7 @@ public class ContactsCenterActivityInterpreter
 		return StringPool.BLANK;
 	}
 
-	@Override
+
 	protected boolean hasPermissions(
 		PermissionChecker permissionChecker, SocialActivity activity,
 		String actionId, ServiceContext serviceContext) {
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterRequestInterpreter.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterRequestInterpreter.java
index 2cd02c73ef1..06300f5d604 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterRequestInterpreter.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/contactscenter/social/ContactsCenterRequestInterpreter.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.contactscenter.social;
 
 import com.liferay.portal.kernel.log.Log;
@@ -37,12 +38,12 @@ import com.liferay.social.kernel.service.SocialRelationLocalServiceUtil;
 public class ContactsCenterRequestInterpreter
 	extends BaseSocialRequestInterpreter {
 
-	@Override
+
 	public String[] getClassNames() {
 		return _CLASS_NAMES;
 	}
 
-	@Override
+
 	protected SocialRequestFeedEntry doInterpret(
 			SocialRequest request, ThemeDisplay themeDisplay)
 		throws Exception {
@@ -77,7 +78,7 @@ public class ContactsCenterRequestInterpreter
 		return new SocialRequestFeedEntry(title, StringPool.BLANK);
 	}
 
-	@Override
+
 	protected boolean doProcessConfirmation(
 		SocialRequest request, ThemeDisplay themeDisplay) {
 
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/UpgradeProcess_2_0_0.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/UpgradeProcess_2_0_0.java
index 30b95baeb38..f49268252d2 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/UpgradeProcess_2_0_0.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/UpgradeProcess_2_0_0.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.hook.upgrade;
 
 import com.liferay.contacts.hook.upgrade.v2_0_0.UpgradeEntry;
@@ -25,12 +26,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_2_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 200;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradeEntry.class);
 	}
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/v2_0_0/UpgradeEntry.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/v2_0_0/UpgradeEntry.java
index 29bb8f16295..76af2028ace 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/v2_0_0/UpgradeEntry.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/hook/upgrade/v2_0_0/UpgradeEntry.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.hook.upgrade.v2_0_0;
 
 import com.liferay.contacts.model.Entry;
@@ -30,7 +31,7 @@ import java.util.List;
  */
 public class UpgradeEntry extends UpgradeProcess {
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		List<Entry> entries = EntryLocalServiceUtil.getEntries(
 			QueryUtil.ALL_POS, QueryUtil.ALL_POS);
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/messaging/ContactsHotDeployMessageListener.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/messaging/ContactsHotDeployMessageListener.java
index 64d92e82840..08e2d1f1da3 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/messaging/ContactsHotDeployMessageListener.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/messaging/ContactsHotDeployMessageListener.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.messaging;
 
 import com.liferay.contacts.service.ClpSerializer;
@@ -34,7 +35,7 @@ public class ContactsHotDeployMessageListener extends HotDeployMessageListener {
 		super(servletContextNames);
 	}
 
-	@Override
+
 	protected void onDeploy(Message message) throws Exception {
 		if (_registerMethodKey == null) {
 			try {
@@ -54,7 +55,7 @@ public class ContactsHotDeployMessageListener extends HotDeployMessageListener {
 			ClpSerializer.getServletContextName(), "/chat/view.jsp");
 	}
 
-	@Override
+
 	protected void onUndeploy(Message message) throws Exception {
 		ContactsExtensionsUtil.unregister(
 			message.getString("servletContextName"));
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryBaseImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryBaseImpl.java
index 27e63f2a5c1..e0e2f56daea 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryBaseImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model.impl;
@@ -38,7 +38,7 @@ public abstract class EntryBaseImpl extends EntryModelImpl implements Entry {
 	 *
 	 * Never modify or reference this class directly. All methods that expect a entry model instance should use the {@link Entry} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			EntryLocalServiceUtil.addEntry(this);
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryCacheModel.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryCacheModel.java
index 0a2d1fe4f52..50882fb0abb 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryCacheModel.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model.impl;
@@ -39,7 +39,7 @@ import java.util.Date;
  */
 @ProviderType
 public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -58,12 +58,12 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, entryId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -92,7 +92,7 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		return sb.toString();
 	}
 
-	@Override
+
 	public Entry toEntityModel() {
 		EntryImpl entryImpl = new EntryImpl();
 
@@ -148,7 +148,7 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		return entryImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		entryId = objectInput.readLong();
 
@@ -165,7 +165,7 @@ public class EntryCacheModel implements CacheModel<Entry>, Externalizable {
 		comments = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(entryId);
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryImpl.java
index b66a28f57ce..28565f7cec6 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.model.impl;
 
 /**
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryModelImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryModelImpl.java
index 8e016879902..54d3115e56e 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryModelImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/model/impl/EntryModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.model.impl;
@@ -168,37 +168,37 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	public EntryModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Entry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Entry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -219,7 +219,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long entryId = (Long)attributes.get("entryId");
 
@@ -283,45 +283,45 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	}
 
 	@JSON
-	@Override
+
 	public long getEntryId() {
 		return _entryId;
 	}
 
-	@Override
+
 	public void setEntryId(long entryId) {
 		_entryId = entryId;
 	}
 
 	@JSON
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 	}
 
 	@JSON
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 	}
 
 	@JSON
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_columnBitmask |= USERID_COLUMN_BITMASK;
 
@@ -334,7 +334,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -346,7 +346,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
@@ -355,7 +355,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	}
 
 	@JSON
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -365,24 +365,24 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
 	@JSON
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
 	@JSON
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -391,7 +391,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -399,7 +399,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	}
 
 	@JSON
-	@Override
+
 	public String getFullName() {
 		if (_fullName == null) {
 			return StringPool.BLANK;
@@ -409,7 +409,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setFullName(String fullName) {
 		_columnBitmask = -1L;
 
@@ -417,7 +417,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	}
 
 	@JSON
-	@Override
+
 	public String getEmailAddress() {
 		if (_emailAddress == null) {
 			return StringPool.BLANK;
@@ -427,7 +427,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setEmailAddress(String emailAddress) {
 		_columnBitmask |= EMAILADDRESS_COLUMN_BITMASK;
 
@@ -443,7 +443,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 	}
 
 	@JSON
-	@Override
+
 	public String getComments() {
 		if (_comments == null) {
 			return StringPool.BLANK;
@@ -453,7 +453,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public void setComments(String comments) {
 		_comments = comments;
 	}
@@ -462,20 +462,20 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			Entry.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public Entry toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (Entry)ProxyUtil.newProxyInstance(_classLoader,
@@ -485,7 +485,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		EntryImpl entryImpl = new EntryImpl();
 
@@ -505,7 +505,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return entryImpl;
 	}
 
-	@Override
+
 	public int compareTo(Entry entry) {
 		int value = 0;
 
@@ -518,7 +518,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -540,22 +540,22 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		EntryModelImpl entryModelImpl = this;
 
@@ -570,7 +570,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		entryModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<Entry> toCacheModel() {
 		EntryCacheModel entryCacheModel = new EntryCacheModel();
 
@@ -635,7 +635,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return entryCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -664,7 +664,7 @@ public class EntryModelImpl extends BaseModelImpl<Entry> implements EntryModel {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceBaseImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceBaseImpl.java
index 2ca166a6b65..de72cfdf1c4 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceBaseImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.base;
@@ -79,7 +79,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Entry addEntry(Entry entry) {
 		entry.setNew(true);
 
@@ -92,7 +92,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param entryId the primary key for the new entry
 	 * @return the new entry
 	 */
-	@Override
+
 	public Entry createEntry(long entryId) {
 		return entryPersistence.create(entryId);
 	}
@@ -105,7 +105,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a entry with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Entry deleteEntry(long entryId) throws PortalException {
 		return entryPersistence.remove(entryId);
 	}
@@ -117,12 +117,12 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Entry deleteEntry(Entry entry) {
 		return entryPersistence.remove(entry);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -136,7 +136,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return entryPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -153,7 +153,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return entryPersistence.findWithDynamicQuery(dynamicQuery, start, end);
@@ -172,7 +172,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return entryPersistence.findWithDynamicQuery(dynamicQuery, start, end,
@@ -185,7 +185,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return entryPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -197,13 +197,13 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return entryPersistence.countWithDynamicQuery(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public Entry fetchEntry(long entryId) {
 		return entryPersistence.fetchByPrimaryKey(entryId);
 	}
@@ -215,12 +215,12 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry
 	 * @throws PortalException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry getEntry(long entryId) throws PortalException {
 		return entryPersistence.findByPrimaryKey(entryId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -233,7 +233,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -258,13 +258,13 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return entryLocalService.deleteEntry((Entry)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return entryPersistence.findByPrimaryKey(primaryKeyObj);
@@ -281,7 +281,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of entries
 	 */
-	@Override
+
 	public List<Entry> getEntries(int start, int end) {
 		return entryPersistence.findAll(start, end);
 	}
@@ -291,7 +291,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of entries
 	 */
-	@Override
+
 	public int getEntriesCount() {
 		return entryPersistence.countAll();
 	}
@@ -303,7 +303,7 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the entry that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Entry updateEntry(Entry entry) {
 		return entryPersistence.update(entry);
 	}
@@ -494,12 +494,12 @@ public abstract class EntryLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return EntryLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceClpInvoker.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceClpInvoker.java
index 7e7460da832..12dedbfb932 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceClpInvoker.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.base;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceBaseImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceBaseImpl.java
index 1016adcbf4c..b100c950c86 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceBaseImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.base;
@@ -291,12 +291,12 @@ public abstract class EntryServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return EntryService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceClpInvoker.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceClpInvoker.java
index 3dd31fb7e2b..1ee452dcdbb 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceClpInvoker.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/base/EntryServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.base;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceHttp.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceHttp.java
index e3d59acd541..f403f6d134a 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceHttp.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.http;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceSoap.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceSoap.java
index c9951c21e7f..9abc925b37d 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceSoap.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/http/EntryServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.http;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryLocalServiceImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryLocalServiceImpl.java
index 8a66d0f082f..52dbd69c4dc 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryLocalServiceImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryLocalServiceImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.service.impl;
 
 import com.liferay.contacts.exception.DuplicateEntryEmailAddressException;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryServiceImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryServiceImpl.java
index a2150373f7e..b46471b5431 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryServiceImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/impl/EntryServiceImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.service.impl;
 
 import com.liferay.contacts.model.Entry;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderBaseImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderBaseImpl.java
index 56ccea67286..2ba6564fe34 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderBaseImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.persistence.impl;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderImpl.java
index 2d3febbb7e6..f5aa0f8fad1 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryFinderImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.service.persistence.impl;
 
 import com.liferay.contacts.model.Entry;
@@ -51,7 +52,7 @@ public class EntryFinderImpl
 	public static final String FIND_BY_U_FN_EA =
 		EntryFinder.class.getName() + ".findByU_FN_EA";
 
-	@Override
+
 	public int countByKeywords(long companyId, long userId, String keywords) {
 		if (Validator.isNotNull(keywords)) {
 			String[] fullNames = CustomSQLUtil.keywords(keywords);
@@ -73,7 +74,7 @@ public class EntryFinderImpl
 		return count;
 	}
 
-	@Override
+
 	public int countByKeywords(long userId, String keywords) {
 		if (Validator.isNotNull(keywords)) {
 			String[] fullNames = CustomSQLUtil.keywords(keywords);
@@ -85,7 +86,7 @@ public class EntryFinderImpl
 		return EntryUtil.countByUserId(userId);
 	}
 
-	@Override
+
 	public List<BaseModel<?>> findByKeywords(
 		long companyId, long userId, String keywords, int start, int end) {
 
@@ -133,7 +134,7 @@ public class EntryFinderImpl
 		return models;
 	}
 
-	@Override
+
 	public List<Entry> findByKeywords(
 		long userId, String keywords, int start, int end) {
 
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryPersistenceImpl.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryPersistenceImpl.java
index fd7ccbaf29b..4f4f1988e56 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryPersistenceImpl.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/service/persistence/impl/EntryPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.contacts.service.persistence.impl;
@@ -118,7 +118,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param userId the user ID
 	 * @return the matching entries
 	 */
-	@Override
+
 	public List<Entry> findByUserId(long userId) {
 		return findByUserId(userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -135,7 +135,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByUserId(long userId, int start, int end) {
 		return findByUserId(userId, start, end, null);
 	}
@@ -153,7 +153,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByUserId(long userId, int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
 		return findByUserId(userId, start, end, orderByComparator, true);
@@ -173,7 +173,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching entries
 	 */
-	@Override
+
 	public List<Entry> findByUserId(long userId, int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -283,7 +283,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the first matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByUserId_First(long userId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByUserId_First(userId, orderByComparator);
@@ -311,7 +311,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByUserId_First(long userId,
 		OrderByComparator<Entry> orderByComparator) {
 		List<Entry> list = findByUserId(userId, 0, 1, orderByComparator);
@@ -331,7 +331,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the last matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByUserId_Last(long userId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = fetchByUserId_Last(userId, orderByComparator);
@@ -359,7 +359,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByUserId_Last(long userId,
 		OrderByComparator<Entry> orderByComparator) {
 		int count = countByUserId(userId);
@@ -387,7 +387,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the previous, current, and next entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry[] findByUserId_PrevAndNext(long entryId, long userId,
 		OrderByComparator<Entry> orderByComparator) throws NoSuchEntryException {
 		Entry entry = findByPrimaryKey(entryId);
@@ -528,7 +528,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param userId the user ID
 	 */
-	@Override
+
 	public void removeByUserId(long userId) {
 		for (Entry entry : findByUserId(userId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -542,7 +542,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param userId the user ID
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByUserId(long userId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_USERID;
 
@@ -607,7 +607,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the matching entry
 	 * @throws NoSuchEntryException if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry findByU_EA(long userId, String emailAddress)
 		throws NoSuchEntryException {
 		Entry entry = fetchByU_EA(userId, emailAddress);
@@ -642,7 +642,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param emailAddress the email address
 	 * @return the matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByU_EA(long userId, String emailAddress) {
 		return fetchByU_EA(userId, emailAddress, true);
 	}
@@ -655,7 +655,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching entry, or <code>null</code> if a matching entry could not be found
 	 */
-	@Override
+
 	public Entry fetchByU_EA(long userId, String emailAddress,
 		boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { userId, emailAddress };
@@ -767,7 +767,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param emailAddress the email address
 	 * @return the entry that was removed
 	 */
-	@Override
+
 	public Entry removeByU_EA(long userId, String emailAddress)
 		throws NoSuchEntryException {
 		Entry entry = findByU_EA(userId, emailAddress);
@@ -782,7 +782,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param emailAddress the email address
 	 * @return the number of matching entries
 	 */
-	@Override
+
 	public int countByU_EA(long userId, String emailAddress) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_U_EA;
 
@@ -859,7 +859,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param entry the entry
 	 */
-	@Override
+
 	public void cacheResult(Entry entry) {
 		entityCache.putResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
 			EntryImpl.class, entry.getPrimaryKey(), entry);
@@ -875,7 +875,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @param entries the entries
 	 */
-	@Override
+
 	public void cacheResult(List<Entry> entries) {
 		for (Entry entry : entries) {
 			if (entityCache.getResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
@@ -895,7 +895,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(EntryImpl.class);
 
@@ -911,7 +911,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(Entry entry) {
 		entityCache.removeResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
 			EntryImpl.class, entry.getPrimaryKey());
@@ -922,7 +922,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		clearUniqueFindersCache((EntryModelImpl)entry);
 	}
 
-	@Override
+
 	public void clearCache(List<Entry> entries) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -989,7 +989,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param entryId the primary key for the new entry
 	 * @return the new entry
 	 */
-	@Override
+
 	public Entry create(long entryId) {
 		Entry entry = new EntryImpl();
 
@@ -1008,7 +1008,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry that was removed
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry remove(long entryId) throws NoSuchEntryException {
 		return remove((Serializable)entryId);
 	}
@@ -1020,7 +1020,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry that was removed
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry remove(Serializable primaryKey) throws NoSuchEntryException {
 		Session session = null;
 
@@ -1051,7 +1051,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		}
 	}
 
-	@Override
+
 	protected Entry removeImpl(Entry entry) {
 		entry = toUnwrappedModel(entry);
 
@@ -1083,7 +1083,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		return entry;
 	}
 
-	@Override
+
 	public Entry updateImpl(Entry entry) {
 		entry = toUnwrappedModel(entry);
 
@@ -1199,7 +1199,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchEntryException {
 		Entry entry = fetchByPrimaryKey(primaryKey);
@@ -1223,7 +1223,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @return the entry
 	 * @throws NoSuchEntryException if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry findByPrimaryKey(long entryId) throws NoSuchEntryException {
 		return findByPrimaryKey((Serializable)entryId);
 	}
@@ -1234,7 +1234,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param primaryKey the primary key of the entry
 	 * @return the entry, or <code>null</code> if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry fetchByPrimaryKey(Serializable primaryKey) {
 		Entry entry = (Entry)entityCache.getResult(EntryModelImpl.ENTITY_CACHE_ENABLED,
 				EntryImpl.class, primaryKey);
@@ -1279,12 +1279,12 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param entryId the primary key of the entry
 	 * @return the entry, or <code>null</code> if a entry with the primary key could not be found
 	 */
-	@Override
+
 	public Entry fetchByPrimaryKey(long entryId) {
 		return fetchByPrimaryKey((Serializable)entryId);
 	}
 
-	@Override
+
 	public Map<Serializable, Entry> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1381,7 +1381,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @return the entries
 	 */
-	@Override
+
 	public List<Entry> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1397,7 +1397,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param end the upper bound of the range of entries (not inclusive)
 	 * @return the range of entries
 	 */
-	@Override
+
 	public List<Entry> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1414,7 +1414,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of entries
 	 */
-	@Override
+
 	public List<Entry> findAll(int start, int end,
 		OrderByComparator<Entry> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1433,7 +1433,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of entries
 	 */
-	@Override
+
 	public List<Entry> findAll(int start, int end,
 		OrderByComparator<Entry> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -1522,7 +1522,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 * Removes all the entries from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (Entry entry : findAll()) {
 			remove(entry);
@@ -1534,7 +1534,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	 *
 	 * @return the number of entries
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1566,7 +1566,7 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return EntryModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1598,19 +1598,19 @@ public class EntryPersistenceImpl extends BasePersistenceImpl<Entry>
 	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No Entry exists with the key {";
 	private static final Log _log = LogFactoryUtil.getLog(EntryPersistenceImpl.class);
 	private static final Entry _nullEntry = new EntryImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<Entry> toCacheModel() {
 				return _nullEntryCacheModel;
 			}
 		};
 
 	private static final CacheModel<Entry> _nullEntryCacheModel = new CacheModel<Entry>() {
-			@Override
+
 			public Entry toEntityModel() {
 				return _nullEntry;
 			}
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsConstants.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsConstants.java
index bc5d711989a..91555554ff0 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsConstants.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsConstants.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.util;
 
 /**
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsExtensionsUtil.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsExtensionsUtil.java
index 584d15e61de..02548c219be 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsExtensionsUtil.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsExtensionsUtil.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.util;
 
 import java.util.Map;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsUtil.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsUtil.java
index 4b634b14bfe..3c8b5467682 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsUtil.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/ContactsUtil.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.util;
 
 import com.liferay.contacts.model.Entry;
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/SocialRelationConstants.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/SocialRelationConstants.java
index 09fe78043d2..bf978b6fb21 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/SocialRelationConstants.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/SocialRelationConstants.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.util;
 
 /**
diff --git a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/WebKeys.java b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/WebKeys.java
index f0c22cfddb9..01a01fc7fba 100644
--- a/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/WebKeys.java
+++ b/portlets/contacts-portlet/docroot/WEB-INF/src/com/liferay/contacts/util/WebKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.util;
 
 /**
diff --git a/portlets/contacts-portlet/docroot/chat/view.jsp b/portlets/contacts-portlet/docroot/chat/view.jsp
index 53dd19bcab6..3212c49ca99 100644
--- a/portlets/contacts-portlet/docroot/chat/view.jsp
+++ b/portlets/contacts-portlet/docroot/chat/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/complete_your_profile.jspf b/portlets/contacts-portlet/docroot/contacts_center/complete_your_profile.jspf
index 9103a0075d5..3654051c577 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/complete_your_profile.jspf
+++ b/portlets/contacts-portlet/docroot/contacts_center/complete_your_profile.jspf
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <div class="profile-actions">
diff --git a/portlets/contacts-portlet/docroot/contacts_center/configuration.jsp b/portlets/contacts-portlet/docroot/contacts_center/configuration.jsp
index 9516ea5ed98..55949f5f33e 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/configuration.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/configuration.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/contacts_center_toolbar.jsp b/portlets/contacts-portlet/docroot/contacts_center/contacts_center_toolbar.jsp
index e3aecbfb020..9f566756c43 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/contacts_center_toolbar.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/contacts_center_toolbar.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/edit_entry.jsp b/portlets/contacts-portlet/docroot/contacts_center/edit_entry.jsp
index 2c478d35e00..1b61bca2a04 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/edit_entry.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/edit_entry.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/edit_user_dialogs.jsp b/portlets/contacts-portlet/docroot/contacts_center/edit_user_dialogs.jsp
index 1b8db44796c..3ec463e2eb0 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/edit_user_dialogs.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/edit_user_dialogs.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/user/categorization.jsp b/portlets/contacts-portlet/docroot/contacts_center/user/categorization.jsp
index 845ad563ef6..1a20e08f95d 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/user/categorization.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/user/categorization.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/user/details.jsp b/portlets/contacts-portlet/docroot/contacts_center/user/details.jsp
index 404842817c7..67f5a838173 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/user/details.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/user/details.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/user_toolbar.jsp b/portlets/contacts-portlet/docroot/contacts_center/user_toolbar.jsp
index 871eefb54d7..c553c97a9e0 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/user_toolbar.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/user_toolbar.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/view.jsp b/portlets/contacts-portlet/docroot/contacts_center/view.jsp
index f9865d436ac..54e6a1a3ce0 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/view.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/view_entry.jsp b/portlets/contacts-portlet/docroot/contacts_center/view_entry.jsp
index 7972015e8cc..375a7c6c4e0 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/view_entry.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/view_entry.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/view_requests.jsp b/portlets/contacts-portlet/docroot/contacts_center/view_requests.jsp
index fc3d696a335..26166caca5c 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/view_requests.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/view_requests.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/view_resources.jsp b/portlets/contacts-portlet/docroot/contacts_center/view_resources.jsp
index 9a330e6b831..5150038f33f 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/view_resources.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/view_resources.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/view_user.jsp b/portlets/contacts-portlet/docroot/contacts_center/view_user.jsp
index 03d144aade7..dadefc2dc27 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/view_user.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/view_user.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/contacts_center/view_user_information.jsp b/portlets/contacts-portlet/docroot/contacts_center/view_user_information.jsp
index 41dfb8bad9f..ae32e3a7677 100644
--- a/portlets/contacts-portlet/docroot/contacts_center/view_user_information.jsp
+++ b/portlets/contacts-portlet/docroot/contacts_center/view_user_information.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/init.jsp b/portlets/contacts-portlet/docroot/init.jsp
index 05df4f37a51..0792fd2d3e2 100644
--- a/portlets/contacts-portlet/docroot/init.jsp
+++ b/portlets/contacts-portlet/docroot/init.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
diff --git a/portlets/contacts-portlet/docroot/my_contacts/view.jsp b/portlets/contacts-portlet/docroot/my_contacts/view.jsp
index 6284ef5ff81..7de34edb20b 100644
--- a/portlets/contacts-portlet/docroot/my_contacts/view.jsp
+++ b/portlets/contacts-portlet/docroot/my_contacts/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/contacts-portlet/docroot/profile/view.jsp b/portlets/contacts-portlet/docroot/profile/view.jsp
index 291ee0ec6ad..d3bd05f45d1 100644
--- a/portlets/contacts-portlet/docroot/profile/view.jsp
+++ b/portlets/contacts-portlet/docroot/profile/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/UpgradeProcess_1_0_0.java b/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/UpgradeProcess_1_0_0.java
index 7b4009f6183..45f45168286 100644
--- a/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/UpgradeProcess_1_0_0.java
+++ b/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/UpgradeProcess_1_0_0.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.flash.hook.upgrade;
@@ -22,12 +22,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 100;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradePortletPreferences.class);
 	}
diff --git a/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/v1_0_0/UpgradePortletPreferences.java b/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
index 8d1b421a31e..3818d1547a3 100644
--- a/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
+++ b/portlets/flash-portlet/docroot/WEB-INF/src/com/liferay/flash/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.flash.hook.upgrade.v1_0_0;
@@ -22,7 +22,7 @@ import com.liferay.portal.kernel.upgrade.CamelCaseUpgradePortletPreferences;
 public class UpgradePortletPreferences
 	extends CamelCaseUpgradePortletPreferences {
 
-	@Override
+
 	protected String[] getPortletIds() {
 		return new String[] {"1_WAR_flashportlet_INSTANCE_%"};
 	}
diff --git a/portlets/flash-portlet/docroot/configuration.jsp b/portlets/flash-portlet/docroot/configuration.jsp
index 1986e90dc7a..3a8673e11b8 100644
--- a/portlets/flash-portlet/docroot/configuration.jsp
+++ b/portlets/flash-portlet/docroot/configuration.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/flash-portlet/docroot/init.jsp b/portlets/flash-portlet/docroot/init.jsp
index 1925359950c..ce94967a368 100644
--- a/portlets/flash-portlet/docroot/init.jsp
+++ b/portlets/flash-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/flash-portlet/docroot/view.jsp b/portlets/flash-portlet/docroot/view.jsp
index 512b4e1e110..c8f786f3f74 100644
--- a/portlets/flash-portlet/docroot/view.jsp
+++ b/portlets/flash-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/UpgradeProcess_1_0_0.java b/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/UpgradeProcess_1_0_0.java
index 4e08f8c5814..a37e466594c 100644
--- a/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/UpgradeProcess_1_0_0.java
+++ b/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/UpgradeProcess_1_0_0.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.googleadsense.hook.upgrade;
@@ -22,12 +22,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 100;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradePortletPreferences.class);
 	}
diff --git a/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/v1_0_0/UpgradePortletPreferences.java b/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
index 384574c9022..2377f4b8508 100644
--- a/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
+++ b/portlets/google-adsense-portlet/docroot/WEB-INF/src/com/liferay/googleadsense/hook/upgrade/v1_0_0/UpgradePortletPreferences.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.googleadsense.hook.upgrade.v1_0_0;
@@ -22,7 +22,7 @@ import com.liferay.portal.kernel.upgrade.CamelCaseUpgradePortletPreferences;
 public class UpgradePortletPreferences
 	extends CamelCaseUpgradePortletPreferences {
 
-	@Override
+
 	protected String[] getPortletIds() {
 		return new String[] {"1_WAR_googleadsenseportlet_INSTANCE_%"};
 	}
diff --git a/portlets/google-adsense-portlet/docroot/configuration.jsp b/portlets/google-adsense-portlet/docroot/configuration.jsp
index 727d7b055c7..61bc44babad 100644
--- a/portlets/google-adsense-portlet/docroot/configuration.jsp
+++ b/portlets/google-adsense-portlet/docroot/configuration.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/google-adsense-portlet/docroot/init.jsp b/portlets/google-adsense-portlet/docroot/init.jsp
index 01a77cef400..c02f75e64c7 100644
--- a/portlets/google-adsense-portlet/docroot/init.jsp
+++ b/portlets/google-adsense-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/google-adsense-portlet/docroot/view.jsp b/portlets/google-adsense-portlet/docroot/view.jsp
index ae6d4e2b987..122220609ad 100644
--- a/portlets/google-adsense-portlet/docroot/view.jsp
+++ b/portlets/google-adsense-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/journal-police-portlet/docroot/view.jsp b/portlets/journal-police-portlet/docroot/view.jsp
index c72e87956a4..596604f1458 100644
--- a/portlets/journal-police-portlet/docroot/view.jsp
+++ b/portlets/journal-police-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/logos-reftagger-portlet/docroot/view.jsp b/portlets/logos-reftagger-portlet/docroot/view.jsp
index a0d78f999cf..3f4e6c291d0 100644
--- a/portlets/logos-reftagger-portlet/docroot/view.jsp
+++ b/portlets/logos-reftagger-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/portlet/SubscriptionManagerPortlet.java b/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/portlet/SubscriptionManagerPortlet.java
index 3dad29936ef..c06c0ab77b5 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/portlet/SubscriptionManagerPortlet.java
+++ b/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/portlet/SubscriptionManagerPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mbsubscriptionmanager.portlet;
diff --git a/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/PortletKeys.java b/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/PortletKeys.java
index 17e5a8e2c1f..5e713451305 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/PortletKeys.java
+++ b/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/PortletKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mbsubscriptionmanager.util;
diff --git a/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/SubscriptionManagerUtil.java b/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/SubscriptionManagerUtil.java
index 8275c89009d..f193a426329 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/SubscriptionManagerUtil.java
+++ b/portlets/mb-subscription-manager-portlet/docroot/WEB-INF/src/com/liferay/mbsubscriptionmanager/util/SubscriptionManagerUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.mbsubscriptionmanager.util;
diff --git a/portlets/mb-subscription-manager-portlet/docroot/category_action.jsp b/portlets/mb-subscription-manager-portlet/docroot/category_action.jsp
index 1c8499b4b68..fe519a91984 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/category_action.jsp
+++ b/portlets/mb-subscription-manager-portlet/docroot/category_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/mb-subscription-manager-portlet/docroot/category_search.jsp b/portlets/mb-subscription-manager-portlet/docroot/category_search.jsp
index b08f6d68ea3..d7d424c746e 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/category_search.jsp
+++ b/portlets/mb-subscription-manager-portlet/docroot/category_search.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/mb-subscription-manager-portlet/docroot/init.jsp b/portlets/mb-subscription-manager-portlet/docroot/init.jsp
index c9b74141ff7..7d6394660bb 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/init.jsp
+++ b/portlets/mb-subscription-manager-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/mb-subscription-manager-portlet/docroot/manage_subscriptions.jsp b/portlets/mb-subscription-manager-portlet/docroot/manage_subscriptions.jsp
index b1ad69808ce..d5957ce8df0 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/manage_subscriptions.jsp
+++ b/portlets/mb-subscription-manager-portlet/docroot/manage_subscriptions.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/mb-subscription-manager-portlet/docroot/subscription_action.jsp b/portlets/mb-subscription-manager-portlet/docroot/subscription_action.jsp
index f9d7b26addb..ea3643f3447 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/subscription_action.jsp
+++ b/portlets/mb-subscription-manager-portlet/docroot/subscription_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/mb-subscription-manager-portlet/docroot/view.jsp b/portlets/mb-subscription-manager-portlet/docroot/view.jsp
index 21be46ba189..93a7c2608ad 100644
--- a/portlets/mb-subscription-manager-portlet/docroot/view.jsp
+++ b/portlets/mb-subscription-manager-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/microblogs-portlet/copyright.txt b/portlets/microblogs-portlet/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/portlets/microblogs-portlet/copyright.txt
+++ b/portlets/microblogs-portlet/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/NoSuchEntryException.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/NoSuchEntryException.java
index 869198f0f8e..05b74d02279 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/NoSuchEntryException.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/NoSuchEntryException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.exception;
 
 import com.liferay.portal.kernel.exception.NoSuchModelException;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/UnsupportedMicroblogsEntryException.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/UnsupportedMicroblogsEntryException.java
index 26394099d7c..b6ea73fb5b3 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/UnsupportedMicroblogsEntryException.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/exception/UnsupportedMicroblogsEntryException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntry.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntry.java
index 29dcdbdc608..87f2e3cb37b 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntry.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model;
@@ -39,17 +39,17 @@ public interface MicroblogsEntry extends MicroblogsEntryModel, PersistedModel {
 	 */
 	public static final Accessor<MicroblogsEntry, Long> MICROBLOGS_ENTRY_ID_ACCESSOR =
 		new Accessor<MicroblogsEntry, Long>() {
-			@Override
+
 			public Long get(MicroblogsEntry microblogsEntry) {
 				return microblogsEntry.getMicroblogsEntryId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<MicroblogsEntry> getTypeClass() {
 				return MicroblogsEntry.class;
 			}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryClp.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryClp.java
index 9054abc3404..949ad17d506 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryClp.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model;
@@ -48,37 +48,37 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 	public MicroblogsEntryClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return MicroblogsEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return MicroblogsEntry.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _microblogsEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setMicroblogsEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _microblogsEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -101,7 +101,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long microblogsEntryId = (Long)attributes.get("microblogsEntryId");
 
@@ -181,12 +181,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getMicroblogsEntryId() {
 		return _microblogsEntryId;
 	}
 
-	@Override
+
 	public void setMicroblogsEntryId(long microblogsEntryId) {
 		_microblogsEntryId = microblogsEntryId;
 
@@ -205,12 +205,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -228,12 +228,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -251,7 +251,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -263,16 +263,16 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -290,12 +290,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -313,12 +313,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -336,12 +336,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long getCreatorClassNameId() {
 		return _creatorClassNameId;
 	}
 
-	@Override
+
 	public void setCreatorClassNameId(long creatorClassNameId) {
 		_creatorClassNameId = creatorClassNameId;
 
@@ -360,12 +360,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long getCreatorClassPK() {
 		return _creatorClassPK;
 	}
 
-	@Override
+
 	public void setCreatorClassPK(long creatorClassPK) {
 		_creatorClassPK = creatorClassPK;
 
@@ -383,12 +383,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public String getContent() {
 		return _content;
 	}
 
-	@Override
+
 	public void setContent(String content) {
 		_content = content;
 
@@ -406,12 +406,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public int getType() {
 		return _type;
 	}
 
-	@Override
+
 	public void setType(int type) {
 		_type = type;
 
@@ -429,12 +429,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long getParentMicroblogsEntryId() {
 		return _parentMicroblogsEntryId;
 	}
 
-	@Override
+
 	public void setParentMicroblogsEntryId(long parentMicroblogsEntryId) {
 		_parentMicroblogsEntryId = parentMicroblogsEntryId;
 
@@ -454,12 +454,12 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public int getSocialRelationType() {
 		return _socialRelationType;
 	}
 
-	@Override
+
 	public void setSocialRelationType(int socialRelationType) {
 		_socialRelationType = socialRelationType;
 
@@ -478,7 +478,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long getParentMicroblogsEntryUserId() {
 		try {
 			String methodName = "getParentMicroblogsEntryUserId";
@@ -497,7 +497,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public long fetchParentMicroblogsEntryUserId() {
 		try {
 			String methodName = "fetchParentMicroblogsEntryUserId";
@@ -566,7 +566,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			MicroblogsEntryLocalServiceUtil.addMicroblogsEntry(this);
@@ -576,14 +576,14 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public MicroblogsEntry toEscapedModel() {
 		return (MicroblogsEntry)ProxyUtil.newProxyInstance(MicroblogsEntry.class.getClassLoader(),
 			new Class[] { MicroblogsEntry.class },
 			new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		MicroblogsEntryClp clone = new MicroblogsEntryClp();
 
@@ -603,7 +603,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(MicroblogsEntry microblogsEntry) {
 		int value = 0;
 
@@ -619,7 +619,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -645,22 +645,22 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(25);
 
@@ -693,7 +693,7 @@ public class MicroblogsEntryClp extends BaseModelImpl<MicroblogsEntry>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(40);
 
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryConstants.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryConstants.java
index 88baad93f31..f32cff4bda6 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryConstants.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryConstants.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.model;
 
 /**
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryModel.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryModel.java
index d1d13d3eb73..275b119f30a 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryModel.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model;
@@ -84,7 +84,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @return the company ID of this microblogs entry
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -92,7 +92,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @param companyId the company ID of this microblogs entry
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -100,7 +100,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @return the user ID of this microblogs entry
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -108,7 +108,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @param userId the user ID of this microblogs entry
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -116,7 +116,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @return the user uuid of this microblogs entry
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -124,7 +124,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @param userUuid the user uuid of this microblogs entry
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -133,7 +133,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 * @return the user name of this microblogs entry
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -141,7 +141,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @param userName the user name of this microblogs entry
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -149,7 +149,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @return the create date of this microblogs entry
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -157,7 +157,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @param createDate the create date of this microblogs entry
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -165,7 +165,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @return the modified date of this microblogs entry
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -173,7 +173,7 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 *
 	 * @param modifiedDate the modified date of this microblogs entry
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -261,61 +261,61 @@ public interface MicroblogsEntryModel extends AuditedModel,
 	 */
 	public void setSocialRelationType(int socialRelationType);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.microblogs.model.MicroblogsEntry> toCacheModel();
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry toEscapedModel();
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntrySoap.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntrySoap.java
index 58483398ab8..ba77e4e382d 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntrySoap.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntrySoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryWrapper.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryWrapper.java
index cc2f77a8cca..4cbd4bcd611 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryWrapper.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/model/MicroblogsEntryWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model;
@@ -44,17 +44,17 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 		_microblogsEntry = microblogsEntry;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return MicroblogsEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return MicroblogsEntry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -74,7 +74,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long microblogsEntryId = (Long)attributes.get("microblogsEntryId");
 
@@ -151,42 +151,42 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _microblogsEntry.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _microblogsEntry.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _microblogsEntry.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _microblogsEntry.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry toEscapedModel() {
 		return new MicroblogsEntryWrapper(_microblogsEntry.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry toUnescapedModel() {
 		return new MicroblogsEntryWrapper(_microblogsEntry.toUnescapedModel());
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.microblogs.model.MicroblogsEntry> toCacheModel() {
 		return _microblogsEntry.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry) {
 		return _microblogsEntry.compareTo(microblogsEntry);
@@ -197,7 +197,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the social relation type of this microblogs entry
 	*/
-	@Override
+
 	public int getSocialRelationType() {
 		return _microblogsEntry.getSocialRelationType();
 	}
@@ -207,22 +207,22 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the type of this microblogs entry
 	*/
-	@Override
+
 	public int getType() {
 		return _microblogsEntry.getType();
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _microblogsEntry.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _microblogsEntry.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new MicroblogsEntryWrapper((MicroblogsEntry)_microblogsEntry.clone());
 	}
@@ -232,7 +232,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the content of this microblogs entry
 	*/
-	@Override
+
 	public java.lang.String getContent() {
 		return _microblogsEntry.getContent();
 	}
@@ -242,7 +242,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the user name of this microblogs entry
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _microblogsEntry.getUserName();
 	}
@@ -252,17 +252,17 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the user uuid of this microblogs entry
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _microblogsEntry.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _microblogsEntry.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _microblogsEntry.toXmlString();
 	}
@@ -272,7 +272,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the create date of this microblogs entry
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _microblogsEntry.getCreateDate();
 	}
@@ -282,12 +282,12 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the modified date of this microblogs entry
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _microblogsEntry.getModifiedDate();
 	}
 
-	@Override
+
 	public long fetchParentMicroblogsEntryUserId() {
 		return _microblogsEntry.fetchParentMicroblogsEntryUserId();
 	}
@@ -297,7 +297,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the company ID of this microblogs entry
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _microblogsEntry.getCompanyId();
 	}
@@ -307,7 +307,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the creator class name ID of this microblogs entry
 	*/
-	@Override
+
 	public long getCreatorClassNameId() {
 		return _microblogsEntry.getCreatorClassNameId();
 	}
@@ -317,7 +317,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the creator class p k of this microblogs entry
 	*/
-	@Override
+
 	public long getCreatorClassPK() {
 		return _microblogsEntry.getCreatorClassPK();
 	}
@@ -327,7 +327,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the microblogs entry ID of this microblogs entry
 	*/
-	@Override
+
 	public long getMicroblogsEntryId() {
 		return _microblogsEntry.getMicroblogsEntryId();
 	}
@@ -337,12 +337,12 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the parent microblogs entry ID of this microblogs entry
 	*/
-	@Override
+
 	public long getParentMicroblogsEntryId() {
 		return _microblogsEntry.getParentMicroblogsEntryId();
 	}
 
-	@Override
+
 	public long getParentMicroblogsEntryUserId()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntry.getParentMicroblogsEntryUserId();
@@ -353,7 +353,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the primary key of this microblogs entry
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _microblogsEntry.getPrimaryKey();
 	}
@@ -363,17 +363,17 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @return the user ID of this microblogs entry
 	*/
-	@Override
+
 	public long getUserId() {
 		return _microblogsEntry.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_microblogsEntry.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_microblogsEntry.setCachedModel(cachedModel);
 	}
@@ -383,7 +383,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param companyId the company ID of this microblogs entry
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_microblogsEntry.setCompanyId(companyId);
 	}
@@ -393,7 +393,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param content the content of this microblogs entry
 	*/
-	@Override
+
 	public void setContent(java.lang.String content) {
 		_microblogsEntry.setContent(content);
 	}
@@ -403,7 +403,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param createDate the create date of this microblogs entry
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_microblogsEntry.setCreateDate(createDate);
 	}
@@ -413,7 +413,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param creatorClassNameId the creator class name ID of this microblogs entry
 	*/
-	@Override
+
 	public void setCreatorClassNameId(long creatorClassNameId) {
 		_microblogsEntry.setCreatorClassNameId(creatorClassNameId);
 	}
@@ -423,23 +423,23 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param creatorClassPK the creator class p k of this microblogs entry
 	*/
-	@Override
+
 	public void setCreatorClassPK(long creatorClassPK) {
 		_microblogsEntry.setCreatorClassPK(creatorClassPK);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_microblogsEntry.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_microblogsEntry.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_microblogsEntry.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -449,7 +449,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param microblogsEntryId the microblogs entry ID of this microblogs entry
 	*/
-	@Override
+
 	public void setMicroblogsEntryId(long microblogsEntryId) {
 		_microblogsEntry.setMicroblogsEntryId(microblogsEntryId);
 	}
@@ -459,12 +459,12 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param modifiedDate the modified date of this microblogs entry
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_microblogsEntry.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_microblogsEntry.setNew(n);
 	}
@@ -474,7 +474,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param parentMicroblogsEntryId the parent microblogs entry ID of this microblogs entry
 	*/
-	@Override
+
 	public void setParentMicroblogsEntryId(long parentMicroblogsEntryId) {
 		_microblogsEntry.setParentMicroblogsEntryId(parentMicroblogsEntryId);
 	}
@@ -484,12 +484,12 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param primaryKey the primary key of this microblogs entry
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_microblogsEntry.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_microblogsEntry.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -499,7 +499,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param socialRelationType the social relation type of this microblogs entry
 	*/
-	@Override
+
 	public void setSocialRelationType(int socialRelationType) {
 		_microblogsEntry.setSocialRelationType(socialRelationType);
 	}
@@ -509,7 +509,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param type the type of this microblogs entry
 	*/
-	@Override
+
 	public void setType(int type) {
 		_microblogsEntry.setType(type);
 	}
@@ -519,7 +519,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param userId the user ID of this microblogs entry
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_microblogsEntry.setUserId(userId);
 	}
@@ -529,7 +529,7 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param userName the user name of this microblogs entry
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_microblogsEntry.setUserName(userName);
 	}
@@ -539,12 +539,12 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 	*
 	* @param userUuid the user uuid of this microblogs entry
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_microblogsEntry.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -564,22 +564,22 @@ public class MicroblogsEntryWrapper implements MicroblogsEntry,
 		return false;
 	}
 
-	@Override
+
 	public MicroblogsEntry getWrappedModel() {
 		return _microblogsEntry;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _microblogsEntry.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _microblogsEntry.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_microblogsEntry.resetOriginalValues();
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/ClpSerializer.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/ClpSerializer.java
index d7df5cba1d6..cba3f74882f 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/ClpSerializer.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalService.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalService.java
index f85b7339363..116023fe378 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalService.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
@@ -151,11 +151,11 @@ public interface MicroblogsEntryLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -197,7 +197,7 @@ public interface MicroblogsEntryLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getUserMicroblogsEntriesCount(long userId, int type);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceClp.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceClp.java
index b4f5d5f701b..035c280dc62 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceClp.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
@@ -252,7 +252,7 @@ public class MicroblogsEntryLocalServiceClp
 			};
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry) {
 		Object returnObj = null;
@@ -277,7 +277,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		long userId, java.lang.String content, int type,
 		long parentMicroblogsEntryId, int socialRelationType,
@@ -321,7 +321,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		long userId, long creatorClassNameId, long creatorClassPK,
 		java.lang.String content, int type, long parentMicroblogsEntryId,
@@ -370,7 +370,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry createMicroblogsEntry(
 		long microblogsEntryId) {
 		Object returnObj = null;
@@ -394,7 +394,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry deleteMicroblogsEntry(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -424,7 +424,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry deleteMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -453,7 +453,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry fetchMicroblogsEntry(
 		long microblogsEntryId) {
 		Object returnObj = null;
@@ -477,7 +477,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry getMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -506,7 +506,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry updateMicroblogsEntry(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry) {
 		Object returnObj = null;
@@ -531,7 +531,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry updateMicroblogsEntry(
 		long microblogsEntryId, java.lang.String content,
 		int socialRelationType,
@@ -571,7 +571,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -594,7 +594,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -617,7 +617,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -640,7 +640,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -670,7 +670,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -700,7 +700,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getCompanyMicroblogsEntriesCount(long companyId) {
 		Object returnObj = null;
 
@@ -723,7 +723,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount() {
 		Object returnObj = null;
 
@@ -746,7 +746,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		java.lang.String assetTagName) {
 		Object returnObj = null;
@@ -775,7 +775,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		long creatorClassPK) {
 		Object returnObj = null;
@@ -800,7 +800,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		long creatorClassPK, int type) {
 		Object returnObj = null;
@@ -825,7 +825,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		long creatorClassPK, java.lang.String assetTagName, boolean andOperator) {
 		Object returnObj = null;
@@ -858,7 +858,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getParentMicroblogsEntryMicroblogsEntriesCount(int type,
 		long parentMicroblogsEntryId) {
 		Object returnObj = null;
@@ -883,7 +883,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long userId) {
 		Object returnObj = null;
 
@@ -906,7 +906,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long userId, int type) {
 		Object returnObj = null;
 
@@ -929,14 +929,14 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -959,7 +959,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -984,7 +984,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -1016,7 +1016,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -1051,7 +1051,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getCompanyMicroblogsEntries(
 		long companyId, int start, int end) {
 		Object returnObj = null;
@@ -1076,7 +1076,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		int start, int end) {
 		Object returnObj = null;
@@ -1100,7 +1100,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, int type, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -1136,7 +1136,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, java.lang.String assetTagName, int start,
 		int end) {
@@ -1170,7 +1170,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, long creatorClassPK, int start, int end) {
 		Object returnObj = null;
@@ -1195,7 +1195,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, long creatorClassPK, int type, int start,
 		int end) {
@@ -1231,7 +1231,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, long creatorClassPK,
 		java.lang.String assetTagName, boolean andOperator, int start, int end) {
@@ -1269,7 +1269,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getParentMicroblogsEntryMicroblogsEntries(
 		int type, long parentMicroblogsEntryId, int start, int end) {
 		Object returnObj = null;
@@ -1294,7 +1294,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getParentMicroblogsEntryMicroblogsEntries(
 		int type, long parentMicroblogsEntryId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.microblogs.model.MicroblogsEntry> orderByComparator) {
@@ -1330,7 +1330,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long userId, int start, int end) {
 		Object returnObj = null;
@@ -1354,7 +1354,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long userId, int type, int start, int end) {
 		Object returnObj = null;
@@ -1379,7 +1379,7 @@ public class MicroblogsEntryLocalServiceClp
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -1404,7 +1404,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -1434,7 +1434,7 @@ public class MicroblogsEntryLocalServiceClp
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void deleteMicroblogsEntries(long creatorClassNameId,
 		long creatorClassPK)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -1460,7 +1460,7 @@ public class MicroblogsEntryLocalServiceClp
 		}
 	}
 
-	@Override
+
 	public void deleteUserMicroblogsEntries(long userId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
@@ -1484,7 +1484,7 @@ public class MicroblogsEntryLocalServiceClp
 		}
 	}
 
-	@Override
+
 	public void updateAsset(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry,
 		long[] assetCategoryIds, java.lang.String[] assetTagNames)
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceUtil.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceUtil.java
index 3d083dd79c1..3e992e1bdbb 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceUtil.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceWrapper.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceWrapper.java
index a55aaaf786b..ea3fc6e3d7f 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceWrapper.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
@@ -40,13 +40,13 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param microblogsEntry the microblogs entry
 	* @return the microblogs entry that was added
 	*/
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry) {
 		return _microblogsEntryLocalService.addMicroblogsEntry(microblogsEntry);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		long userId, java.lang.String content, int type,
 		long parentMicroblogsEntryId, int socialRelationType,
@@ -56,7 +56,7 @@ public class MicroblogsEntryLocalServiceWrapper
 			type, parentMicroblogsEntryId, socialRelationType, serviceContext);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		long userId, long creatorClassNameId, long creatorClassPK,
 		java.lang.String content, int type, long parentMicroblogsEntryId,
@@ -74,7 +74,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param microblogsEntryId the primary key for the new microblogs entry
 	* @return the new microblogs entry
 	*/
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry createMicroblogsEntry(
 		long microblogsEntryId) {
 		return _microblogsEntryLocalService.createMicroblogsEntry(microblogsEntryId);
@@ -87,7 +87,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @return the microblogs entry that was removed
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry deleteMicroblogsEntry(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -101,14 +101,14 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @return the microblogs entry that was removed
 	* @throws PortalException if a microblogs entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry deleteMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryLocalService.deleteMicroblogsEntry(microblogsEntryId);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry fetchMicroblogsEntry(
 		long microblogsEntryId) {
 		return _microblogsEntryLocalService.fetchMicroblogsEntry(microblogsEntryId);
@@ -121,7 +121,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @return the microblogs entry
 	* @throws PortalException if a microblogs entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry getMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -134,13 +134,13 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param microblogsEntry the microblogs entry
 	* @return the microblogs entry that was updated
 	*/
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry updateMicroblogsEntry(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry) {
 		return _microblogsEntryLocalService.updateMicroblogsEntry(microblogsEntry);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry updateMicroblogsEntry(
 		long microblogsEntryId, java.lang.String content,
 		int socialRelationType,
@@ -150,17 +150,17 @@ public class MicroblogsEntryLocalServiceWrapper
 			content, socialRelationType, serviceContext);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _microblogsEntryLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _microblogsEntryLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _microblogsEntryLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -168,21 +168,21 @@ public class MicroblogsEntryLocalServiceWrapper
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryLocalService.getPersistedModel(primaryKeyObj);
 	}
 
-	@Override
+
 	public int getCompanyMicroblogsEntriesCount(long companyId) {
 		return _microblogsEntryLocalService.getCompanyMicroblogsEntriesCount(companyId);
 	}
@@ -192,58 +192,58 @@ public class MicroblogsEntryLocalServiceWrapper
 	*
 	* @return the number of microblogs entries
 	*/
-	@Override
+
 	public int getMicroblogsEntriesCount() {
 		return _microblogsEntryLocalService.getMicroblogsEntriesCount();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		java.lang.String assetTagName) {
 		return _microblogsEntryLocalService.getMicroblogsEntriesCount(creatorClassNameId,
 			assetTagName);
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		long creatorClassPK) {
 		return _microblogsEntryLocalService.getMicroblogsEntriesCount(creatorClassNameId,
 			creatorClassPK);
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		long creatorClassPK, int type) {
 		return _microblogsEntryLocalService.getMicroblogsEntriesCount(creatorClassNameId,
 			creatorClassPK, type);
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(long creatorClassNameId,
 		long creatorClassPK, java.lang.String assetTagName, boolean andOperator) {
 		return _microblogsEntryLocalService.getMicroblogsEntriesCount(creatorClassNameId,
 			creatorClassPK, assetTagName, andOperator);
 	}
 
-	@Override
+
 	public int getParentMicroblogsEntryMicroblogsEntriesCount(int type,
 		long parentMicroblogsEntryId) {
 		return _microblogsEntryLocalService.getParentMicroblogsEntryMicroblogsEntriesCount(type,
 			parentMicroblogsEntryId);
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long userId) {
 		return _microblogsEntryLocalService.getUserMicroblogsEntriesCount(userId);
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long userId, int type) {
 		return _microblogsEntryLocalService.getUserMicroblogsEntriesCount(userId,
 			type);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -256,7 +256,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _microblogsEntryLocalService.getOSGiServiceIdentifier();
 	}
@@ -267,7 +267,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _microblogsEntryLocalService.dynamicQuery(dynamicQuery);
@@ -285,7 +285,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -306,7 +306,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -315,7 +315,7 @@ public class MicroblogsEntryLocalServiceWrapper
 			end, orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getCompanyMicroblogsEntries(
 		long companyId, int start, int end) {
 		return _microblogsEntryLocalService.getCompanyMicroblogsEntries(companyId,
@@ -333,13 +333,13 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param end the upper bound of the range of microblogs entries (not inclusive)
 	* @return the range of microblogs entries
 	*/
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		int start, int end) {
 		return _microblogsEntryLocalService.getMicroblogsEntries(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, int type, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -347,7 +347,7 @@ public class MicroblogsEntryLocalServiceWrapper
 			type, start, end, obc);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, java.lang.String assetTagName, int start,
 		int end) {
@@ -355,14 +355,14 @@ public class MicroblogsEntryLocalServiceWrapper
 			assetTagName, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, long creatorClassPK, int start, int end) {
 		return _microblogsEntryLocalService.getMicroblogsEntries(creatorClassNameId,
 			creatorClassPK, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, long creatorClassPK, int type, int start,
 		int end) {
@@ -370,7 +370,7 @@ public class MicroblogsEntryLocalServiceWrapper
 			creatorClassPK, type, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		long creatorClassNameId, long creatorClassPK,
 		java.lang.String assetTagName, boolean andOperator, int start, int end) {
@@ -378,14 +378,14 @@ public class MicroblogsEntryLocalServiceWrapper
 			creatorClassPK, assetTagName, andOperator, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getParentMicroblogsEntryMicroblogsEntries(
 		int type, long parentMicroblogsEntryId, int start, int end) {
 		return _microblogsEntryLocalService.getParentMicroblogsEntryMicroblogsEntries(type,
 			parentMicroblogsEntryId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getParentMicroblogsEntryMicroblogsEntries(
 		int type, long parentMicroblogsEntryId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.microblogs.model.MicroblogsEntry> orderByComparator) {
@@ -393,14 +393,14 @@ public class MicroblogsEntryLocalServiceWrapper
 			parentMicroblogsEntryId, start, end, orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long userId, int start, int end) {
 		return _microblogsEntryLocalService.getUserMicroblogsEntries(userId,
 			start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long userId, int type, int start, int end) {
 		return _microblogsEntryLocalService.getUserMicroblogsEntries(userId,
@@ -413,7 +413,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _microblogsEntryLocalService.dynamicQueryCount(dynamicQuery);
@@ -426,7 +426,7 @@ public class MicroblogsEntryLocalServiceWrapper
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -434,7 +434,7 @@ public class MicroblogsEntryLocalServiceWrapper
 			projection);
 	}
 
-	@Override
+
 	public void deleteMicroblogsEntries(long creatorClassNameId,
 		long creatorClassPK)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -442,13 +442,13 @@ public class MicroblogsEntryLocalServiceWrapper
 			creatorClassPK);
 	}
 
-	@Override
+
 	public void deleteUserMicroblogsEntries(long userId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_microblogsEntryLocalService.deleteUserMicroblogsEntries(userId);
 	}
 
-	@Override
+
 	public void updateAsset(
 		com.liferay.microblogs.model.MicroblogsEntry microblogsEntry,
 		long[] assetCategoryIds, java.lang.String[] assetTagNames)
@@ -457,12 +457,12 @@ public class MicroblogsEntryLocalServiceWrapper
 			assetCategoryIds, assetTagNames);
 	}
 
-	@Override
+
 	public MicroblogsEntryLocalService getWrappedService() {
 		return _microblogsEntryLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		MicroblogsEntryLocalService microblogsEntryLocalService) {
 		_microblogsEntryLocalService = microblogsEntryLocalService;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryService.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryService.java
index d36392c5c7a..2d46cc43dd5 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryService.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
@@ -84,7 +84,7 @@ public interface MicroblogsEntryService extends BaseService, InvokableService {
 	public int getUserMicroblogsEntriesCount(long microblogsEntryUserId,
 		int type) throws PortalException;
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceClp.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceClp.java
index 291ec48c2d5..171427ab016 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceClp.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
@@ -86,7 +86,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		_methodParameterTypes13 = new String[] { "long", "int", "int", "int" };
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		long userId, java.lang.String content, int type,
 		long parentMicroblogsEntryId, int socialRelationType,
@@ -130,7 +130,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry deleteMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -159,7 +159,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry getMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -188,7 +188,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry updateMicroblogsEntry(
 		long microblogsEntryId, java.lang.String content,
 		int socialRelationType,
@@ -228,7 +228,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (com.liferay.microblogs.model.MicroblogsEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -256,7 +256,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(java.lang.String assetTagName)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -285,7 +285,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long microblogsEntryUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -314,7 +314,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long microblogsEntryUserId,
 		int type) throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -343,14 +343,14 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -373,7 +373,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -402,7 +402,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		java.lang.String assetTagName, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -438,7 +438,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long microblogsEntryUserId, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -468,7 +468,7 @@ public class MicroblogsEntryServiceClp implements MicroblogsEntryService {
 		return (java.util.List<com.liferay.microblogs.model.MicroblogsEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long microblogsEntryUserId, int type, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceUtil.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceUtil.java
index 20215e9f231..981b1062b91 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceUtil.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceWrapper.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceWrapper.java
index db21ddf4ab6..d67e6fa099b 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceWrapper.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/MicroblogsEntryServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service;
@@ -33,7 +33,7 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 		_microblogsEntryService = microblogsEntryService;
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry addMicroblogsEntry(
 		long userId, java.lang.String content, int type,
 		long parentMicroblogsEntryId, int socialRelationType,
@@ -43,21 +43,21 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 			type, parentMicroblogsEntryId, socialRelationType, serviceContext);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry deleteMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.deleteMicroblogsEntry(microblogsEntryId);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry getMicroblogsEntry(
 		long microblogsEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.getMicroblogsEntry(microblogsEntryId);
 	}
 
-	@Override
+
 	public com.liferay.microblogs.model.MicroblogsEntry updateMicroblogsEntry(
 		long microblogsEntryId, java.lang.String content,
 		int socialRelationType,
@@ -67,32 +67,32 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 			content, socialRelationType, serviceContext);
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.getMicroblogsEntriesCount();
 	}
 
-	@Override
+
 	public int getMicroblogsEntriesCount(java.lang.String assetTagName)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.getMicroblogsEntriesCount(assetTagName);
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long microblogsEntryUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.getUserMicroblogsEntriesCount(microblogsEntryUserId);
 	}
 
-	@Override
+
 	public int getUserMicroblogsEntriesCount(long microblogsEntryUserId,
 		int type) throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.getUserMicroblogsEntriesCount(microblogsEntryUserId,
 			type);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -105,19 +105,19 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _microblogsEntryService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _microblogsEntryService.getMicroblogsEntries(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getMicroblogsEntries(
 		java.lang.String assetTagName, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -125,7 +125,7 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 			start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long microblogsEntryUserId, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -133,7 +133,7 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 			start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.microblogs.model.MicroblogsEntry> getUserMicroblogsEntries(
 		long microblogsEntryUserId, int type, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -141,12 +141,12 @@ public class MicroblogsEntryServiceWrapper implements MicroblogsEntryService,
 			type, start, end);
 	}
 
-	@Override
+
 	public MicroblogsEntryService getWrappedService() {
 		return _microblogsEntryService;
 	}
 
-	@Override
+
 	public void setWrappedService(MicroblogsEntryService microblogsEntryService) {
 		_microblogsEntryService = microblogsEntryService;
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/messaging/ClpMessageListener.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/messaging/ClpMessageListener.java
index 293caadf50c..24d0b052a5e 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/messaging/ClpMessageListener.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.messaging;
@@ -32,7 +32,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsEntryPermission.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsEntryPermission.java
index 5566f6944e3..6f9f6488a16 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsEntryPermission.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsEntryPermission.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.service.permission;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsPermission.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsPermission.java
index 9116c9f20d6..ee92f1b62df 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsPermission.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/permission/MicroblogsPermission.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.service.permission;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinder.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinder.java
index 9d9f44616a8..018bd38b0b4 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinder.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.persistence;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinderUtil.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinderUtil.java
index 2fdb0dd438f..2904f4581b4 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinderUtil.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.persistence;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryPersistence.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryPersistence.java
index c3a1eff0d4d..81dcc3548c7 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryPersistence.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.persistence;
@@ -2112,7 +2112,7 @@ public interface MicroblogsEntryPersistence extends BasePersistence<MicroblogsEn
 	*/
 	public MicroblogsEntry fetchByPrimaryKey(long microblogsEntryId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, MicroblogsEntry> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -2180,6 +2180,6 @@ public interface MicroblogsEntryPersistence extends BasePersistence<MicroblogsEn
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryUtil.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryUtil.java
index 713ddb8e632..6432b25c9f2 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryUtil.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/service/persistence/MicroblogsEntryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.persistence;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/util/MicroblogsUtil.java b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/util/MicroblogsUtil.java
index 3b5da002d09..e1fbddd2f04 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/util/MicroblogsUtil.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/service/com/liferay/microblogs/util/MicroblogsUtil.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.util;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_0.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_0.java
index 6baa0ebdb6a..e9028240693 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_0.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_0.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade;
 
 import com.liferay.microblogs.hook.upgrade.v1_0_0.UpgradeMicroblogsEntry;
@@ -25,12 +26,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 100;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradeMicroblogsEntry.class);
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_1.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_1.java
index 02ad8ec9dbd..f0a76df6391 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_1.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_1.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade;
 
 import com.liferay.microblogs.hook.upgrade.v1_0_1.UpgradeUserNotificationEvent;
@@ -25,12 +26,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_1 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 101;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradeUserNotificationEvent.class);
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_2.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_2.java
index 6aaca92ad83..42877cb71c0 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_2.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/UpgradeProcess_1_0_2.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade;
 
 import com.liferay.microblogs.hook.upgrade.v1_0_2.UpgradeMicroblogsEntry;
@@ -26,12 +27,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_2 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 102;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradeMicroblogsEntry.class);
 		upgrade(UpgradeSocial.class);
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_0/UpgradeMicroblogsEntry.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_0/UpgradeMicroblogsEntry.java
index 832a4ad7c5f..08a416b6343 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_0/UpgradeMicroblogsEntry.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_0/UpgradeMicroblogsEntry.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade.v1_0_0;
 
 import com.liferay.portal.kernel.model.User;
@@ -26,7 +27,7 @@ import com.liferay.portal.kernel.util.PortalUtil;
  */
 public class UpgradeMicroblogsEntry extends UpgradeProcess {
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		updateMicroBlogsEntry();
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_1/UpgradeUserNotificationEvent.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_1/UpgradeUserNotificationEvent.java
index 7a8823d7a7b..ef6592f24c2 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_1/UpgradeUserNotificationEvent.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_1/UpgradeUserNotificationEvent.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade.v1_0_1;
 
 import com.liferay.microblogs.model.MicroblogsEntryConstants;
@@ -32,7 +33,7 @@ import java.sql.ResultSet;
  */
 public class UpgradeUserNotificationEvent extends UpgradeProcess {
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgradeNotifications();
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeMicroblogsEntry.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeMicroblogsEntry.java
index 9afff988128..22dcebcae9b 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeMicroblogsEntry.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeMicroblogsEntry.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade.v1_0_2;
 
 import com.liferay.portal.kernel.upgrade.UpgradeProcess;
@@ -24,7 +25,7 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeMicroblogsEntry extends UpgradeProcess {
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		removeReceiverUserId();
 		renameReceiverMicroblogsEntryId();
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeSocial.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeSocial.java
index d1f7a6d5b52..db5276f3674 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeSocial.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/hook/upgrade/v1_0_2/UpgradeSocial.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.hook.upgrade.v1_0_2;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
@@ -33,7 +34,7 @@ import java.sql.ResultSet;
  */
 public class UpgradeSocial extends UpgradeProcess {
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgradeMicroblogActivities();
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRenderer.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRenderer.java
index ff8d7048d6a..d20690c2447 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRenderer.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRenderer.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.microblogs.asset;
 
 import com.liferay.asset.kernel.model.BaseJSPAssetRenderer;
@@ -51,22 +52,22 @@ public class MicroblogsEntryAssetRenderer
 		_entry = entry;
 	}
 
-	@Override
+
 	public MicroblogsEntry getAssetObject() {
 		return _entry;
 	}
 
-	@Override
+
 	public String getClassName() {
 		return MicroblogsEntry.class.getName();
 	}
 
-	@Override
+
 	public long getClassPK() {
 		return _entry.getMicroblogsEntryId();
 	}
 
-	@Override
+
 	public long getGroupId() {
 		try {
 			Group group = GroupLocalServiceUtil.getCompanyGroup(
@@ -80,7 +81,7 @@ public class MicroblogsEntryAssetRenderer
 		return 0;
 	}
 
-	@Override
+
 	public String getJspPath(HttpServletRequest request, String template) {
 		if (template.equals(TEMPLATE_ABSTRACT) ||
 			template.equals(TEMPLATE_FULL_CONTENT)) {
@@ -92,19 +93,19 @@ public class MicroblogsEntryAssetRenderer
 		}
 	}
 
-	@Override
+
 	public String getSummary(
 		PortletRequest portletRequest, PortletResponse portletResponse) {
 
 		return _entry.getContent();
 	}
 
-	@Override
+
 	public String getTitle(Locale locale) {
 		return _entry.getContent();
 	}
 
-	@Override
+
 	public String getURLViewInContext(
 		LiferayPortletRequest liferayPortletRequest,
 		LiferayPortletResponse liferayPortletResponse,
@@ -143,22 +144,22 @@ public class MicroblogsEntryAssetRenderer
 		return null;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _entry.getUserId();
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _entry.getUserName();
 	}
 
-	@Override
+
 	public String getUuid() {
 		return null;
 	}
 
-	@Override
+
 	public boolean hasViewPermission(PermissionChecker permissionChecker) {
 		try {
 			return MicroblogsEntryPermission.contains(
@@ -170,7 +171,7 @@ public class MicroblogsEntryAssetRenderer
 		return false;
 	}
 
-	@Override
+
 	public boolean include(
 			HttpServletRequest request, HttpServletResponse response,
 			String template)
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRendererFactory.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRendererFactory.java
index ba6717c20db..e459977bfe5 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRendererFactory.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/asset/MicroblogsEntryAssetRendererFactory.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.microblogs.asset;
 
 import com.liferay.asset.kernel.model.AssetRenderer;
@@ -35,7 +36,7 @@ public class MicroblogsEntryAssetRendererFactory
 
 	public static final String TYPE = "microblogs";
 
-	@Override
+
 	public AssetRenderer<MicroblogsEntry> getAssetRenderer(
 			long classPK, int type)
 		throws PortalException {
@@ -46,22 +47,22 @@ public class MicroblogsEntryAssetRendererFactory
 		return new MicroblogsEntryAssetRenderer(microblogsEntry);
 	}
 
-	@Override
+
 	public String getClassName() {
 		return CLASS_NAME;
 	}
 
-	@Override
+
 	public String getIconCssClass() {
 		return "icon-comment";
 	}
 
-	@Override
+
 	public String getType() {
 		return TYPE;
 	}
 
-	@Override
+
 	public boolean hasPermission(
 			PermissionChecker permissionChecker, long classPK, String actionId)
 		throws Exception {
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/notifications/MicroblogsUserNotificationHandler.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/notifications/MicroblogsUserNotificationHandler.java
index 571a07f2bb7..776414c9ef0 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/notifications/MicroblogsUserNotificationHandler.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/notifications/MicroblogsUserNotificationHandler.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.microblogs.notifications;
 
 import com.liferay.asset.kernel.model.AssetRenderer;
@@ -41,7 +42,7 @@ public class MicroblogsUserNotificationHandler
 		setPortletId(PortletKeys.MICROBLOGS);
 	}
 
-	@Override
+
 	protected String getTitle(
 		JSONObject jsonObject, AssetRenderer assetRenderer,
 		ServiceContext serviceContext) {
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/portlet/MicroblogsPortlet.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/portlet/MicroblogsPortlet.java
index 1097ff4dca0..95032bed681 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/portlet/MicroblogsPortlet.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/portlet/MicroblogsPortlet.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.microblogs.portlet;
 
 import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityInterpreter.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityInterpreter.java
index 4e673806268..af03fe15854 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityInterpreter.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityInterpreter.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.microblogs.social;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
@@ -38,31 +39,31 @@ import com.liferay.social.kernel.model.SocialActivity;
 public class MicroblogsActivityInterpreter
 	extends BaseSocialActivityInterpreter {
 
-	@Override
+
 	public String[] getClassNames() {
 		return _CLASS_NAMES;
 	}
 
-	@Override
+
 	protected String getBody(
 		SocialActivity activity, ServiceContext serviceContext) {
 
 		return getUserName(activity.getUserId(), serviceContext);
 	}
 
-	@Override
+
 	protected String getLink(
 		SocialActivity activity, ServiceContext serviceContext) {
 
 		return StringPool.BLANK;
 	}
 
-	@Override
+
 	protected ResourceBundleLoader getResourceBundleLoader() {
 		return _resourceBundleLoader;
 	}
 
-	@Override
+
 	protected String getTitle(
 			SocialActivity activity, ServiceContext serviceContext)
 		throws Exception {
@@ -99,7 +100,7 @@ public class MicroblogsActivityInterpreter
 		return sb.toString();
 	}
 
-	@Override
+
 	protected boolean hasPermissions(
 			PermissionChecker permissionChecker, SocialActivity activity,
 			String actionId, ServiceContext serviceContext)
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityKeys.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityKeys.java
index 43f86911472..42080eeecca 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityKeys.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/microblogs/social/MicroblogsActivityKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.microblogs.social;
 
 /**
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryBaseImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryBaseImpl.java
index 6bee92ab019..f3c667b0717 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryBaseImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model.impl;
@@ -39,7 +39,7 @@ public abstract class MicroblogsEntryBaseImpl extends MicroblogsEntryModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a microblogs entry model instance should use the {@link MicroblogsEntry} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			MicroblogsEntryLocalServiceUtil.addMicroblogsEntry(this);
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryCacheModel.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryCacheModel.java
index c7b10e0a85c..838510c1fdc 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryCacheModel.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class MicroblogsEntryCacheModel implements CacheModel<MicroblogsEntry>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class MicroblogsEntryCacheModel implements CacheModel<MicroblogsEntry>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, microblogsEntryId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(25);
 
@@ -97,7 +97,7 @@ public class MicroblogsEntryCacheModel implements CacheModel<MicroblogsEntry>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public MicroblogsEntry toEntityModel() {
 		MicroblogsEntryImpl microblogsEntryImpl = new MicroblogsEntryImpl();
 
@@ -145,7 +145,7 @@ public class MicroblogsEntryCacheModel implements CacheModel<MicroblogsEntry>,
 		return microblogsEntryImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		microblogsEntryId = objectInput.readLong();
 
@@ -168,7 +168,7 @@ public class MicroblogsEntryCacheModel implements CacheModel<MicroblogsEntry>,
 		socialRelationType = objectInput.readInt();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(microblogsEntryId);
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryImpl.java
index 9aefa1cab82..6bb361bb777 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.model.impl;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryModelImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryModelImpl.java
index bc791204ec7..a4d41b9e4c8 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryModelImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/model/impl/MicroblogsEntryModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.model.impl;
@@ -182,37 +182,37 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	public MicroblogsEntryModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _microblogsEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setMicroblogsEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _microblogsEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return MicroblogsEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return MicroblogsEntry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -235,7 +235,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long microblogsEntryId = (Long)attributes.get("microblogsEntryId");
 
@@ -313,23 +313,23 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getMicroblogsEntryId() {
 		return _microblogsEntryId;
 	}
 
-	@Override
+
 	public void setMicroblogsEntryId(long microblogsEntryId) {
 		_microblogsEntryId = microblogsEntryId;
 	}
 
 	@JSON
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_columnBitmask |= COMPANYID_COLUMN_BITMASK;
 
@@ -347,12 +347,12 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_columnBitmask |= USERID_COLUMN_BITMASK;
 
@@ -365,7 +365,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -377,7 +377,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
@@ -386,7 +386,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -396,18 +396,18 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
 	@JSON
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_columnBitmask = -1L;
 
@@ -423,7 +423,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -432,7 +432,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -440,12 +440,12 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getCreatorClassNameId() {
 		return _creatorClassNameId;
 	}
 
-	@Override
+
 	public void setCreatorClassNameId(long creatorClassNameId) {
 		_columnBitmask |= CREATORCLASSNAMEID_COLUMN_BITMASK;
 
@@ -463,12 +463,12 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getCreatorClassPK() {
 		return _creatorClassPK;
 	}
 
-	@Override
+
 	public void setCreatorClassPK(long creatorClassPK) {
 		_columnBitmask |= CREATORCLASSPK_COLUMN_BITMASK;
 
@@ -486,7 +486,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public String getContent() {
 		if (_content == null) {
 			return StringPool.BLANK;
@@ -496,18 +496,18 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public void setContent(String content) {
 		_content = content;
 	}
 
 	@JSON
-	@Override
+
 	public int getType() {
 		return _type;
 	}
 
-	@Override
+
 	public void setType(int type) {
 		_columnBitmask |= TYPE_COLUMN_BITMASK;
 
@@ -525,12 +525,12 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getParentMicroblogsEntryId() {
 		return _parentMicroblogsEntryId;
 	}
 
-	@Override
+
 	public void setParentMicroblogsEntryId(long parentMicroblogsEntryId) {
 		_columnBitmask |= PARENTMICROBLOGSENTRYID_COLUMN_BITMASK;
 
@@ -548,12 +548,12 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 	}
 
 	@JSON
-	@Override
+
 	public int getSocialRelationType() {
 		return _socialRelationType;
 	}
 
-	@Override
+
 	public void setSocialRelationType(int socialRelationType) {
 		_columnBitmask |= SOCIALRELATIONTYPE_COLUMN_BITMASK;
 
@@ -574,20 +574,20 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			MicroblogsEntry.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public MicroblogsEntry toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (MicroblogsEntry)ProxyUtil.newProxyInstance(_classLoader,
@@ -597,7 +597,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		MicroblogsEntryImpl microblogsEntryImpl = new MicroblogsEntryImpl();
 
@@ -619,7 +619,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return microblogsEntryImpl;
 	}
 
-	@Override
+
 	public int compareTo(MicroblogsEntry microblogsEntry) {
 		int value = 0;
 
@@ -635,7 +635,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -657,22 +657,22 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		MicroblogsEntryModelImpl microblogsEntryModelImpl = this;
 
@@ -711,7 +711,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		microblogsEntryModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<MicroblogsEntry> toCacheModel() {
 		MicroblogsEntryCacheModel microblogsEntryCacheModel = new MicroblogsEntryCacheModel();
 
@@ -768,7 +768,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return microblogsEntryCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(25);
 
@@ -801,7 +801,7 @@ public class MicroblogsEntryModelImpl extends BaseModelImpl<MicroblogsEntry>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(40);
 
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceBaseImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceBaseImpl.java
index f7bb52aa71e..eb2d234c424 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceBaseImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.base;
@@ -80,7 +80,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @return the microblogs entry that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public MicroblogsEntry addMicroblogsEntry(MicroblogsEntry microblogsEntry) {
 		microblogsEntry.setNew(true);
 
@@ -93,7 +93,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param microblogsEntryId the primary key for the new microblogs entry
 	 * @return the new microblogs entry
 	 */
-	@Override
+
 	public MicroblogsEntry createMicroblogsEntry(long microblogsEntryId) {
 		return microblogsEntryPersistence.create(microblogsEntryId);
 	}
@@ -106,7 +106,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @throws PortalException if a microblogs entry with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public MicroblogsEntry deleteMicroblogsEntry(long microblogsEntryId)
 		throws PortalException {
 		return microblogsEntryPersistence.remove(microblogsEntryId);
@@ -120,13 +120,13 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @throws PortalException
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public MicroblogsEntry deleteMicroblogsEntry(
 		MicroblogsEntry microblogsEntry) throws PortalException {
 		return microblogsEntryPersistence.remove(microblogsEntry);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -140,7 +140,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return microblogsEntryPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -157,7 +157,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return microblogsEntryPersistence.findWithDynamicQuery(dynamicQuery,
@@ -177,7 +177,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return microblogsEntryPersistence.findWithDynamicQuery(dynamicQuery,
@@ -190,7 +190,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return microblogsEntryPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -202,14 +202,14 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return microblogsEntryPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public MicroblogsEntry fetchMicroblogsEntry(long microblogsEntryId) {
 		return microblogsEntryPersistence.fetchByPrimaryKey(microblogsEntryId);
 	}
@@ -221,13 +221,13 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @return the microblogs entry
 	 * @throws PortalException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry getMicroblogsEntry(long microblogsEntryId)
 		throws PortalException {
 		return microblogsEntryPersistence.findByPrimaryKey(microblogsEntryId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -240,7 +240,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -266,13 +266,13 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return microblogsEntryLocalService.deleteMicroblogsEntry((MicroblogsEntry)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return microblogsEntryPersistence.findByPrimaryKey(primaryKeyObj);
@@ -289,7 +289,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> getMicroblogsEntries(int start, int end) {
 		return microblogsEntryPersistence.findAll(start, end);
 	}
@@ -299,7 +299,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 *
 	 * @return the number of microblogs entries
 	 */
-	@Override
+
 	public int getMicroblogsEntriesCount() {
 		return microblogsEntryPersistence.countAll();
 	}
@@ -311,7 +311,7 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 * @return the microblogs entry that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public MicroblogsEntry updateMicroblogsEntry(
 		MicroblogsEntry microblogsEntry) {
 		return microblogsEntryPersistence.update(microblogsEntry);
@@ -506,12 +506,12 @@ public abstract class MicroblogsEntryLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return MicroblogsEntryLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceClpInvoker.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceClpInvoker.java
index 336d6388ebc..5c4503f8a64 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceClpInvoker.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.base;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceBaseImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceBaseImpl.java
index 7e4df2e53dc..5c131d57290 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceBaseImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.base;
@@ -294,12 +294,12 @@ public abstract class MicroblogsEntryServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return MicroblogsEntryService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceClpInvoker.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceClpInvoker.java
index b238af0c4f2..088185be205 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceClpInvoker.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/base/MicroblogsEntryServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.base;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceHttp.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceHttp.java
index 7a85c142112..f1a81fe5f6b 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceHttp.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.http;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceSoap.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceSoap.java
index e9621bba3ac..19604ac9dce 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceSoap.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/http/MicroblogsEntryServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.http;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryLocalServiceImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryLocalServiceImpl.java
index f9bb8ee5271..506e2a9276a 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryLocalServiceImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryLocalServiceImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.service.impl;
 
 import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil;
@@ -200,7 +201,7 @@ public class MicroblogsEntryLocalServiceImpl
 			creatorClassNameId, creatorClassPK);
 	}
 
-	@Override
+
 	public MicroblogsEntry deleteMicroblogsEntry(long microblogsEntryId)
 		throws PortalException {
 
@@ -210,7 +211,7 @@ public class MicroblogsEntryLocalServiceImpl
 		return deleteMicroblogsEntry(microblogsEntry);
 	}
 
-	@Override
+
 	public MicroblogsEntry deleteMicroblogsEntry(
 			MicroblogsEntry microblogsEntry)
 		throws PortalException {
@@ -324,7 +325,7 @@ public class MicroblogsEntryLocalServiceImpl
 			creatorClassNameId, assetTagName);
 	}
 
-	@Override
+
 	public MicroblogsEntry getMicroblogsEntry(long microblogsEntryId)
 		throws PortalException {
 
@@ -475,7 +476,7 @@ public class MicroblogsEntryLocalServiceImpl
 
 		Callable<Void> callable = new Callable<Void>() {
 
-			@Override
+
 			public Void call() throws Exception {
 				MessageBusUtil.sendMessage(
 					DestinationNames.ASYNC_SERVICE,
@@ -549,7 +550,7 @@ public class MicroblogsEntryLocalServiceImpl
 			_notificationEventJSONObject = notificationEventJSONObject;
 		}
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				sendUserNotifications(
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryServiceImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryServiceImpl.java
index 9a9d86ff281..f76c1fbc8b1 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryServiceImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/impl/MicroblogsEntryServiceImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.service.impl;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderBaseImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderBaseImpl.java
index 2d28d39040a..8ae75fb7104 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderBaseImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.persistence.impl;
@@ -27,7 +27,7 @@ import java.util.Set;
  * @generated
  */
 public class MicroblogsEntryFinderBaseImpl extends BasePersistenceImpl<MicroblogsEntry> {
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return getMicroblogsEntryPersistence().getBadColumnNames();
 	}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderImpl.java
index a9cf8b6f00e..45c9af7d60a 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryFinderImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.service.persistence.impl;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryPersistenceImpl.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryPersistenceImpl.java
index fc9a26a7c4f..e3a35a4506e 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryPersistenceImpl.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/service/persistence/impl/MicroblogsEntryPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.microblogs.service.persistence.impl;
@@ -130,7 +130,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param companyId the company ID
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCompanyId(long companyId) {
 		return findByCompanyId(companyId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -148,7 +148,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCompanyId(long companyId, int start,
 		int end) {
 		return findByCompanyId(companyId, start, end, null);
@@ -167,7 +167,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCompanyId(long companyId, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		return findByCompanyId(companyId, start, end, orderByComparator, true);
@@ -187,7 +187,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCompanyId(long companyId, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -298,7 +298,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCompanyId_First(long companyId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -328,7 +328,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCompanyId_First(long companyId,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		List<MicroblogsEntry> list = findByCompanyId(companyId, 0, 1,
@@ -349,7 +349,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCompanyId_Last(long companyId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -379,7 +379,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCompanyId_Last(long companyId,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		int count = countByCompanyId(companyId);
@@ -407,7 +407,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByCompanyId_PrevAndNext(
 		long microblogsEntryId, long companyId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -551,7 +551,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param companyId the company ID
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCompanyId(long companyId) {
 		return filterFindByCompanyId(companyId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -569,7 +569,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCompanyId(long companyId,
 		int start, int end) {
 		return filterFindByCompanyId(companyId, start, end, null);
@@ -588,7 +588,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCompanyId(long companyId,
 		int start, int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(companyId, 0)) {
@@ -679,7 +679,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByCompanyId_PrevAndNext(
 		long microblogsEntryId, long companyId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -862,7 +862,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 *
 	 * @param companyId the company ID
 	 */
-	@Override
+
 	public void removeByCompanyId(long companyId) {
 		for (MicroblogsEntry microblogsEntry : findByCompanyId(companyId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -876,7 +876,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param companyId the company ID
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByCompanyId(long companyId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_COMPANYID;
 
@@ -927,7 +927,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param companyId the company ID
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByCompanyId(long companyId) {
 		if (!InlineSQLHelperUtil.isEnabled(companyId, 0)) {
 			return countByCompanyId(companyId);
@@ -999,7 +999,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param userId the user ID
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByUserId(long userId) {
 		return findByUserId(userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1016,7 +1016,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByUserId(long userId, int start, int end) {
 		return findByUserId(userId, start, end, null);
 	}
@@ -1034,7 +1034,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByUserId(long userId, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		return findByUserId(userId, start, end, orderByComparator, true);
@@ -1054,7 +1054,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByUserId(long userId, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1165,7 +1165,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByUserId_First(long userId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -1195,7 +1195,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByUserId_First(long userId,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		List<MicroblogsEntry> list = findByUserId(userId, 0, 1,
@@ -1216,7 +1216,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByUserId_Last(long userId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -1246,7 +1246,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByUserId_Last(long userId,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		int count = countByUserId(userId);
@@ -1274,7 +1274,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByUserId_PrevAndNext(long microblogsEntryId,
 		long userId, OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -1417,7 +1417,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param userId the user ID
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByUserId(long userId) {
 		return filterFindByUserId(userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -1435,7 +1435,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByUserId(long userId, int start,
 		int end) {
 		return filterFindByUserId(userId, start, end, null);
@@ -1454,7 +1454,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByUserId(long userId, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -1545,7 +1545,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByUserId_PrevAndNext(
 		long microblogsEntryId, long userId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -1728,7 +1728,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 *
 	 * @param userId the user ID
 	 */
-	@Override
+
 	public void removeByUserId(long userId) {
 		for (MicroblogsEntry microblogsEntry : findByUserId(userId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1742,7 +1742,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param userId the user ID
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByUserId(long userId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_USERID;
 
@@ -1793,7 +1793,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param userId the user ID
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByUserId(long userId) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
 			return countByUserId(userId);
@@ -1866,7 +1866,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_T(long userId, int type) {
 		return findByU_T(userId, type, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -1885,7 +1885,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_T(long userId, int type, int start,
 		int end) {
 		return findByU_T(userId, type, start, end, null);
@@ -1905,7 +1905,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_T(long userId, int type, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		return findByU_T(userId, type, start, end, orderByComparator, true);
@@ -1926,7 +1926,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_T(long userId, int type, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2047,7 +2047,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByU_T_First(long userId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -2081,7 +2081,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByU_T_First(long userId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		List<MicroblogsEntry> list = findByU_T(userId, type, 0, 1,
@@ -2103,7 +2103,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByU_T_Last(long userId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -2137,7 +2137,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByU_T_Last(long userId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		int count = countByU_T(userId, type);
@@ -2166,7 +2166,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByU_T_PrevAndNext(long microblogsEntryId,
 		long userId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -2315,7 +2315,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByU_T(long userId, int type) {
 		return filterFindByU_T(userId, type, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -2334,7 +2334,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByU_T(long userId, int type,
 		int start, int end) {
 		return filterFindByU_T(userId, type, start, end, null);
@@ -2354,7 +2354,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByU_T(long userId, int type,
 		int start, int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -2450,7 +2450,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByU_T_PrevAndNext(
 		long microblogsEntryId, long userId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -2638,7 +2638,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param userId the user ID
 	 * @param type the type
 	 */
-	@Override
+
 	public void removeByU_T(long userId, int type) {
 		for (MicroblogsEntry microblogsEntry : findByU_T(userId, type,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -2653,7 +2653,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByU_T(long userId, int type) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_U_T;
 
@@ -2709,7 +2709,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByU_T(long userId, int type) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
 			return countByU_T(userId, type);
@@ -2795,7 +2795,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPK the creator class p k
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long creatorClassPK) {
 		return findByCCNI_CCPK(creatorClassNameId, creatorClassPK,
@@ -2815,7 +2815,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long creatorClassPK, int start, int end) {
 		return findByCCNI_CCPK(creatorClassNameId, creatorClassPK, start, end,
@@ -2836,7 +2836,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long creatorClassPK, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -2859,7 +2859,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long creatorClassPK, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -2981,7 +2981,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCCNI_CCPK_First(long creatorClassNameId,
 		long creatorClassPK,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -3016,7 +3016,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCCNI_CCPK_First(long creatorClassNameId,
 		long creatorClassPK,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -3039,7 +3039,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCCNI_CCPK_Last(long creatorClassNameId,
 		long creatorClassPK,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -3074,7 +3074,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCCNI_CCPK_Last(long creatorClassNameId,
 		long creatorClassPK,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -3104,7 +3104,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByCCNI_CCPK_PrevAndNext(
 		long microblogsEntryId, long creatorClassNameId, long creatorClassPK,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -3254,7 +3254,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPK the creator class p k
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK(
 		long creatorClassNameId, long creatorClassPK) {
 		return filterFindByCCNI_CCPK(creatorClassNameId, creatorClassPK,
@@ -3274,7 +3274,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK(
 		long creatorClassNameId, long creatorClassPK, int start, int end) {
 		return filterFindByCCNI_CCPK(creatorClassNameId, creatorClassPK, start,
@@ -3295,7 +3295,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK(
 		long creatorClassNameId, long creatorClassPK, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -3393,7 +3393,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByCCNI_CCPK_PrevAndNext(
 		long microblogsEntryId, long creatorClassNameId, long creatorClassPK,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -3585,7 +3585,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPKs the creator class p ks
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK(
 		long creatorClassNameId, long[] creatorClassPKs) {
 		return filterFindByCCNI_CCPK(creatorClassNameId, creatorClassPKs,
@@ -3605,7 +3605,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK(
 		long creatorClassNameId, long[] creatorClassPKs, int start, int end) {
 		return filterFindByCCNI_CCPK(creatorClassNameId, creatorClassPKs,
@@ -3626,7 +3626,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK(
 		long creatorClassNameId, long[] creatorClassPKs, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -3737,7 +3737,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPKs the creator class p ks
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long[] creatorClassPKs) {
 		return findByCCNI_CCPK(creatorClassNameId, creatorClassPKs,
@@ -3757,7 +3757,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long[] creatorClassPKs, int start, int end) {
 		return findByCCNI_CCPK(creatorClassNameId, creatorClassPKs, start, end,
@@ -3778,7 +3778,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long[] creatorClassPKs, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -3801,7 +3801,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK(long creatorClassNameId,
 		long[] creatorClassPKs, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -3939,7 +3939,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassNameId the creator class name ID
 	 * @param creatorClassPK the creator class p k
 	 */
-	@Override
+
 	public void removeByCCNI_CCPK(long creatorClassNameId, long creatorClassPK) {
 		for (MicroblogsEntry microblogsEntry : findByCCNI_CCPK(
 				creatorClassNameId, creatorClassPK, QueryUtil.ALL_POS,
@@ -3955,7 +3955,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPK the creator class p k
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByCCNI_CCPK(long creatorClassNameId, long creatorClassPK) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_CCNI_CCPK;
 
@@ -4011,7 +4011,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPKs the creator class p ks
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByCCNI_CCPK(long creatorClassNameId, long[] creatorClassPKs) {
 		if (creatorClassPKs == null) {
 			creatorClassPKs = new long[0];
@@ -4090,7 +4090,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPK the creator class p k
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByCCNI_CCPK(long creatorClassNameId,
 		long creatorClassPK) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -4144,7 +4144,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPKs the creator class p ks
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByCCNI_CCPK(long creatorClassNameId,
 		long[] creatorClassPKs) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -4245,7 +4245,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_T(long creatorClassNameId, int type) {
 		return findByCCNI_T(creatorClassNameId, type, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -4264,7 +4264,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_T(long creatorClassNameId,
 		int type, int start, int end) {
 		return findByCCNI_T(creatorClassNameId, type, start, end, null);
@@ -4284,7 +4284,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_T(long creatorClassNameId,
 		int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -4307,7 +4307,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_T(long creatorClassNameId,
 		int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -4429,7 +4429,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCCNI_T_First(long creatorClassNameId,
 		int type, OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -4463,7 +4463,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCCNI_T_First(long creatorClassNameId,
 		int type, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		List<MicroblogsEntry> list = findByCCNI_T(creatorClassNameId, type, 0,
@@ -4485,7 +4485,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCCNI_T_Last(long creatorClassNameId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -4519,7 +4519,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCCNI_T_Last(long creatorClassNameId,
 		int type, OrderByComparator<MicroblogsEntry> orderByComparator) {
 		int count = countByCCNI_T(creatorClassNameId, type);
@@ -4548,7 +4548,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByCCNI_T_PrevAndNext(long microblogsEntryId,
 		long creatorClassNameId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -4697,7 +4697,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_T(long creatorClassNameId,
 		int type) {
 		return filterFindByCCNI_T(creatorClassNameId, type, QueryUtil.ALL_POS,
@@ -4717,7 +4717,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_T(long creatorClassNameId,
 		int type, int start, int end) {
 		return filterFindByCCNI_T(creatorClassNameId, type, start, end, null);
@@ -4737,7 +4737,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_T(long creatorClassNameId,
 		int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -4835,7 +4835,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByCCNI_T_PrevAndNext(
 		long microblogsEntryId, long creatorClassNameId, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -5023,7 +5023,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassNameId the creator class name ID
 	 * @param type the type
 	 */
-	@Override
+
 	public void removeByCCNI_T(long creatorClassNameId, int type) {
 		for (MicroblogsEntry microblogsEntry : findByCCNI_T(
 				creatorClassNameId, type, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
@@ -5039,7 +5039,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByCCNI_T(long creatorClassNameId, int type) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_CCNI_T;
 
@@ -5095,7 +5095,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByCCNI_T(long creatorClassNameId, int type) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
 			return countByCCNI_T(creatorClassNameId, type);
@@ -5174,7 +5174,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param parentMicroblogsEntryId the parent microblogs entry ID
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByT_P(int type,
 		long parentMicroblogsEntryId) {
 		return findByT_P(type, parentMicroblogsEntryId, QueryUtil.ALL_POS,
@@ -5194,7 +5194,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByT_P(int type,
 		long parentMicroblogsEntryId, int start, int end) {
 		return findByT_P(type, parentMicroblogsEntryId, start, end, null);
@@ -5214,7 +5214,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByT_P(int type,
 		long parentMicroblogsEntryId, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -5237,7 +5237,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByT_P(int type,
 		long parentMicroblogsEntryId, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -5359,7 +5359,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByT_P_First(int type,
 		long parentMicroblogsEntryId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -5394,7 +5394,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByT_P_First(int type,
 		long parentMicroblogsEntryId,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -5417,7 +5417,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByT_P_Last(int type,
 		long parentMicroblogsEntryId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -5452,7 +5452,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByT_P_Last(int type,
 		long parentMicroblogsEntryId,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -5482,7 +5482,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByT_P_PrevAndNext(long microblogsEntryId,
 		int type, long parentMicroblogsEntryId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -5632,7 +5632,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param parentMicroblogsEntryId the parent microblogs entry ID
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByT_P(int type,
 		long parentMicroblogsEntryId) {
 		return filterFindByT_P(type, parentMicroblogsEntryId,
@@ -5652,7 +5652,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByT_P(int type,
 		long parentMicroblogsEntryId, int start, int end) {
 		return filterFindByT_P(type, parentMicroblogsEntryId, start, end, null);
@@ -5672,7 +5672,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByT_P(int type,
 		long parentMicroblogsEntryId, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -5770,7 +5770,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByT_P_PrevAndNext(
 		long microblogsEntryId, int type, long parentMicroblogsEntryId,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -5959,7 +5959,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @param parentMicroblogsEntryId the parent microblogs entry ID
 	 */
-	@Override
+
 	public void removeByT_P(int type, long parentMicroblogsEntryId) {
 		for (MicroblogsEntry microblogsEntry : findByT_P(type,
 				parentMicroblogsEntryId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
@@ -5975,7 +5975,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param parentMicroblogsEntryId the parent microblogs entry ID
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByT_P(int type, long parentMicroblogsEntryId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_T_P;
 
@@ -6031,7 +6031,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param parentMicroblogsEntryId the parent microblogs entry ID
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByT_P(int type, long parentMicroblogsEntryId) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
 			return countByT_P(type, parentMicroblogsEntryId);
@@ -6129,7 +6129,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long creatorClassPK, int type) {
 		return findByCCNI_CCPK_T(creatorClassNameId, creatorClassPK, type,
@@ -6150,7 +6150,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long creatorClassPK, int type, int start, int end) {
 		return findByCCNI_CCPK_T(creatorClassNameId, creatorClassPK, type,
@@ -6172,7 +6172,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long creatorClassPK, int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -6196,7 +6196,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long creatorClassPK, int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -6324,7 +6324,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCCNI_CCPK_T_First(long creatorClassNameId,
 		long creatorClassPK, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -6363,7 +6363,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCCNI_CCPK_T_First(long creatorClassNameId,
 		long creatorClassPK, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -6387,7 +6387,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByCCNI_CCPK_T_Last(long creatorClassNameId,
 		long creatorClassPK, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -6426,7 +6426,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByCCNI_CCPK_T_Last(long creatorClassNameId,
 		long creatorClassPK, int type,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -6457,7 +6457,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByCCNI_CCPK_T_PrevAndNext(
 		long microblogsEntryId, long creatorClassNameId, long creatorClassPK,
 		int type, OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -6614,7 +6614,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK_T(
 		long creatorClassNameId, long creatorClassPK, int type) {
 		return filterFindByCCNI_CCPK_T(creatorClassNameId, creatorClassPK,
@@ -6635,7 +6635,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK_T(
 		long creatorClassNameId, long creatorClassPK, int type, int start,
 		int end) {
@@ -6658,7 +6658,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK_T(
 		long creatorClassNameId, long creatorClassPK, int type, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -6761,7 +6761,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByCCNI_CCPK_T_PrevAndNext(
 		long microblogsEntryId, long creatorClassNameId, long creatorClassPK,
 		int type, OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -6958,7 +6958,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK_T(
 		long creatorClassNameId, long[] creatorClassPKs, int type) {
 		return filterFindByCCNI_CCPK_T(creatorClassNameId, creatorClassPKs,
@@ -6979,7 +6979,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK_T(
 		long creatorClassNameId, long[] creatorClassPKs, int type, int start,
 		int end) {
@@ -7002,7 +7002,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByCCNI_CCPK_T(
 		long creatorClassNameId, long[] creatorClassPKs, int type, int start,
 		int end, OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -7120,7 +7120,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long[] creatorClassPKs, int type) {
 		return findByCCNI_CCPK_T(creatorClassNameId, creatorClassPKs, type,
@@ -7141,7 +7141,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long[] creatorClassPKs, int type, int start, int end) {
 		return findByCCNI_CCPK_T(creatorClassNameId, creatorClassPKs, type,
@@ -7163,7 +7163,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long[] creatorClassPKs, int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -7187,7 +7187,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByCCNI_CCPK_T(long creatorClassNameId,
 		long[] creatorClassPKs, int type, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -7333,7 +7333,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param creatorClassPK the creator class p k
 	 * @param type the type
 	 */
-	@Override
+
 	public void removeByCCNI_CCPK_T(long creatorClassNameId,
 		long creatorClassPK, int type) {
 		for (MicroblogsEntry microblogsEntry : findByCCNI_CCPK_T(
@@ -7351,7 +7351,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByCCNI_CCPK_T(long creatorClassNameId, long creatorClassPK,
 		int type) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_CCNI_CCPK_T;
@@ -7415,7 +7415,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByCCNI_CCPK_T(long creatorClassNameId,
 		long[] creatorClassPKs, int type) {
 		if (creatorClassPKs == null) {
@@ -7502,7 +7502,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByCCNI_CCPK_T(long creatorClassNameId,
 		long creatorClassPK, int type) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -7561,7 +7561,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByCCNI_CCPK_T(long creatorClassNameId,
 		long[] creatorClassPKs, int type) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -7680,7 +7680,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param socialRelationType the social relation type
 	 * @return the matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_C_T_S(long userId, Date createDate,
 		int type, int socialRelationType) {
 		return findByU_C_T_S(userId, createDate, type, socialRelationType,
@@ -7702,7 +7702,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_C_T_S(long userId, Date createDate,
 		int type, int socialRelationType, int start, int end) {
 		return findByU_C_T_S(userId, createDate, type, socialRelationType,
@@ -7725,7 +7725,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_C_T_S(long userId, Date createDate,
 		int type, int socialRelationType, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -7750,7 +7750,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findByU_C_T_S(long userId, Date createDate,
 		int type, int socialRelationType, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
@@ -7898,7 +7898,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the first matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByU_C_T_S_First(long userId, Date createDate,
 		int type, int socialRelationType,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -7941,7 +7941,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByU_C_T_S_First(long userId, Date createDate,
 		int type, int socialRelationType,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -7966,7 +7966,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the last matching microblogs entry
 	 * @throws NoSuchEntryException if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByU_C_T_S_Last(long userId, Date createDate,
 		int type, int socialRelationType,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -8009,7 +8009,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching microblogs entry, or <code>null</code> if a matching microblogs entry could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByU_C_T_S_Last(long userId, Date createDate,
 		int type, int socialRelationType,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -8041,7 +8041,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] findByU_C_T_S_PrevAndNext(long microblogsEntryId,
 		long userId, Date createDate, int type, int socialRelationType,
 		OrderByComparator<MicroblogsEntry> orderByComparator)
@@ -8214,7 +8214,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param socialRelationType the social relation type
 	 * @return the matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByU_C_T_S(long userId,
 		Date createDate, int type, int socialRelationType) {
 		return filterFindByU_C_T_S(userId, createDate, type,
@@ -8236,7 +8236,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByU_C_T_S(long userId,
 		Date createDate, int type, int socialRelationType, int start, int end) {
 		return filterFindByU_C_T_S(userId, createDate, type,
@@ -8259,7 +8259,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public List<MicroblogsEntry> filterFindByU_C_T_S(long userId,
 		Date createDate, int type, int socialRelationType, int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
@@ -8378,7 +8378,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the previous, current, and next microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry[] filterFindByU_C_T_S_PrevAndNext(
 		long microblogsEntryId, long userId, Date createDate, int type,
 		int socialRelationType,
@@ -8591,7 +8591,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param type the type
 	 * @param socialRelationType the social relation type
 	 */
-	@Override
+
 	public void removeByU_C_T_S(long userId, Date createDate, int type,
 		int socialRelationType) {
 		for (MicroblogsEntry microblogsEntry : findByU_C_T_S(userId,
@@ -8610,7 +8610,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param socialRelationType the social relation type
 	 * @return the number of matching microblogs entries
 	 */
-	@Override
+
 	public int countByU_C_T_S(long userId, Date createDate, int type,
 		int socialRelationType) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_U_C_T_S;
@@ -8690,7 +8690,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param socialRelationType the social relation type
 	 * @return the number of matching microblogs entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByU_C_T_S(long userId, Date createDate, int type,
 		int socialRelationType) {
 		if (!InlineSQLHelperUtil.isEnabled()) {
@@ -8772,7 +8772,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 *
 	 * @param microblogsEntry the microblogs entry
 	 */
-	@Override
+
 	public void cacheResult(MicroblogsEntry microblogsEntry) {
 		entityCache.putResult(MicroblogsEntryModelImpl.ENTITY_CACHE_ENABLED,
 			MicroblogsEntryImpl.class, microblogsEntry.getPrimaryKey(),
@@ -8786,7 +8786,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 *
 	 * @param microblogsEntries the microblogs entries
 	 */
-	@Override
+
 	public void cacheResult(List<MicroblogsEntry> microblogsEntries) {
 		for (MicroblogsEntry microblogsEntry : microblogsEntries) {
 			if (entityCache.getResult(
@@ -8808,7 +8808,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(MicroblogsEntryImpl.class);
 
@@ -8824,7 +8824,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(MicroblogsEntry microblogsEntry) {
 		entityCache.removeResult(MicroblogsEntryModelImpl.ENTITY_CACHE_ENABLED,
 			MicroblogsEntryImpl.class, microblogsEntry.getPrimaryKey());
@@ -8833,7 +8833,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<MicroblogsEntry> microblogsEntries) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -8850,7 +8850,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param microblogsEntryId the primary key for the new microblogs entry
 	 * @return the new microblogs entry
 	 */
-	@Override
+
 	public MicroblogsEntry create(long microblogsEntryId) {
 		MicroblogsEntry microblogsEntry = new MicroblogsEntryImpl();
 
@@ -8869,7 +8869,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the microblogs entry that was removed
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry remove(long microblogsEntryId)
 		throws NoSuchEntryException {
 		return remove((Serializable)microblogsEntryId);
@@ -8882,7 +8882,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the microblogs entry that was removed
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry remove(Serializable primaryKey)
 		throws NoSuchEntryException {
 		Session session = null;
@@ -8915,7 +8915,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 		}
 	}
 
-	@Override
+
 	protected MicroblogsEntry removeImpl(MicroblogsEntry microblogsEntry) {
 		microblogsEntry = toUnwrappedModel(microblogsEntry);
 
@@ -8947,7 +8947,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 		return microblogsEntry;
 	}
 
-	@Override
+
 	public MicroblogsEntry updateImpl(MicroblogsEntry microblogsEntry) {
 		microblogsEntry = toUnwrappedModel(microblogsEntry);
 
@@ -9215,7 +9215,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchEntryException {
 		MicroblogsEntry microblogsEntry = fetchByPrimaryKey(primaryKey);
@@ -9239,7 +9239,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @return the microblogs entry
 	 * @throws NoSuchEntryException if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry findByPrimaryKey(long microblogsEntryId)
 		throws NoSuchEntryException {
 		return findByPrimaryKey((Serializable)microblogsEntryId);
@@ -9251,7 +9251,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param primaryKey the primary key of the microblogs entry
 	 * @return the microblogs entry, or <code>null</code> if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByPrimaryKey(Serializable primaryKey) {
 		MicroblogsEntry microblogsEntry = (MicroblogsEntry)entityCache.getResult(MicroblogsEntryModelImpl.ENTITY_CACHE_ENABLED,
 				MicroblogsEntryImpl.class, primaryKey);
@@ -9298,12 +9298,12 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param microblogsEntryId the primary key of the microblogs entry
 	 * @return the microblogs entry, or <code>null</code> if a microblogs entry with the primary key could not be found
 	 */
-	@Override
+
 	public MicroblogsEntry fetchByPrimaryKey(long microblogsEntryId) {
 		return fetchByPrimaryKey((Serializable)microblogsEntryId);
 	}
 
-	@Override
+
 	public Map<Serializable, MicroblogsEntry> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -9400,7 +9400,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 *
 	 * @return the microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -9416,7 +9416,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param end the upper bound of the range of microblogs entries (not inclusive)
 	 * @return the range of microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -9433,7 +9433,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findAll(int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -9452,7 +9452,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of microblogs entries
 	 */
-	@Override
+
 	public List<MicroblogsEntry> findAll(int start, int end,
 		OrderByComparator<MicroblogsEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -9542,7 +9542,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 * Removes all the microblogs entries from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (MicroblogsEntry microblogsEntry : findAll()) {
 			remove(microblogsEntry);
@@ -9554,7 +9554,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 	 *
 	 * @return the number of microblogs entries
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -9586,12 +9586,12 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return MicroblogsEntryModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -9636,12 +9636,12 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 				"type"
 			});
 	private static final MicroblogsEntry _nullMicroblogsEntry = new MicroblogsEntryImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<MicroblogsEntry> toCacheModel() {
 				return _nullMicroblogsEntryCacheModel;
 			}
@@ -9649,7 +9649,7 @@ public class MicroblogsEntryPersistenceImpl extends BasePersistenceImpl<Microblo
 
 	private static final CacheModel<MicroblogsEntry> _nullMicroblogsEntryCacheModel =
 		new CacheModel<MicroblogsEntry>() {
-			@Override
+
 			public MicroblogsEntry toEntityModel() {
 				return _nullMicroblogsEntry;
 			}
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/WebKeys.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/WebKeys.java
index 70c799ae557..039c589bab0 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/WebKeys.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/WebKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.util;
 
 /**
diff --git a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/comparator/EntryCreateDateComparator.java b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/comparator/EntryCreateDateComparator.java
index e1553f1bb0f..484b8ddc2bc 100644
--- a/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/comparator/EntryCreateDateComparator.java
+++ b/portlets/microblogs-portlet/docroot/WEB-INF/src/com/liferay/microblogs/util/comparator/EntryCreateDateComparator.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.util.comparator;
 
 import com.liferay.microblogs.model.MicroblogsEntry;
@@ -41,7 +42,7 @@ public class EntryCreateDateComparator
 		_ascending = ascending;
 	}
 
-	@Override
+
 	public int compare(
 		MicroblogsEntry microblogsEntry1, MicroblogsEntry microblogsEntry2) {
 
@@ -56,7 +57,7 @@ public class EntryCreateDateComparator
 		}
 	}
 
-	@Override
+
 	public String getOrderBy() {
 		if (_ascending) {
 			return ORDER_BY_ASC;
@@ -66,12 +67,12 @@ public class EntryCreateDateComparator
 		}
 	}
 
-	@Override
+
 	public String[] getOrderByFields() {
 		return ORDER_BY_FIELDS;
 	}
 
-	@Override
+
 	public boolean isAscending() {
 		return _ascending;
 	}
diff --git a/portlets/microblogs-portlet/docroot/init.jsp b/portlets/microblogs-portlet/docroot/init.jsp
index 1c1ed5258b8..b15cdb1d91a 100644
--- a/portlets/microblogs-portlet/docroot/init.jsp
+++ b/portlets/microblogs-portlet/docroot/init.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
diff --git a/portlets/microblogs-portlet/docroot/microblogs/asset/abstract.jsp b/portlets/microblogs-portlet/docroot/microblogs/asset/abstract.jsp
index 67434c2727d..465abc0be09 100644
--- a/portlets/microblogs-portlet/docroot/microblogs/asset/abstract.jsp
+++ b/portlets/microblogs-portlet/docroot/microblogs/asset/abstract.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/microblogs/asset/full_content.jsp b/portlets/microblogs-portlet/docroot/microblogs/asset/full_content.jsp
index 67434c2727d..465abc0be09 100644
--- a/portlets/microblogs-portlet/docroot/microblogs/asset/full_content.jsp
+++ b/portlets/microblogs-portlet/docroot/microblogs/asset/full_content.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/microblogs/edit_microblogs_entry.jsp b/portlets/microblogs-portlet/docroot/microblogs/edit_microblogs_entry.jsp
index 459ec1864db..8f273998e2d 100644
--- a/portlets/microblogs-portlet/docroot/microblogs/edit_microblogs_entry.jsp
+++ b/portlets/microblogs-portlet/docroot/microblogs/edit_microblogs_entry.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/microblogs/view.jsp b/portlets/microblogs-portlet/docroot/microblogs/view.jsp
index 111405526e3..29f63488f69 100644
--- a/portlets/microblogs-portlet/docroot/microblogs/view.jsp
+++ b/portlets/microblogs-portlet/docroot/microblogs/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/microblogs/view_comments.jsp b/portlets/microblogs-portlet/docroot/microblogs/view_comments.jsp
index 7e8a525a566..4a7fa5e1535 100644
--- a/portlets/microblogs-portlet/docroot/microblogs/view_comments.jsp
+++ b/portlets/microblogs-portlet/docroot/microblogs/view_comments.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/microblogs/view_microblogs_entries.jsp b/portlets/microblogs-portlet/docroot/microblogs/view_microblogs_entries.jsp
index cada7048e62..c1d78bdb2a3 100644
--- a/portlets/microblogs-portlet/docroot/microblogs/view_microblogs_entries.jsp
+++ b/portlets/microblogs-portlet/docroot/microblogs/view_microblogs_entries.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/status_update/configuration.jsp b/portlets/microblogs-portlet/docroot/status_update/configuration.jsp
index 344db791d4b..c630d912572 100644
--- a/portlets/microblogs-portlet/docroot/status_update/configuration.jsp
+++ b/portlets/microblogs-portlet/docroot/status_update/configuration.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/microblogs-portlet/docroot/status_update/view.jsp b/portlets/microblogs-portlet/docroot/status_update/view.jsp
index af47a37ae34..bbd99a17869 100644
--- a/portlets/microblogs-portlet/docroot/status_update/view.jsp
+++ b/portlets/microblogs-portlet/docroot/status_update/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/action/ConfigurationActionImpl.java b/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/action/ConfigurationActionImpl.java
index c67bf7da457..c9589828adc 100644
--- a/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/action/ConfigurationActionImpl.java
+++ b/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/action/ConfigurationActionImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.netvibeswidget.action;
@@ -29,7 +29,7 @@ import javax.portlet.PortletConfig;
  */
 public class ConfigurationActionImpl extends DefaultConfigurationAction {
 
-	@Override
+
 	public void processAction(
 			PortletConfig portletConfig, ActionRequest actionRequest,
 			ActionResponse actionResponse)
diff --git a/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/util/NetvibesWidgetUtil.java b/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/util/NetvibesWidgetUtil.java
index 9bf42069620..c6af406b2a9 100644
--- a/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/util/NetvibesWidgetUtil.java
+++ b/portlets/netvibes-widget-portlet/docroot/WEB-INF/src/com/liferay/netvibeswidget/util/NetvibesWidgetUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.netvibeswidget.util;
diff --git a/portlets/netvibes-widget-portlet/docroot/configuration.jsp b/portlets/netvibes-widget-portlet/docroot/configuration.jsp
index d7535347495..9d7a3b2f589 100644
--- a/portlets/netvibes-widget-portlet/docroot/configuration.jsp
+++ b/portlets/netvibes-widget-portlet/docroot/configuration.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/netvibes-widget-portlet/docroot/init.jsp b/portlets/netvibes-widget-portlet/docroot/init.jsp
index 059d63a2cf1..a6f95e33e96 100644
--- a/portlets/netvibes-widget-portlet/docroot/init.jsp
+++ b/portlets/netvibes-widget-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/netvibes-widget-portlet/docroot/view.jsp b/portlets/netvibes-widget-portlet/docroot/view.jsp
index 2ae8fb6e4d5..c1e56b62277 100644
--- a/portlets/netvibes-widget-portlet/docroot/view.jsp
+++ b/portlets/netvibes-widget-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/netvibes-widget-portlet/docroot/widget_search.jsp b/portlets/netvibes-widget-portlet/docroot/widget_search.jsp
index 9af9a87e8a7..dea670e5bc7 100644
--- a/portlets/netvibes-widget-portlet/docroot/widget_search.jsp
+++ b/portlets/netvibes-widget-portlet/docroot/widget_search.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Bible.java b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Bible.java
index d5b458b5b00..43e4a568c0a 100644
--- a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Bible.java
+++ b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Bible.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.randombibleverse.model;
diff --git a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Verse.java b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Verse.java
index 7d7e8865b7b..da26937e44f 100644
--- a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Verse.java
+++ b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/model/Verse.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.randombibleverse.model;
diff --git a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/portlet/RBVPortlet.java b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/portlet/RBVPortlet.java
index 118473f752e..eadf38525ba 100644
--- a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/portlet/RBVPortlet.java
+++ b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/portlet/RBVPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.randombibleverse.portlet;
@@ -34,7 +34,7 @@ import javax.portlet.PortletPreferences;
  */
 public class RBVPortlet extends MVCPortlet {
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/RBVUtil.java b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/RBVUtil.java
index 9d10d64d9cf..301f93b4a7d 100644
--- a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/RBVUtil.java
+++ b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/RBVUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.randombibleverse.util;
diff --git a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/VerseWebCacheItem.java b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/VerseWebCacheItem.java
index 24e3d399915..6c3b5eeeaf0 100644
--- a/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/VerseWebCacheItem.java
+++ b/portlets/random-bible-verse-portlet/docroot/WEB-INF/src/com/liferay/randombibleverse/util/VerseWebCacheItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.randombibleverse.util;
@@ -36,7 +36,7 @@ public class VerseWebCacheItem implements WebCacheItem {
 		_language = language;
 	}
 
-	@Override
+
 	public Object convert(String key) throws WebCacheException {
 		try {
 			Verse verse = null;
@@ -56,7 +56,7 @@ public class VerseWebCacheItem implements WebCacheItem {
 		}
 	}
 
-	@Override
+
 	public long getRefreshTime() {
 		return _REFRESH_TIME;
 	}
diff --git a/portlets/random-bible-verse-portlet/docroot/edit.jsp b/portlets/random-bible-verse-portlet/docroot/edit.jsp
index 79bedb2fd92..825daf5b86c 100644
--- a/portlets/random-bible-verse-portlet/docroot/edit.jsp
+++ b/portlets/random-bible-verse-portlet/docroot/edit.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/random-bible-verse-portlet/docroot/init.jsp b/portlets/random-bible-verse-portlet/docroot/init.jsp
index e4aac643adc..3160bba2cb2 100644
--- a/portlets/random-bible-verse-portlet/docroot/init.jsp
+++ b/portlets/random-bible-verse-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/random-bible-verse-portlet/docroot/view.jsp b/portlets/random-bible-verse-portlet/docroot/view.jsp
index d37dc551dc4..43b3eae0304 100644
--- a/portlets/random-bible-verse-portlet/docroot/view.jsp
+++ b/portlets/random-bible-verse-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/release-tools-portlet/docroot/view.jsp b/portlets/release-tools-portlet/docroot/view.jsp
index e9dd369f8f5..4f1c67b3a79 100644
--- a/portlets/release-tools-portlet/docroot/view.jsp
+++ b/portlets/release-tools-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/ruby-console-portlet/docroot/WEB-INF/src/com/liferay/rubyconsole/portlet/RubyConsolePortlet.java b/portlets/ruby-console-portlet/docroot/WEB-INF/src/com/liferay/rubyconsole/portlet/RubyConsolePortlet.java
index 7fdbbb488ea..86f4e74b19c 100644
--- a/portlets/ruby-console-portlet/docroot/WEB-INF/src/com/liferay/rubyconsole/portlet/RubyConsolePortlet.java
+++ b/portlets/ruby-console-portlet/docroot/WEB-INF/src/com/liferay/rubyconsole/portlet/RubyConsolePortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.rubyconsole.portlet;
@@ -38,11 +38,11 @@ import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  */
 public class RubyConsolePortlet extends RubyPortlet {
 
-	@Override
+
 	public void serveResource(
 			ResourceRequest resourceRequest, ResourceResponse resourceResponse)
 		throws IOException, PortletException {
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/init.jspf b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/init.jspf
index 7bbf073dbc0..6507b6b9aca 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/init.jspf
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/init.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_items_controller.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_items_controller.jsp
index 80ad3bcc05e..683488247c8 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_items_controller.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_items_controller.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_lists_controller.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_lists_controller.jsp
index af55b4b41a8..af05b34a91f 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_lists_controller.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/controllers/todo_lists_controller.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/error.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/error.jsp
index a0507db4e01..00ecec85849 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/error.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/error.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/init.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/init.jsp
index f6ef66871c5..bb6eec22eab 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/init.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/create.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/create.jsp
index 422b7554526..fb5c892e653 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/create.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/create.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/edit.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/edit.jsp
index 720119ae01d..5aa73347a7d 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/edit.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/edit.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/view.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/view.jsp
index d79820851c3..176d1397d47 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/view.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_items/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/create.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/create.jsp
index 626b3544a04..2fe208c3a9a 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/create.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/create.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/edit.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/edit.jsp
index 60da1867e92..df4db4496ec 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/edit.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/edit.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/index.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/index.jsp
index 4308651cbf9..1aaa8f89fbd 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/index.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/index.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/view.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/view.jsp
index bf5f040655e..af406cc578b 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/view.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/sample_alloy_mvc/views/todo_lists/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/init.jsp b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/init.jsp
index b518694f54a..89865aa808c 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/init.jsp
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/portlet_keys.jspf b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/portlet_keys.jspf
index 96e1b7575c3..6dcb4b7497b 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/portlet_keys.jspf
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/portlet_keys.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/todo_item_constants.jspf b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/todo_item_constants.jspf
index 5edb91015c0..076a94389b2 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/todo_item_constants.jspf
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/jsp/util/todo_item_constants.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoItemException.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoItemException.java
index 3251577875e..66b6befa275 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoItemException.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoItemException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.exception;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoListException.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoListException.java
index 640f8c56930..4cecfb91c72 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoListException.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/exception/NoSuchTodoListException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.exception;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItem.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItem.java
index f4a07e1dcb9..826aeb43e94 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItem.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -38,17 +38,17 @@ public interface SAMTodoItem extends SAMTodoItemModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.samplealloymvc.model.impl.SAMTodoItemImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<SAMTodoItem, Long> SAM_TODO_ITEM_ID_ACCESSOR = new Accessor<SAMTodoItem, Long>() {
-			@Override
+
 			public Long get(SAMTodoItem samTodoItem) {
 				return samTodoItem.getSamTodoItemId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<SAMTodoItem> getTypeClass() {
 				return SAMTodoItem.class;
 			}
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemClp.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemClp.java
index 37e7db86536..bd4300a4e21 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemClp.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -47,37 +47,37 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 	public SAMTodoItemClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SAMTodoItem.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SAMTodoItem.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _samTodoItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSamTodoItemId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _samTodoItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -98,7 +98,7 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long samTodoItemId = (Long)attributes.get("samTodoItemId");
 
@@ -164,12 +164,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getSamTodoItemId() {
 		return _samTodoItemId;
 	}
 
-	@Override
+
 	public void setSamTodoItemId(long samTodoItemId) {
 		_samTodoItemId = samTodoItemId;
 
@@ -187,12 +187,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -210,12 +210,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -233,7 +233,7 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -245,16 +245,16 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -272,12 +272,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -295,12 +295,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -318,12 +318,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public long getSamTodoListId() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setSamTodoListId(long samTodoListId) {
 		_samTodoListId = samTodoListId;
 
@@ -341,12 +341,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public String getDescription() {
 		return _description;
 	}
 
-	@Override
+
 	public void setDescription(String description) {
 		_description = description;
 
@@ -364,12 +364,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public int getPriority() {
 		return _priority;
 	}
 
-	@Override
+
 	public void setPriority(int priority) {
 		_priority = priority;
 
@@ -387,12 +387,12 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _status;
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_status = status;
 
@@ -459,7 +459,7 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SAMTodoItemLocalServiceUtil.addSAMTodoItem(this);
@@ -469,13 +469,13 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public SAMTodoItem toEscapedModel() {
 		return (SAMTodoItem)ProxyUtil.newProxyInstance(SAMTodoItem.class.getClassLoader(),
 			new Class[] { SAMTodoItem.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		SAMTodoItemClp clone = new SAMTodoItemClp();
 
@@ -493,7 +493,7 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(SAMTodoItem samTodoItem) {
 		long primaryKey = samTodoItem.getPrimaryKey();
 
@@ -508,7 +508,7 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -534,22 +534,22 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -578,7 +578,7 @@ public class SAMTodoItemClp extends BaseModelImpl<SAMTodoItem>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemModel.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemModel.java
index 79cb81ad473..5880a2a500f 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemModel.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -84,7 +84,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @return the company ID of this s a m todo item
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -92,7 +92,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @param companyId the company ID of this s a m todo item
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -100,7 +100,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @return the user ID of this s a m todo item
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -108,7 +108,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @param userId the user ID of this s a m todo item
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -116,7 +116,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @return the user uuid of this s a m todo item
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -124,7 +124,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @param userUuid the user uuid of this s a m todo item
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -133,7 +133,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 * @return the user name of this s a m todo item
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -141,7 +141,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @param userName the user name of this s a m todo item
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -149,7 +149,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @return the create date of this s a m todo item
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -157,7 +157,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @param createDate the create date of this s a m todo item
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -165,7 +165,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @return the modified date of this s a m todo item
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -173,7 +173,7 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 *
 	 * @param modifiedDate the modified date of this s a m todo item
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -233,60 +233,60 @@ public interface SAMTodoItemModel extends AuditedModel, BaseModel<SAMTodoItem>,
 	 */
 	public void setStatus(int status);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(SAMTodoItem samTodoItem);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<SAMTodoItem> toCacheModel();
 
-	@Override
+
 	public SAMTodoItem toEscapedModel();
 
-	@Override
+
 	public SAMTodoItem toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemSoap.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemSoap.java
index a585644c203..4b051ca8a68 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemSoap.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemWrapper.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemWrapper.java
index b77645d6b0c..cad20bd5141 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemWrapper.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoItemWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -44,17 +44,17 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 		_samTodoItem = samTodoItem;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SAMTodoItem.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SAMTodoItem.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -72,7 +72,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long samTodoItemId = (Long)attributes.get("samTodoItemId");
 
@@ -135,42 +135,42 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 		}
 	}
 
-	@Override
+
 	public SAMTodoItem toEscapedModel() {
 		return new SAMTodoItemWrapper(_samTodoItem.toEscapedModel());
 	}
 
-	@Override
+
 	public SAMTodoItem toUnescapedModel() {
 		return new SAMTodoItemWrapper(_samTodoItem.toUnescapedModel());
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _samTodoItem.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _samTodoItem.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _samTodoItem.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _samTodoItem.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<SAMTodoItem> toCacheModel() {
 		return _samTodoItem.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(SAMTodoItem samTodoItem) {
 		return _samTodoItem.compareTo(samTodoItem);
 	}
@@ -180,7 +180,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the priority of this s a m todo item
 	*/
-	@Override
+
 	public int getPriority() {
 		return _samTodoItem.getPriority();
 	}
@@ -190,22 +190,22 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the status of this s a m todo item
 	*/
-	@Override
+
 	public int getStatus() {
 		return _samTodoItem.getStatus();
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _samTodoItem.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _samTodoItem.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new SAMTodoItemWrapper((SAMTodoItem)_samTodoItem.clone());
 	}
@@ -215,7 +215,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the description of this s a m todo item
 	*/
-	@Override
+
 	public java.lang.String getDescription() {
 		return _samTodoItem.getDescription();
 	}
@@ -225,7 +225,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the user name of this s a m todo item
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _samTodoItem.getUserName();
 	}
@@ -235,17 +235,17 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the user uuid of this s a m todo item
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _samTodoItem.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _samTodoItem.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _samTodoItem.toXmlString();
 	}
@@ -255,7 +255,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the create date of this s a m todo item
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _samTodoItem.getCreateDate();
 	}
@@ -265,7 +265,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the modified date of this s a m todo item
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _samTodoItem.getModifiedDate();
 	}
@@ -275,7 +275,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the company ID of this s a m todo item
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _samTodoItem.getCompanyId();
 	}
@@ -285,7 +285,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the primary key of this s a m todo item
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _samTodoItem.getPrimaryKey();
 	}
@@ -295,7 +295,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the sam todo item ID of this s a m todo item
 	*/
-	@Override
+
 	public long getSamTodoItemId() {
 		return _samTodoItem.getSamTodoItemId();
 	}
@@ -305,7 +305,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the sam todo list ID of this s a m todo item
 	*/
-	@Override
+
 	public long getSamTodoListId() {
 		return _samTodoItem.getSamTodoListId();
 	}
@@ -315,17 +315,17 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @return the user ID of this s a m todo item
 	*/
-	@Override
+
 	public long getUserId() {
 		return _samTodoItem.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_samTodoItem.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_samTodoItem.setCachedModel(cachedModel);
 	}
@@ -335,7 +335,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param companyId the company ID of this s a m todo item
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_samTodoItem.setCompanyId(companyId);
 	}
@@ -345,7 +345,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param createDate the create date of this s a m todo item
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_samTodoItem.setCreateDate(createDate);
 	}
@@ -355,23 +355,23 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param description the description of this s a m todo item
 	*/
-	@Override
+
 	public void setDescription(java.lang.String description) {
 		_samTodoItem.setDescription(description);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_samTodoItem.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_samTodoItem.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_samTodoItem.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -381,12 +381,12 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param modifiedDate the modified date of this s a m todo item
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_samTodoItem.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_samTodoItem.setNew(n);
 	}
@@ -396,12 +396,12 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param primaryKey the primary key of this s a m todo item
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_samTodoItem.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_samTodoItem.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -411,7 +411,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param priority the priority of this s a m todo item
 	*/
-	@Override
+
 	public void setPriority(int priority) {
 		_samTodoItem.setPriority(priority);
 	}
@@ -421,7 +421,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param samTodoItemId the sam todo item ID of this s a m todo item
 	*/
-	@Override
+
 	public void setSamTodoItemId(long samTodoItemId) {
 		_samTodoItem.setSamTodoItemId(samTodoItemId);
 	}
@@ -431,7 +431,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param samTodoListId the sam todo list ID of this s a m todo item
 	*/
-	@Override
+
 	public void setSamTodoListId(long samTodoListId) {
 		_samTodoItem.setSamTodoListId(samTodoListId);
 	}
@@ -441,7 +441,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param status the status of this s a m todo item
 	*/
-	@Override
+
 	public void setStatus(int status) {
 		_samTodoItem.setStatus(status);
 	}
@@ -451,7 +451,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param userId the user ID of this s a m todo item
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_samTodoItem.setUserId(userId);
 	}
@@ -461,7 +461,7 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param userName the user name of this s a m todo item
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_samTodoItem.setUserName(userName);
 	}
@@ -471,12 +471,12 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 	*
 	* @param userUuid the user uuid of this s a m todo item
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_samTodoItem.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -495,22 +495,22 @@ public class SAMTodoItemWrapper implements SAMTodoItem,
 		return false;
 	}
 
-	@Override
+
 	public SAMTodoItem getWrappedModel() {
 		return _samTodoItem;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _samTodoItem.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _samTodoItem.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_samTodoItem.resetOriginalValues();
 	}
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoList.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoList.java
index c672aa5c8bf..11c15dd23a9 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoList.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoList.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -38,17 +38,17 @@ public interface SAMTodoList extends SAMTodoListModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.samplealloymvc.model.impl.SAMTodoListImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<SAMTodoList, Long> SAM_TODO_LIST_ID_ACCESSOR = new Accessor<SAMTodoList, Long>() {
-			@Override
+
 			public Long get(SAMTodoList samTodoList) {
 				return samTodoList.getSamTodoListId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<SAMTodoList> getTypeClass() {
 				return SAMTodoList.class;
 			}
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListClp.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListClp.java
index 47cb3f6d6f1..d222e99c6f8 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListClp.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -47,37 +47,37 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 	public SAMTodoListClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SAMTodoList.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SAMTodoList.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSamTodoListId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -95,7 +95,7 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long samTodoListId = (Long)attributes.get("samTodoListId");
 
@@ -143,12 +143,12 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getSamTodoListId() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setSamTodoListId(long samTodoListId) {
 		_samTodoListId = samTodoListId;
 
@@ -166,12 +166,12 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -189,12 +189,12 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -212,7 +212,7 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -224,16 +224,16 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -251,12 +251,12 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -274,12 +274,12 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -297,12 +297,12 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public String getName() {
 		return _name;
 	}
 
-	@Override
+
 	public void setName(String name) {
 		_name = name;
 
@@ -369,7 +369,7 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SAMTodoListLocalServiceUtil.addSAMTodoList(this);
@@ -379,13 +379,13 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public SAMTodoList toEscapedModel() {
 		return (SAMTodoList)ProxyUtil.newProxyInstance(SAMTodoList.class.getClassLoader(),
 			new Class[] { SAMTodoList.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		SAMTodoListClp clone = new SAMTodoListClp();
 
@@ -400,7 +400,7 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(SAMTodoList samTodoList) {
 		long primaryKey = samTodoList.getPrimaryKey();
 
@@ -415,7 +415,7 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -441,22 +441,22 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(15);
 
@@ -479,7 +479,7 @@ public class SAMTodoListClp extends BaseModelImpl<SAMTodoList>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(25);
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListModel.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListModel.java
index a49ade0b3bc..dc71267f473 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListModel.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -84,7 +84,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @return the company ID of this s a m todo list
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -92,7 +92,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @param companyId the company ID of this s a m todo list
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -100,7 +100,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @return the user ID of this s a m todo list
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -108,7 +108,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @param userId the user ID of this s a m todo list
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -116,7 +116,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @return the user uuid of this s a m todo list
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -124,7 +124,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @param userUuid the user uuid of this s a m todo list
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -133,7 +133,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 * @return the user name of this s a m todo list
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -141,7 +141,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @param userName the user name of this s a m todo list
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -149,7 +149,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @return the create date of this s a m todo list
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -157,7 +157,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @param createDate the create date of this s a m todo list
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -165,7 +165,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @return the modified date of this s a m todo list
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -173,7 +173,7 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 *
 	 * @param modifiedDate the modified date of this s a m todo list
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -191,60 +191,60 @@ public interface SAMTodoListModel extends AuditedModel, BaseModel<SAMTodoList>,
 	 */
 	public void setName(String name);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(SAMTodoList samTodoList);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<SAMTodoList> toCacheModel();
 
-	@Override
+
 	public SAMTodoList toEscapedModel();
 
-	@Override
+
 	public SAMTodoList toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListSoap.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListSoap.java
index c3dfb23983c..1c7805e41c7 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListSoap.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListWrapper.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListWrapper.java
index 8445ccafc7b..214463b7a64 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListWrapper.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/model/SAMTodoListWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model;
@@ -44,17 +44,17 @@ public class SAMTodoListWrapper implements SAMTodoList,
 		_samTodoList = samTodoList;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SAMTodoList.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SAMTodoList.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -69,7 +69,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long samTodoListId = (Long)attributes.get("samTodoListId");
 
@@ -114,57 +114,57 @@ public class SAMTodoListWrapper implements SAMTodoList,
 		}
 	}
 
-	@Override
+
 	public SAMTodoList toEscapedModel() {
 		return new SAMTodoListWrapper(_samTodoList.toEscapedModel());
 	}
 
-	@Override
+
 	public SAMTodoList toUnescapedModel() {
 		return new SAMTodoListWrapper(_samTodoList.toUnescapedModel());
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _samTodoList.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _samTodoList.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _samTodoList.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _samTodoList.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<SAMTodoList> toCacheModel() {
 		return _samTodoList.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(SAMTodoList samTodoList) {
 		return _samTodoList.compareTo(samTodoList);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _samTodoList.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _samTodoList.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new SAMTodoListWrapper((SAMTodoList)_samTodoList.clone());
 	}
@@ -174,7 +174,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the name of this s a m todo list
 	*/
-	@Override
+
 	public java.lang.String getName() {
 		return _samTodoList.getName();
 	}
@@ -184,7 +184,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the user name of this s a m todo list
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _samTodoList.getUserName();
 	}
@@ -194,17 +194,17 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the user uuid of this s a m todo list
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _samTodoList.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _samTodoList.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _samTodoList.toXmlString();
 	}
@@ -214,7 +214,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the create date of this s a m todo list
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _samTodoList.getCreateDate();
 	}
@@ -224,7 +224,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the modified date of this s a m todo list
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _samTodoList.getModifiedDate();
 	}
@@ -234,7 +234,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the company ID of this s a m todo list
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _samTodoList.getCompanyId();
 	}
@@ -244,7 +244,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the primary key of this s a m todo list
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _samTodoList.getPrimaryKey();
 	}
@@ -254,7 +254,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the sam todo list ID of this s a m todo list
 	*/
-	@Override
+
 	public long getSamTodoListId() {
 		return _samTodoList.getSamTodoListId();
 	}
@@ -264,17 +264,17 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @return the user ID of this s a m todo list
 	*/
-	@Override
+
 	public long getUserId() {
 		return _samTodoList.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_samTodoList.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_samTodoList.setCachedModel(cachedModel);
 	}
@@ -284,7 +284,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param companyId the company ID of this s a m todo list
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_samTodoList.setCompanyId(companyId);
 	}
@@ -294,23 +294,23 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param createDate the create date of this s a m todo list
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_samTodoList.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_samTodoList.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_samTodoList.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_samTodoList.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -320,7 +320,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param modifiedDate the modified date of this s a m todo list
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_samTodoList.setModifiedDate(modifiedDate);
 	}
@@ -330,12 +330,12 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param name the name of this s a m todo list
 	*/
-	@Override
+
 	public void setName(java.lang.String name) {
 		_samTodoList.setName(name);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_samTodoList.setNew(n);
 	}
@@ -345,12 +345,12 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param primaryKey the primary key of this s a m todo list
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_samTodoList.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_samTodoList.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -360,7 +360,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param samTodoListId the sam todo list ID of this s a m todo list
 	*/
-	@Override
+
 	public void setSamTodoListId(long samTodoListId) {
 		_samTodoList.setSamTodoListId(samTodoListId);
 	}
@@ -370,7 +370,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param userId the user ID of this s a m todo list
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_samTodoList.setUserId(userId);
 	}
@@ -380,7 +380,7 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param userName the user name of this s a m todo list
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_samTodoList.setUserName(userName);
 	}
@@ -390,12 +390,12 @@ public class SAMTodoListWrapper implements SAMTodoList,
 	*
 	* @param userUuid the user uuid of this s a m todo list
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_samTodoList.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -414,22 +414,22 @@ public class SAMTodoListWrapper implements SAMTodoList,
 		return false;
 	}
 
-	@Override
+
 	public SAMTodoList getWrappedModel() {
 		return _samTodoList;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _samTodoList.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _samTodoList.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_samTodoList.resetOriginalValues();
 	}
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/ClpSerializer.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/ClpSerializer.java
index 4f765e6f5c7..8b768a4d9ed 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/ClpSerializer.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalService.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalService.java
index 0d60243a9e2..a84beed90b1 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalService.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
@@ -72,11 +72,11 @@ public interface SAMTodoItemLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -149,7 +149,7 @@ public interface SAMTodoItemLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getSAMTodoItemsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceClp.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceClp.java
index 8bfa72e6966..2805896497b 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceClp.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
@@ -129,7 +129,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -152,7 +152,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -175,7 +175,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -198,7 +198,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -228,7 +228,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -258,7 +258,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem addSAMTodoItem(
 		com.liferay.samplealloymvc.model.SAMTodoItem samTodoItem) {
 		Object returnObj = null;
@@ -283,7 +283,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem createSAMTodoItem(
 		long samTodoItemId) {
 		Object returnObj = null;
@@ -307,7 +307,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem deleteSAMTodoItem(
 		com.liferay.samplealloymvc.model.SAMTodoItem samTodoItem) {
 		Object returnObj = null;
@@ -332,7 +332,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem deleteSAMTodoItem(
 		long samTodoItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -361,7 +361,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem fetchSAMTodoItem(
 		long samTodoItemId) {
 		Object returnObj = null;
@@ -385,7 +385,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem getSAMTodoItem(
 		long samTodoItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -414,7 +414,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem updateSAMTodoItem(
 		com.liferay.samplealloymvc.model.SAMTodoItem samTodoItem) {
 		Object returnObj = null;
@@ -439,7 +439,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getSAMTodoItemsCount() {
 		Object returnObj = null;
 
@@ -462,14 +462,14 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -492,7 +492,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -517,7 +517,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -549,7 +549,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -584,7 +584,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplealloymvc.model.SAMTodoItem> getSAMTodoItems(
 		int start, int end) {
 		Object returnObj = null;
@@ -608,7 +608,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return (java.util.List<com.liferay.samplealloymvc.model.SAMTodoItem>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -633,7 +633,7 @@ public class SAMTodoItemLocalServiceClp implements SAMTodoItemLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceUtil.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceUtil.java
index 4f6a052e5d6..91bc60362cb 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceUtil.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceWrapper.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceWrapper.java
index 65d79c98ae8..1d412563d1a 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceWrapper.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoItemLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
@@ -33,17 +33,17 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 		_samTodoItemLocalService = samTodoItemLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _samTodoItemLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _samTodoItemLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _samTodoItemLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _samTodoItemLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,7 +71,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param samTodoItem the s a m todo item
 	* @return the s a m todo item that was added
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem addSAMTodoItem(
 		com.liferay.samplealloymvc.model.SAMTodoItem samTodoItem) {
 		return _samTodoItemLocalService.addSAMTodoItem(samTodoItem);
@@ -83,7 +83,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param samTodoItemId the primary key for the new s a m todo item
 	* @return the new s a m todo item
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem createSAMTodoItem(
 		long samTodoItemId) {
 		return _samTodoItemLocalService.createSAMTodoItem(samTodoItemId);
@@ -95,7 +95,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param samTodoItem the s a m todo item
 	* @return the s a m todo item that was removed
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem deleteSAMTodoItem(
 		com.liferay.samplealloymvc.model.SAMTodoItem samTodoItem) {
 		return _samTodoItemLocalService.deleteSAMTodoItem(samTodoItem);
@@ -108,14 +108,14 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @return the s a m todo item that was removed
 	* @throws PortalException if a s a m todo item with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem deleteSAMTodoItem(
 		long samTodoItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _samTodoItemLocalService.deleteSAMTodoItem(samTodoItemId);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem fetchSAMTodoItem(
 		long samTodoItemId) {
 		return _samTodoItemLocalService.fetchSAMTodoItem(samTodoItemId);
@@ -128,7 +128,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @return the s a m todo item
 	* @throws PortalException if a s a m todo item with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem getSAMTodoItem(
 		long samTodoItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -141,7 +141,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param samTodoItem the s a m todo item
 	* @return the s a m todo item that was updated
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoItem updateSAMTodoItem(
 		com.liferay.samplealloymvc.model.SAMTodoItem samTodoItem) {
 		return _samTodoItemLocalService.updateSAMTodoItem(samTodoItem);
@@ -152,12 +152,12 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	*
 	* @return the number of s a m todo items
 	*/
-	@Override
+
 	public int getSAMTodoItemsCount() {
 		return _samTodoItemLocalService.getSAMTodoItemsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -170,7 +170,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _samTodoItemLocalService.getOSGiServiceIdentifier();
 	}
@@ -181,7 +181,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _samTodoItemLocalService.dynamicQuery(dynamicQuery);
@@ -199,7 +199,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -219,7 +219,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -239,7 +239,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param end the upper bound of the range of s a m todo items (not inclusive)
 	* @return the range of s a m todo items
 	*/
-	@Override
+
 	public java.util.List<com.liferay.samplealloymvc.model.SAMTodoItem> getSAMTodoItems(
 		int start, int end) {
 		return _samTodoItemLocalService.getSAMTodoItems(start, end);
@@ -251,7 +251,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _samTodoItemLocalService.dynamicQueryCount(dynamicQuery);
@@ -264,7 +264,7 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -272,12 +272,12 @@ public class SAMTodoItemLocalServiceWrapper implements SAMTodoItemLocalService,
 			projection);
 	}
 
-	@Override
+
 	public SAMTodoItemLocalService getWrappedService() {
 		return _samTodoItemLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		SAMTodoItemLocalService samTodoItemLocalService) {
 		_samTodoItemLocalService = samTodoItemLocalService;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalService.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalService.java
index be60f7ca60d..af8af376c7e 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalService.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
@@ -72,11 +72,11 @@ public interface SAMTodoListLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -149,7 +149,7 @@ public interface SAMTodoListLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getSAMTodoListsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceClp.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceClp.java
index f40ec26325b..5b75e28f226 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceClp.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
@@ -129,7 +129,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -152,7 +152,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -175,7 +175,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -198,7 +198,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -228,7 +228,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -258,7 +258,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList addSAMTodoList(
 		com.liferay.samplealloymvc.model.SAMTodoList samTodoList) {
 		Object returnObj = null;
@@ -283,7 +283,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList createSAMTodoList(
 		long samTodoListId) {
 		Object returnObj = null;
@@ -307,7 +307,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList deleteSAMTodoList(
 		com.liferay.samplealloymvc.model.SAMTodoList samTodoList) {
 		Object returnObj = null;
@@ -332,7 +332,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList deleteSAMTodoList(
 		long samTodoListId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -361,7 +361,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList fetchSAMTodoList(
 		long samTodoListId) {
 		Object returnObj = null;
@@ -385,7 +385,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList getSAMTodoList(
 		long samTodoListId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -414,7 +414,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList updateSAMTodoList(
 		com.liferay.samplealloymvc.model.SAMTodoList samTodoList) {
 		Object returnObj = null;
@@ -439,7 +439,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (com.liferay.samplealloymvc.model.SAMTodoList)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getSAMTodoListsCount() {
 		Object returnObj = null;
 
@@ -462,14 +462,14 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -492,7 +492,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -517,7 +517,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -549,7 +549,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -584,7 +584,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplealloymvc.model.SAMTodoList> getSAMTodoLists(
 		int start, int end) {
 		Object returnObj = null;
@@ -608,7 +608,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return (java.util.List<com.liferay.samplealloymvc.model.SAMTodoList>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -633,7 +633,7 @@ public class SAMTodoListLocalServiceClp implements SAMTodoListLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceUtil.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceUtil.java
index 68061d51395..219ca843892 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceUtil.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceWrapper.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceWrapper.java
index 679b5470273..b535d57a101 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceWrapper.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/SAMTodoListLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service;
@@ -33,17 +33,17 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 		_samTodoListLocalService = samTodoListLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _samTodoListLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _samTodoListLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _samTodoListLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _samTodoListLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,7 +71,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param samTodoList the s a m todo list
 	* @return the s a m todo list that was added
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList addSAMTodoList(
 		com.liferay.samplealloymvc.model.SAMTodoList samTodoList) {
 		return _samTodoListLocalService.addSAMTodoList(samTodoList);
@@ -83,7 +83,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param samTodoListId the primary key for the new s a m todo list
 	* @return the new s a m todo list
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList createSAMTodoList(
 		long samTodoListId) {
 		return _samTodoListLocalService.createSAMTodoList(samTodoListId);
@@ -95,7 +95,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param samTodoList the s a m todo list
 	* @return the s a m todo list that was removed
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList deleteSAMTodoList(
 		com.liferay.samplealloymvc.model.SAMTodoList samTodoList) {
 		return _samTodoListLocalService.deleteSAMTodoList(samTodoList);
@@ -108,14 +108,14 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @return the s a m todo list that was removed
 	* @throws PortalException if a s a m todo list with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList deleteSAMTodoList(
 		long samTodoListId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _samTodoListLocalService.deleteSAMTodoList(samTodoListId);
 	}
 
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList fetchSAMTodoList(
 		long samTodoListId) {
 		return _samTodoListLocalService.fetchSAMTodoList(samTodoListId);
@@ -128,7 +128,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @return the s a m todo list
 	* @throws PortalException if a s a m todo list with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList getSAMTodoList(
 		long samTodoListId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -141,7 +141,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param samTodoList the s a m todo list
 	* @return the s a m todo list that was updated
 	*/
-	@Override
+
 	public com.liferay.samplealloymvc.model.SAMTodoList updateSAMTodoList(
 		com.liferay.samplealloymvc.model.SAMTodoList samTodoList) {
 		return _samTodoListLocalService.updateSAMTodoList(samTodoList);
@@ -152,12 +152,12 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	*
 	* @return the number of s a m todo lists
 	*/
-	@Override
+
 	public int getSAMTodoListsCount() {
 		return _samTodoListLocalService.getSAMTodoListsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -170,7 +170,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _samTodoListLocalService.getOSGiServiceIdentifier();
 	}
@@ -181,7 +181,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _samTodoListLocalService.dynamicQuery(dynamicQuery);
@@ -199,7 +199,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -219,7 +219,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -239,7 +239,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param end the upper bound of the range of s a m todo lists (not inclusive)
 	* @return the range of s a m todo lists
 	*/
-	@Override
+
 	public java.util.List<com.liferay.samplealloymvc.model.SAMTodoList> getSAMTodoLists(
 		int start, int end) {
 		return _samTodoListLocalService.getSAMTodoLists(start, end);
@@ -251,7 +251,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _samTodoListLocalService.dynamicQueryCount(dynamicQuery);
@@ -264,7 +264,7 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -272,12 +272,12 @@ public class SAMTodoListLocalServiceWrapper implements SAMTodoListLocalService,
 			projection);
 	}
 
-	@Override
+
 	public SAMTodoListLocalService getWrappedService() {
 		return _samTodoListLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		SAMTodoListLocalService samTodoListLocalService) {
 		_samTodoListLocalService = samTodoListLocalService;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/messaging/ClpMessageListener.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/messaging/ClpMessageListener.java
index bdf15eb0720..09b8bd4586e 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/messaging/ClpMessageListener.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.messaging;
@@ -32,7 +32,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemPersistence.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemPersistence.java
index 722e44a1097..56166e24e55 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemPersistence.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.persistence;
@@ -93,7 +93,7 @@ public interface SAMTodoItemPersistence extends BasePersistence<SAMTodoItem> {
 	*/
 	public SAMTodoItem fetchByPrimaryKey(long samTodoItemId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, SAMTodoItem> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemUtil.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemUtil.java
index bc5e68da17b..6a27d7e2c74 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemUtil.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoItemUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.persistence;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListPersistence.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListPersistence.java
index 8e32e203020..26e3f724be2 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListPersistence.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.persistence;
@@ -93,7 +93,7 @@ public interface SAMTodoListPersistence extends BasePersistence<SAMTodoList> {
 	*/
 	public SAMTodoList fetchByPrimaryKey(long samTodoListId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, SAMTodoList> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListUtil.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListUtil.java
index 0285f9791b0..5dbee6016cb 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListUtil.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/service/com/liferay/samplealloymvc/service/persistence/SAMTodoListUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.persistence;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemBaseImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemBaseImpl.java
index f9ee9a56cab..99b982d05bc 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemBaseImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
@@ -39,7 +39,7 @@ public abstract class SAMTodoItemBaseImpl extends SAMTodoItemModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a s a m todo item model instance should use the {@link SAMTodoItem} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SAMTodoItemLocalServiceUtil.addSAMTodoItem(this);
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemCacheModel.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemCacheModel.java
index c54a68e413e..aa776636c13 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemCacheModel.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class SAMTodoItemCacheModel implements CacheModel<SAMTodoItem>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class SAMTodoItemCacheModel implements CacheModel<SAMTodoItem>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, samTodoItemId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -93,7 +93,7 @@ public class SAMTodoItemCacheModel implements CacheModel<SAMTodoItem>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public SAMTodoItem toEntityModel() {
 		SAMTodoItemImpl samTodoItemImpl = new SAMTodoItemImpl();
 
@@ -139,7 +139,7 @@ public class SAMTodoItemCacheModel implements CacheModel<SAMTodoItem>,
 		return samTodoItemImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		samTodoItemId = objectInput.readLong();
 
@@ -158,7 +158,7 @@ public class SAMTodoItemCacheModel implements CacheModel<SAMTodoItem>,
 		status = objectInput.readInt();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(samTodoItemId);
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemImpl.java
index 517772d7275..b90463db7b8 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemModelImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemModelImpl.java
index 464eac620c3..8817a6237a8 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemModelImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoItemModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
@@ -111,37 +111,37 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 	public SAMTodoItemModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _samTodoItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSamTodoItemId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _samTodoItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SAMTodoItem.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SAMTodoItem.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -162,7 +162,7 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long samTodoItemId = (Long)attributes.get("samTodoItemId");
 
@@ -225,37 +225,37 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public long getSamTodoItemId() {
 		return _samTodoItemId;
 	}
 
-	@Override
+
 	public void setSamTodoItemId(long samTodoItemId) {
 		_samTodoItemId = samTodoItemId;
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -267,11 +267,11 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -281,22 +281,22 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -305,24 +305,24 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
 		_modifiedDate = modifiedDate;
 	}
 
-	@Override
+
 	public long getSamTodoListId() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setSamTodoListId(long samTodoListId) {
 		_samTodoListId = samTodoListId;
 	}
 
-	@Override
+
 	public String getDescription() {
 		if (_description == null) {
 			return StringPool.BLANK;
@@ -332,45 +332,45 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public void setDescription(String description) {
 		_description = description;
 	}
 
-	@Override
+
 	public int getPriority() {
 		return _priority;
 	}
 
-	@Override
+
 	public void setPriority(int priority) {
 		_priority = priority;
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _status;
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_status = status;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			SAMTodoItem.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public SAMTodoItem toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (SAMTodoItem)ProxyUtil.newProxyInstance(_classLoader,
@@ -380,7 +380,7 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		SAMTodoItemImpl samTodoItemImpl = new SAMTodoItemImpl();
 
@@ -400,7 +400,7 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		return samTodoItemImpl;
 	}
 
-	@Override
+
 	public int compareTo(SAMTodoItem samTodoItem) {
 		long primaryKey = samTodoItem.getPrimaryKey();
 
@@ -415,7 +415,7 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -437,29 +437,29 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		SAMTodoItemModelImpl samTodoItemModelImpl = this;
 
 		samTodoItemModelImpl._setModifiedDate = false;
 	}
 
-	@Override
+
 	public CacheModel<SAMTodoItem> toCacheModel() {
 		SAMTodoItemCacheModel samTodoItemCacheModel = new SAMTodoItemCacheModel();
 
@@ -512,7 +512,7 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		return samTodoItemCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -541,7 +541,7 @@ public class SAMTodoItemModelImpl extends BaseModelImpl<SAMTodoItem>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListBaseImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListBaseImpl.java
index dc41670cd10..6182f594d7a 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListBaseImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
@@ -39,7 +39,7 @@ public abstract class SAMTodoListBaseImpl extends SAMTodoListModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a s a m todo list model instance should use the {@link SAMTodoList} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SAMTodoListLocalServiceUtil.addSAMTodoList(this);
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListCacheModel.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListCacheModel.java
index 1cfc53a8648..be8014e579f 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListCacheModel.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class SAMTodoListCacheModel implements CacheModel<SAMTodoList>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class SAMTodoListCacheModel implements CacheModel<SAMTodoList>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, samTodoListId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(15);
 
@@ -87,7 +87,7 @@ public class SAMTodoListCacheModel implements CacheModel<SAMTodoList>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public SAMTodoList toEntityModel() {
 		SAMTodoListImpl samTodoListImpl = new SAMTodoListImpl();
 
@@ -128,7 +128,7 @@ public class SAMTodoListCacheModel implements CacheModel<SAMTodoList>,
 		return samTodoListImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		samTodoListId = objectInput.readLong();
 
@@ -141,7 +141,7 @@ public class SAMTodoListCacheModel implements CacheModel<SAMTodoList>,
 		name = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(samTodoListId);
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListImpl.java
index 6cdaad190f6..2dfd0ea31ee 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListModelImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListModelImpl.java
index a8edb28cd3c..ee9408aca36 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListModelImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/model/impl/SAMTodoListModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.model.impl;
@@ -105,37 +105,37 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 	public SAMTodoListModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSamTodoListId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SAMTodoList.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SAMTodoList.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -153,7 +153,7 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long samTodoListId = (Long)attributes.get("samTodoListId");
 
@@ -198,37 +198,37 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public long getSamTodoListId() {
 		return _samTodoListId;
 	}
 
-	@Override
+
 	public void setSamTodoListId(long samTodoListId) {
 		_samTodoListId = samTodoListId;
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -240,11 +240,11 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -254,22 +254,22 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -278,14 +278,14 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
 		_modifiedDate = modifiedDate;
 	}
 
-	@Override
+
 	public String getName() {
 		if (_name == null) {
 			return StringPool.BLANK;
@@ -295,25 +295,25 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public void setName(String name) {
 		_name = name;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			SAMTodoList.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public SAMTodoList toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (SAMTodoList)ProxyUtil.newProxyInstance(_classLoader,
@@ -323,7 +323,7 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		SAMTodoListImpl samTodoListImpl = new SAMTodoListImpl();
 
@@ -340,7 +340,7 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		return samTodoListImpl;
 	}
 
-	@Override
+
 	public int compareTo(SAMTodoList samTodoList) {
 		long primaryKey = samTodoList.getPrimaryKey();
 
@@ -355,7 +355,7 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -377,29 +377,29 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		SAMTodoListModelImpl samTodoListModelImpl = this;
 
 		samTodoListModelImpl._setModifiedDate = false;
 	}
 
-	@Override
+
 	public CacheModel<SAMTodoList> toCacheModel() {
 		SAMTodoListCacheModel samTodoListCacheModel = new SAMTodoListCacheModel();
 
@@ -446,7 +446,7 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		return samTodoListCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(15);
 
@@ -469,7 +469,7 @@ public class SAMTodoListModelImpl extends BaseModelImpl<SAMTodoList>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(25);
 
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceBaseImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceBaseImpl.java
index 587f2576736..177a84d0bb1 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceBaseImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.base;
@@ -80,7 +80,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @return the s a m todo item that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SAMTodoItem addSAMTodoItem(SAMTodoItem samTodoItem) {
 		samTodoItem.setNew(true);
 
@@ -93,7 +93,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param samTodoItemId the primary key for the new s a m todo item
 	 * @return the new s a m todo item
 	 */
-	@Override
+
 	public SAMTodoItem createSAMTodoItem(long samTodoItemId) {
 		return samTodoItemPersistence.create(samTodoItemId);
 	}
@@ -106,7 +106,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @throws PortalException if a s a m todo item with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SAMTodoItem deleteSAMTodoItem(long samTodoItemId)
 		throws PortalException {
 		return samTodoItemPersistence.remove(samTodoItemId);
@@ -119,12 +119,12 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @return the s a m todo item that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SAMTodoItem deleteSAMTodoItem(SAMTodoItem samTodoItem) {
 		return samTodoItemPersistence.remove(samTodoItem);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -138,7 +138,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return samTodoItemPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -155,7 +155,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return samTodoItemPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -175,7 +175,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return samTodoItemPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -188,7 +188,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return samTodoItemPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -200,14 +200,14 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return samTodoItemPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public SAMTodoItem fetchSAMTodoItem(long samTodoItemId) {
 		return samTodoItemPersistence.fetchByPrimaryKey(samTodoItemId);
 	}
@@ -219,13 +219,13 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @return the s a m todo item
 	 * @throws PortalException if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem getSAMTodoItem(long samTodoItemId)
 		throws PortalException {
 		return samTodoItemPersistence.findByPrimaryKey(samTodoItemId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -238,7 +238,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -264,13 +264,13 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return samTodoItemLocalService.deleteSAMTodoItem((SAMTodoItem)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return samTodoItemPersistence.findByPrimaryKey(primaryKeyObj);
@@ -287,7 +287,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @param end the upper bound of the range of s a m todo items (not inclusive)
 	 * @return the range of s a m todo items
 	 */
-	@Override
+
 	public List<SAMTodoItem> getSAMTodoItems(int start, int end) {
 		return samTodoItemPersistence.findAll(start, end);
 	}
@@ -297,7 +297,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 *
 	 * @return the number of s a m todo items
 	 */
-	@Override
+
 	public int getSAMTodoItemsCount() {
 		return samTodoItemPersistence.countAll();
 	}
@@ -309,7 +309,7 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 * @return the s a m todo item that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SAMTodoItem updateSAMTodoItem(SAMTodoItem samTodoItem) {
 		return samTodoItemPersistence.update(samTodoItem);
 	}
@@ -522,12 +522,12 @@ public abstract class SAMTodoItemLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return SAMTodoItemLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceClpInvoker.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceClpInvoker.java
index c2f2914e83e..61e3846bf27 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceClpInvoker.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoItemLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.base;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceBaseImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceBaseImpl.java
index 20d1e3fd277..d1b1676c502 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceBaseImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.base;
@@ -80,7 +80,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @return the s a m todo list that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SAMTodoList addSAMTodoList(SAMTodoList samTodoList) {
 		samTodoList.setNew(true);
 
@@ -93,7 +93,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param samTodoListId the primary key for the new s a m todo list
 	 * @return the new s a m todo list
 	 */
-	@Override
+
 	public SAMTodoList createSAMTodoList(long samTodoListId) {
 		return samTodoListPersistence.create(samTodoListId);
 	}
@@ -106,7 +106,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @throws PortalException if a s a m todo list with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SAMTodoList deleteSAMTodoList(long samTodoListId)
 		throws PortalException {
 		return samTodoListPersistence.remove(samTodoListId);
@@ -119,12 +119,12 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @return the s a m todo list that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SAMTodoList deleteSAMTodoList(SAMTodoList samTodoList) {
 		return samTodoListPersistence.remove(samTodoList);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -138,7 +138,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return samTodoListPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -155,7 +155,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return samTodoListPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -175,7 +175,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return samTodoListPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -188,7 +188,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return samTodoListPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -200,14 +200,14 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return samTodoListPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public SAMTodoList fetchSAMTodoList(long samTodoListId) {
 		return samTodoListPersistence.fetchByPrimaryKey(samTodoListId);
 	}
@@ -219,13 +219,13 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @return the s a m todo list
 	 * @throws PortalException if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList getSAMTodoList(long samTodoListId)
 		throws PortalException {
 		return samTodoListPersistence.findByPrimaryKey(samTodoListId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -238,7 +238,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -264,13 +264,13 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return samTodoListLocalService.deleteSAMTodoList((SAMTodoList)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return samTodoListPersistence.findByPrimaryKey(primaryKeyObj);
@@ -287,7 +287,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @param end the upper bound of the range of s a m todo lists (not inclusive)
 	 * @return the range of s a m todo lists
 	 */
-	@Override
+
 	public List<SAMTodoList> getSAMTodoLists(int start, int end) {
 		return samTodoListPersistence.findAll(start, end);
 	}
@@ -297,7 +297,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 *
 	 * @return the number of s a m todo lists
 	 */
-	@Override
+
 	public int getSAMTodoListsCount() {
 		return samTodoListPersistence.countAll();
 	}
@@ -309,7 +309,7 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 * @return the s a m todo list that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SAMTodoList updateSAMTodoList(SAMTodoList samTodoList) {
 		return samTodoListPersistence.update(samTodoList);
 	}
@@ -522,12 +522,12 @@ public abstract class SAMTodoListLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return SAMTodoListLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceClpInvoker.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceClpInvoker.java
index c77184960ef..ccefec162c0 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceClpInvoker.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/base/SAMTodoListLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.base;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoItemLocalServiceImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoItemLocalServiceImpl.java
index 1e192e51ed2..c3dc7c68d50 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoItemLocalServiceImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoItemLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.impl;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoListLocalServiceImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoListLocalServiceImpl.java
index 494d896c378..e3d027bbdbe 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoListLocalServiceImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/impl/SAMTodoListLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.impl;
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoItemPersistenceImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoItemPersistenceImpl.java
index f5fa5e3e032..f2022a614c7 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoItemPersistenceImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoItemPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.persistence.impl;
@@ -98,7 +98,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 *
 	 * @param samTodoItem the s a m todo item
 	 */
-	@Override
+
 	public void cacheResult(SAMTodoItem samTodoItem) {
 		entityCache.putResult(SAMTodoItemModelImpl.ENTITY_CACHE_ENABLED,
 			SAMTodoItemImpl.class, samTodoItem.getPrimaryKey(), samTodoItem);
@@ -111,7 +111,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 *
 	 * @param samTodoItems the s a m todo items
 	 */
-	@Override
+
 	public void cacheResult(List<SAMTodoItem> samTodoItems) {
 		for (SAMTodoItem samTodoItem : samTodoItems) {
 			if (entityCache.getResult(
@@ -132,7 +132,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(SAMTodoItemImpl.class);
 
@@ -148,7 +148,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(SAMTodoItem samTodoItem) {
 		entityCache.removeResult(SAMTodoItemModelImpl.ENTITY_CACHE_ENABLED,
 			SAMTodoItemImpl.class, samTodoItem.getPrimaryKey());
@@ -157,7 +157,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<SAMTodoItem> samTodoItems) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -174,7 +174,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @param samTodoItemId the primary key for the new s a m todo item
 	 * @return the new s a m todo item
 	 */
-	@Override
+
 	public SAMTodoItem create(long samTodoItemId) {
 		SAMTodoItem samTodoItem = new SAMTodoItemImpl();
 
@@ -193,7 +193,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @return the s a m todo item that was removed
 	 * @throws NoSuchTodoItemException if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem remove(long samTodoItemId)
 		throws NoSuchTodoItemException {
 		return remove((Serializable)samTodoItemId);
@@ -206,7 +206,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @return the s a m todo item that was removed
 	 * @throws NoSuchTodoItemException if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem remove(Serializable primaryKey)
 		throws NoSuchTodoItemException {
 		Session session = null;
@@ -239,7 +239,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 		}
 	}
 
-	@Override
+
 	protected SAMTodoItem removeImpl(SAMTodoItem samTodoItem) {
 		samTodoItem = toUnwrappedModel(samTodoItem);
 
@@ -271,7 +271,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 		return samTodoItem;
 	}
 
-	@Override
+
 	public SAMTodoItem updateImpl(SAMTodoItem samTodoItem) {
 		samTodoItem = toUnwrappedModel(samTodoItem);
 
@@ -368,7 +368,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @return the s a m todo item
 	 * @throws NoSuchTodoItemException if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchTodoItemException {
 		SAMTodoItem samTodoItem = fetchByPrimaryKey(primaryKey);
@@ -392,7 +392,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @return the s a m todo item
 	 * @throws NoSuchTodoItemException if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem findByPrimaryKey(long samTodoItemId)
 		throws NoSuchTodoItemException {
 		return findByPrimaryKey((Serializable)samTodoItemId);
@@ -404,7 +404,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @param primaryKey the primary key of the s a m todo item
 	 * @return the s a m todo item, or <code>null</code> if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem fetchByPrimaryKey(Serializable primaryKey) {
 		SAMTodoItem samTodoItem = (SAMTodoItem)entityCache.getResult(SAMTodoItemModelImpl.ENTITY_CACHE_ENABLED,
 				SAMTodoItemImpl.class, primaryKey);
@@ -450,12 +450,12 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @param samTodoItemId the primary key of the s a m todo item
 	 * @return the s a m todo item, or <code>null</code> if a s a m todo item with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoItem fetchByPrimaryKey(long samTodoItemId) {
 		return fetchByPrimaryKey((Serializable)samTodoItemId);
 	}
 
-	@Override
+
 	public Map<Serializable, SAMTodoItem> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -552,7 +552,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 *
 	 * @return the s a m todo items
 	 */
-	@Override
+
 	public List<SAMTodoItem> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -568,7 +568,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @param end the upper bound of the range of s a m todo items (not inclusive)
 	 * @return the range of s a m todo items
 	 */
-	@Override
+
 	public List<SAMTodoItem> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -585,7 +585,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of s a m todo items
 	 */
-	@Override
+
 	public List<SAMTodoItem> findAll(int start, int end,
 		OrderByComparator<SAMTodoItem> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -604,7 +604,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of s a m todo items
 	 */
-	@Override
+
 	public List<SAMTodoItem> findAll(int start, int end,
 		OrderByComparator<SAMTodoItem> orderByComparator,
 		boolean retrieveFromCache) {
@@ -694,7 +694,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 * Removes all the s a m todo items from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (SAMTodoItem samTodoItem : findAll()) {
 			remove(samTodoItem);
@@ -706,7 +706,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	 *
 	 * @return the number of s a m todo items
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -738,7 +738,7 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return SAMTodoItemModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -767,19 +767,19 @@ public class SAMTodoItemPersistenceImpl extends BasePersistenceImpl<SAMTodoItem>
 	private static final String _NO_SUCH_ENTITY_WITH_PRIMARY_KEY = "No SAMTodoItem exists with the primary key ";
 	private static final Log _log = LogFactoryUtil.getLog(SAMTodoItemPersistenceImpl.class);
 	private static final SAMTodoItem _nullSAMTodoItem = new SAMTodoItemImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<SAMTodoItem> toCacheModel() {
 				return _nullSAMTodoItemCacheModel;
 			}
 		};
 
 	private static final CacheModel<SAMTodoItem> _nullSAMTodoItemCacheModel = new CacheModel<SAMTodoItem>() {
-			@Override
+
 			public SAMTodoItem toEntityModel() {
 				return _nullSAMTodoItem;
 			}
diff --git a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoListPersistenceImpl.java b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoListPersistenceImpl.java
index 1230dff4859..54328d3a4f2 100644
--- a/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoListPersistenceImpl.java
+++ b/portlets/sample-alloy-mvc-portlet/docroot/WEB-INF/src/com/liferay/samplealloymvc/service/persistence/impl/SAMTodoListPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplealloymvc.service.persistence.impl;
@@ -98,7 +98,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 *
 	 * @param samTodoList the s a m todo list
 	 */
-	@Override
+
 	public void cacheResult(SAMTodoList samTodoList) {
 		entityCache.putResult(SAMTodoListModelImpl.ENTITY_CACHE_ENABLED,
 			SAMTodoListImpl.class, samTodoList.getPrimaryKey(), samTodoList);
@@ -111,7 +111,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 *
 	 * @param samTodoLists the s a m todo lists
 	 */
-	@Override
+
 	public void cacheResult(List<SAMTodoList> samTodoLists) {
 		for (SAMTodoList samTodoList : samTodoLists) {
 			if (entityCache.getResult(
@@ -132,7 +132,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(SAMTodoListImpl.class);
 
@@ -148,7 +148,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(SAMTodoList samTodoList) {
 		entityCache.removeResult(SAMTodoListModelImpl.ENTITY_CACHE_ENABLED,
 			SAMTodoListImpl.class, samTodoList.getPrimaryKey());
@@ -157,7 +157,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<SAMTodoList> samTodoLists) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -174,7 +174,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @param samTodoListId the primary key for the new s a m todo list
 	 * @return the new s a m todo list
 	 */
-	@Override
+
 	public SAMTodoList create(long samTodoListId) {
 		SAMTodoList samTodoList = new SAMTodoListImpl();
 
@@ -193,7 +193,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @return the s a m todo list that was removed
 	 * @throws NoSuchTodoListException if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList remove(long samTodoListId)
 		throws NoSuchTodoListException {
 		return remove((Serializable)samTodoListId);
@@ -206,7 +206,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @return the s a m todo list that was removed
 	 * @throws NoSuchTodoListException if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList remove(Serializable primaryKey)
 		throws NoSuchTodoListException {
 		Session session = null;
@@ -239,7 +239,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 		}
 	}
 
-	@Override
+
 	protected SAMTodoList removeImpl(SAMTodoList samTodoList) {
 		samTodoList = toUnwrappedModel(samTodoList);
 
@@ -271,7 +271,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 		return samTodoList;
 	}
 
-	@Override
+
 	public SAMTodoList updateImpl(SAMTodoList samTodoList) {
 		samTodoList = toUnwrappedModel(samTodoList);
 
@@ -365,7 +365,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @return the s a m todo list
 	 * @throws NoSuchTodoListException if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchTodoListException {
 		SAMTodoList samTodoList = fetchByPrimaryKey(primaryKey);
@@ -389,7 +389,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @return the s a m todo list
 	 * @throws NoSuchTodoListException if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList findByPrimaryKey(long samTodoListId)
 		throws NoSuchTodoListException {
 		return findByPrimaryKey((Serializable)samTodoListId);
@@ -401,7 +401,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @param primaryKey the primary key of the s a m todo list
 	 * @return the s a m todo list, or <code>null</code> if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList fetchByPrimaryKey(Serializable primaryKey) {
 		SAMTodoList samTodoList = (SAMTodoList)entityCache.getResult(SAMTodoListModelImpl.ENTITY_CACHE_ENABLED,
 				SAMTodoListImpl.class, primaryKey);
@@ -447,12 +447,12 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @param samTodoListId the primary key of the s a m todo list
 	 * @return the s a m todo list, or <code>null</code> if a s a m todo list with the primary key could not be found
 	 */
-	@Override
+
 	public SAMTodoList fetchByPrimaryKey(long samTodoListId) {
 		return fetchByPrimaryKey((Serializable)samTodoListId);
 	}
 
-	@Override
+
 	public Map<Serializable, SAMTodoList> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -549,7 +549,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 *
 	 * @return the s a m todo lists
 	 */
-	@Override
+
 	public List<SAMTodoList> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -565,7 +565,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @param end the upper bound of the range of s a m todo lists (not inclusive)
 	 * @return the range of s a m todo lists
 	 */
-	@Override
+
 	public List<SAMTodoList> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -582,7 +582,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of s a m todo lists
 	 */
-	@Override
+
 	public List<SAMTodoList> findAll(int start, int end,
 		OrderByComparator<SAMTodoList> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -601,7 +601,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of s a m todo lists
 	 */
-	@Override
+
 	public List<SAMTodoList> findAll(int start, int end,
 		OrderByComparator<SAMTodoList> orderByComparator,
 		boolean retrieveFromCache) {
@@ -691,7 +691,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 * Removes all the s a m todo lists from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (SAMTodoList samTodoList : findAll()) {
 			remove(samTodoList);
@@ -703,7 +703,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	 *
 	 * @return the number of s a m todo lists
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -735,7 +735,7 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return SAMTodoListModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -764,19 +764,19 @@ public class SAMTodoListPersistenceImpl extends BasePersistenceImpl<SAMTodoList>
 	private static final String _NO_SUCH_ENTITY_WITH_PRIMARY_KEY = "No SAMTodoList exists with the primary key ";
 	private static final Log _log = LogFactoryUtil.getLog(SAMTodoListPersistenceImpl.class);
 	private static final SAMTodoList _nullSAMTodoList = new SAMTodoListImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<SAMTodoList> toCacheModel() {
 				return _nullSAMTodoListCacheModel;
 			}
 		};
 
 	private static final CacheModel<SAMTodoList> _nullSAMTodoListCacheModel = new CacheModel<SAMTodoList>() {
-			@Override
+
 			public SAMTodoList toEntityModel() {
 				return _nullSAMTodoList;
 			}
diff --git a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItem.java b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItem.java
index c2c44d34daf..341e27bd26d 100644
--- a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItem.java
+++ b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampledao.model;
diff --git a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItemDAO.java b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItemDAO.java
index 95756de29c2..065177aa199 100644
--- a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItemDAO.java
+++ b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/model/FoodItemDAO.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampledao.model;
diff --git a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/portlet/DAOPortlet.java b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/portlet/DAOPortlet.java
index 33dbe9ddc31..027fec1d3ed 100644
--- a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/portlet/DAOPortlet.java
+++ b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/portlet/DAOPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampledao.portlet;
@@ -41,7 +41,7 @@ import javax.portlet.RenderResponse;
  */
 public class DAOPortlet extends GenericPortlet {
 
-	@Override
+
 	public void destroy() {
 		if (_log.isInfoEnabled()) {
 			_log.info("Destroying portlet");
@@ -55,7 +55,7 @@ public class DAOPortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -89,7 +89,7 @@ public class DAOPortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void init(PortletConfig portletConfig) throws PortletException {
 		super.init(portletConfig);
 
@@ -98,7 +98,7 @@ public class DAOPortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/util/ConnectionPool.java b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/util/ConnectionPool.java
index f16f7215c2b..decbc4f9e11 100644
--- a/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/util/ConnectionPool.java
+++ b/portlets/sample-dao-portlet/docroot/WEB-INF/src/com/liferay/sampledao/util/ConnectionPool.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampledao.util;
diff --git a/portlets/sample-dao-portlet/docroot/error.jsp b/portlets/sample-dao-portlet/docroot/error.jsp
index 61f7972a7fd..613362e993d 100644
--- a/portlets/sample-dao-portlet/docroot/error.jsp
+++ b/portlets/sample-dao-portlet/docroot/error.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-dao-portlet/docroot/view.jsp b/portlets/sample-dao-portlet/docroot/view.jsp
index e182f55c4da..65265e7f7e3 100644
--- a/portlets/sample-dao-portlet/docroot/view.jsp
+++ b/portlets/sample-dao-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/init.jsp b/portlets/sample-form-navigator-portlet/docroot/init.jsp
index 0b2e5b18f52..ddfe6b367e7 100644
--- a/portlets/sample-form-navigator-portlet/docroot/init.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/sections/section1.jsp b/portlets/sample-form-navigator-portlet/docroot/sections/section1.jsp
index d573c93d727..f6bec56a339 100644
--- a/portlets/sample-form-navigator-portlet/docroot/sections/section1.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/sections/section1.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/sections/section2.jsp b/portlets/sample-form-navigator-portlet/docroot/sections/section2.jsp
index 8392c967fb9..73130188d8a 100644
--- a/portlets/sample-form-navigator-portlet/docroot/sections/section2.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/sections/section2.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/sections/section3.jsp b/portlets/sample-form-navigator-portlet/docroot/sections/section3.jsp
index 82a08643ab3..1c3e2845049 100644
--- a/portlets/sample-form-navigator-portlet/docroot/sections/section3.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/sections/section3.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/sections/section4.jsp b/portlets/sample-form-navigator-portlet/docroot/sections/section4.jsp
index 9b301fb2fdd..0884d7a3e12 100644
--- a/portlets/sample-form-navigator-portlet/docroot/sections/section4.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/sections/section4.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/sections/section5.jsp b/portlets/sample-form-navigator-portlet/docroot/sections/section5.jsp
index 696a5856f69..aa8b5ad51eb 100644
--- a/portlets/sample-form-navigator-portlet/docroot/sections/section5.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/sections/section5.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-form-navigator-portlet/docroot/view.jsp b/portlets/sample-form-navigator-portlet/docroot/view.jsp
index d55d6ae7cb5..bfd2fe14854 100644
--- a/portlets/sample-form-navigator-portlet/docroot/view.jsp
+++ b/portlets/sample-form-navigator-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/FoodItemComponentImpl.java b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/FoodItemComponentImpl.java
index ffb4cdca095..b1abd07d4a1 100644
--- a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/FoodItemComponentImpl.java
+++ b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/FoodItemComponentImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplehibernate;
diff --git a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/model/FoodItem.java b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/model/FoodItem.java
index 733512cc852..7edfa2a973c 100644
--- a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/model/FoodItem.java
+++ b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/model/FoodItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplehibernate.model;
diff --git a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/portlet/HibernatePortlet.java b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/portlet/HibernatePortlet.java
index 5047cecab6a..e2a571fc453 100644
--- a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/portlet/HibernatePortlet.java
+++ b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/portlet/HibernatePortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplehibernate.portlet;
@@ -38,14 +38,14 @@ import javax.portlet.RenderResponse;
  */
 public class HibernatePortlet extends GenericPortlet {
 
-	@Override
+
 	public void destroy() {
 		if (_log.isInfoEnabled()) {
 			_log.info("Destroying portlet");
 		}
 	}
 
-	@Override
+
 	public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -79,7 +79,7 @@ public class HibernatePortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void init(PortletConfig portletConfig) throws PortletException {
 		super.init(portletConfig);
 
@@ -88,7 +88,7 @@ public class HibernatePortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/servlet/HibernateServlet.java b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/servlet/HibernateServlet.java
index 62f5930ae12..1acfc14f66c 100644
--- a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/servlet/HibernateServlet.java
+++ b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/servlet/HibernateServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplehibernate.servlet;
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class HibernateServlet extends HttpServlet {
 
-	@Override
+
 	public void service(
 			HttpServletRequest request, HttpServletResponse response)
 		throws IOException, ServletException {
diff --git a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/FoodItemUtil.java b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/FoodItemUtil.java
index 1630e68b409..57e20ebea1d 100644
--- a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/FoodItemUtil.java
+++ b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/FoodItemUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplehibernate.util;
diff --git a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/HibernateUtil.java b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/HibernateUtil.java
index f0d9cbaba65..9e0170fe04d 100644
--- a/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/HibernateUtil.java
+++ b/portlets/sample-hibernate-portlet/docroot/WEB-INF/src/com/liferay/samplehibernate/util/HibernateUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplehibernate.util;
diff --git a/portlets/sample-hibernate-portlet/docroot/error.jsp b/portlets/sample-hibernate-portlet/docroot/error.jsp
index ceba8b54053..5750e09d301 100644
--- a/portlets/sample-hibernate-portlet/docroot/error.jsp
+++ b/portlets/sample-hibernate-portlet/docroot/error.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-hibernate-portlet/docroot/view.jsp b/portlets/sample-hibernate-portlet/docroot/view.jsp
index dc41db4b073..4fc905b4668 100644
--- a/portlets/sample-hibernate-portlet/docroot/view.jsp
+++ b/portlets/sample-hibernate-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-json-portlet/docroot/WEB-INF/src/com/liferay/samplejson/servlet/SampleJSONServlet.java b/portlets/sample-json-portlet/docroot/WEB-INF/src/com/liferay/samplejson/servlet/SampleJSONServlet.java
index 3940c5345a1..12ea844ab88 100644
--- a/portlets/sample-json-portlet/docroot/WEB-INF/src/com/liferay/samplejson/servlet/SampleJSONServlet.java
+++ b/portlets/sample-json-portlet/docroot/WEB-INF/src/com/liferay/samplejson/servlet/SampleJSONServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplejson.servlet;
@@ -33,7 +33,7 @@ import org.json.JSONObject;
  */
 public class SampleJSONServlet extends HttpServlet {
 
-	@Override
+
 	public void service(
 			HttpServletRequest request, HttpServletResponse response)
 		throws IOException, ServletException {
diff --git a/portlets/sample-json-portlet/docroot/view.jsp b/portlets/sample-json-portlet/docroot/view.jsp
index 244b17596e7..04595dc556f 100644
--- a/portlets/sample-json-portlet/docroot/view.jsp
+++ b/portlets/sample-json-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-jsp-portlet/docroot/WEB-INF/src/com/liferay/samplejsp/portlet/JSPPortlet.java b/portlets/sample-jsp-portlet/docroot/WEB-INF/src/com/liferay/samplejsp/portlet/JSPPortlet.java
index 656b8b4faf2..191cd26e7a4 100644
--- a/portlets/sample-jsp-portlet/docroot/WEB-INF/src/com/liferay/samplejsp/portlet/JSPPortlet.java
+++ b/portlets/sample-jsp-portlet/docroot/WEB-INF/src/com/liferay/samplejsp/portlet/JSPPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplejsp.portlet;
@@ -32,7 +32,7 @@ import javax.portlet.RenderResponse;
  */
 public class JSPPortlet extends GenericPortlet {
 
-	@Override
+
 	public void doDispatch(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -47,7 +47,7 @@ public class JSPPortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void doEdit(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -60,7 +60,7 @@ public class JSPPortlet extends GenericPortlet {
 		}
 	}
 
-	@Override
+
 	public void doHelp(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -68,7 +68,7 @@ public class JSPPortlet extends GenericPortlet {
 		include(helpJSP, renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -76,14 +76,14 @@ public class JSPPortlet extends GenericPortlet {
 		include(viewJSP, renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void init() throws PortletException {
 		editJSP = getInitParameter("edit-jsp");
 		helpJSP = getInitParameter("help-jsp");
 		viewJSP = getInitParameter("view-jsp");
 	}
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/sample-jsp-portlet/docroot/view.jsp b/portlets/sample-jsp-portlet/docroot/view.jsp
index 1fa83d0e173..93389e6cc9b 100644
--- a/portlets/sample-jsp-portlet/docroot/view.jsp
+++ b/portlets/sample-jsp-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/NoSuchBookingException.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/NoSuchBookingException.java
index 146012bd25c..c8176068684 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/NoSuchBookingException.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/NoSuchBookingException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.exception;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/SampleLARBookingBookingNumberException.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/SampleLARBookingBookingNumberException.java
index f56ff37fce3..9cf97d69145 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/SampleLARBookingBookingNumberException.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/exception/SampleLARBookingBookingNumberException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.exception;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBooking.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBooking.java
index 91db4785a55..3ca7e835b32 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBooking.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBooking.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model;
@@ -39,17 +39,17 @@ public interface SampleLARBooking extends SampleLARBookingModel, PersistedModel
 	 */
 	public static final Accessor<SampleLARBooking, Long> SAMPLE_L_A_R_BOOKING_ID_ACCESSOR =
 		new Accessor<SampleLARBooking, Long>() {
-			@Override
+
 			public Long get(SampleLARBooking sampleLARBooking) {
 				return sampleLARBooking.getSampleLARBookingId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<SampleLARBooking> getTypeClass() {
 				return SampleLARBooking.class;
 			}
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingClp.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingClp.java
index 44412294a5c..9c4b82b28f7 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingClp.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model;
@@ -50,37 +50,37 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 	public SampleLARBookingClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SampleLARBooking.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SampleLARBooking.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _sampleLARBookingId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSampleLARBookingId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _sampleLARBookingId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -101,7 +101,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -167,12 +167,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public String getUuid() {
 		return _uuid;
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		_uuid = uuid;
 
@@ -190,12 +190,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public long getSampleLARBookingId() {
 		return _sampleLARBookingId;
 	}
 
-	@Override
+
 	public void setSampleLARBookingId(long sampleLARBookingId) {
 		_sampleLARBookingId = sampleLARBookingId;
 
@@ -214,12 +214,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -237,12 +237,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -260,12 +260,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -283,7 +283,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -295,16 +295,16 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -322,12 +322,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -345,12 +345,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -368,12 +368,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public String getBookingNumber() {
 		return _bookingNumber;
 	}
 
-	@Override
+
 	public void setBookingNumber(String bookingNumber) {
 		_bookingNumber = bookingNumber;
 
@@ -391,12 +391,12 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public Date getLastPublishDate() {
 		return _lastPublishDate;
 	}
 
-	@Override
+
 	public void setLastPublishDate(Date lastPublishDate) {
 		_lastPublishDate = lastPublishDate;
 
@@ -414,7 +414,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				SampleLARBooking.class.getName()));
@@ -470,7 +470,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SampleLARBookingLocalServiceUtil.addSampleLARBooking(this);
@@ -480,14 +480,14 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public SampleLARBooking toEscapedModel() {
 		return (SampleLARBooking)ProxyUtil.newProxyInstance(SampleLARBooking.class.getClassLoader(),
 			new Class[] { SampleLARBooking.class },
 			new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		SampleLARBookingClp clone = new SampleLARBookingClp();
 
@@ -505,7 +505,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(SampleLARBooking sampleLARBooking) {
 		int value = 0;
 
@@ -518,7 +518,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -544,22 +544,22 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -588,7 +588,7 @@ public class SampleLARBookingClp extends BaseModelImpl<SampleLARBooking>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingModel.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingModel.java
index 91470688546..99fb3e2eda4 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingModel.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model;
@@ -71,7 +71,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 * @return the uuid of this sample l a r booking
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUuid();
 
 	/**
@@ -79,7 +79,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param uuid the uuid of this sample l a r booking
 	 */
-	@Override
+
 	public void setUuid(String uuid);
 
 	/**
@@ -101,7 +101,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the group ID of this sample l a r booking
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -109,7 +109,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param groupId the group ID of this sample l a r booking
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -117,7 +117,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the company ID of this sample l a r booking
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -125,7 +125,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param companyId the company ID of this sample l a r booking
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -133,7 +133,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the user ID of this sample l a r booking
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -141,7 +141,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param userId the user ID of this sample l a r booking
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -149,7 +149,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the user uuid of this sample l a r booking
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -157,7 +157,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param userUuid the user uuid of this sample l a r booking
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -166,7 +166,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 * @return the user name of this sample l a r booking
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -174,7 +174,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param userName the user name of this sample l a r booking
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -182,7 +182,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the create date of this sample l a r booking
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -190,7 +190,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param createDate the create date of this sample l a r booking
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -198,7 +198,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the modified date of this sample l a r booking
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -206,7 +206,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param modifiedDate the modified date of this sample l a r booking
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -229,7 +229,7 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @return the last publish date of this sample l a r booking
 	 */
-	@Override
+
 	public Date getLastPublishDate();
 
 	/**
@@ -237,64 +237,64 @@ public interface SampleLARBookingModel extends BaseModel<SampleLARBooking>,
 	 *
 	 * @param lastPublishDate the last publish date of this sample l a r booking
 	 */
-	@Override
+
 	public void setLastPublishDate(Date lastPublishDate);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.samplelar.model.SampleLARBooking> toCacheModel();
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking toEscapedModel();
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingSoap.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingSoap.java
index 80d9b40900e..1fea669e045 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingSoap.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingWrapper.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingWrapper.java
index 85181cfa43f..9ea043b37ab 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingWrapper.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/model/SampleLARBookingWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model;
@@ -46,17 +46,17 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 		_sampleLARBooking = sampleLARBooking;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SampleLARBooking.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SampleLARBooking.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -74,7 +74,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -137,58 +137,58 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _sampleLARBooking.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _sampleLARBooking.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _sampleLARBooking.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _sampleLARBooking.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.samplelar.model.SampleLARBooking> toCacheModel() {
 		return _sampleLARBooking.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking toEscapedModel() {
 		return new SampleLARBookingWrapper(_sampleLARBooking.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking toUnescapedModel() {
 		return new SampleLARBookingWrapper(_sampleLARBooking.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		return _sampleLARBooking.compareTo(sampleLARBooking);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _sampleLARBooking.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _sampleLARBooking.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new SampleLARBookingWrapper((SampleLARBooking)_sampleLARBooking.clone());
 	}
@@ -198,7 +198,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the booking number of this sample l a r booking
 	*/
-	@Override
+
 	public java.lang.String getBookingNumber() {
 		return _sampleLARBooking.getBookingNumber();
 	}
@@ -208,7 +208,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the user name of this sample l a r booking
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _sampleLARBooking.getUserName();
 	}
@@ -218,7 +218,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the user uuid of this sample l a r booking
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _sampleLARBooking.getUserUuid();
 	}
@@ -228,17 +228,17 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the uuid of this sample l a r booking
 	*/
-	@Override
+
 	public java.lang.String getUuid() {
 		return _sampleLARBooking.getUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _sampleLARBooking.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _sampleLARBooking.toXmlString();
 	}
@@ -248,7 +248,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the create date of this sample l a r booking
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _sampleLARBooking.getCreateDate();
 	}
@@ -258,7 +258,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the last publish date of this sample l a r booking
 	*/
-	@Override
+
 	public Date getLastPublishDate() {
 		return _sampleLARBooking.getLastPublishDate();
 	}
@@ -268,7 +268,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the modified date of this sample l a r booking
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _sampleLARBooking.getModifiedDate();
 	}
@@ -278,7 +278,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the company ID of this sample l a r booking
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _sampleLARBooking.getCompanyId();
 	}
@@ -288,7 +288,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the group ID of this sample l a r booking
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _sampleLARBooking.getGroupId();
 	}
@@ -298,7 +298,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the primary key of this sample l a r booking
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _sampleLARBooking.getPrimaryKey();
 	}
@@ -308,7 +308,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the sample l a r booking ID of this sample l a r booking
 	*/
-	@Override
+
 	public long getSampleLARBookingId() {
 		return _sampleLARBooking.getSampleLARBookingId();
 	}
@@ -318,12 +318,12 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @return the user ID of this sample l a r booking
 	*/
-	@Override
+
 	public long getUserId() {
 		return _sampleLARBooking.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_sampleLARBooking.persist();
 	}
@@ -333,12 +333,12 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param bookingNumber the booking number of this sample l a r booking
 	*/
-	@Override
+
 	public void setBookingNumber(java.lang.String bookingNumber) {
 		_sampleLARBooking.setBookingNumber(bookingNumber);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_sampleLARBooking.setCachedModel(cachedModel);
 	}
@@ -348,7 +348,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param companyId the company ID of this sample l a r booking
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_sampleLARBooking.setCompanyId(companyId);
 	}
@@ -358,23 +358,23 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param createDate the create date of this sample l a r booking
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_sampleLARBooking.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_sampleLARBooking.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_sampleLARBooking.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_sampleLARBooking.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -384,7 +384,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param groupId the group ID of this sample l a r booking
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_sampleLARBooking.setGroupId(groupId);
 	}
@@ -394,7 +394,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param lastPublishDate the last publish date of this sample l a r booking
 	*/
-	@Override
+
 	public void setLastPublishDate(Date lastPublishDate) {
 		_sampleLARBooking.setLastPublishDate(lastPublishDate);
 	}
@@ -404,12 +404,12 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param modifiedDate the modified date of this sample l a r booking
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_sampleLARBooking.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_sampleLARBooking.setNew(n);
 	}
@@ -419,12 +419,12 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param primaryKey the primary key of this sample l a r booking
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_sampleLARBooking.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_sampleLARBooking.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -434,7 +434,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param sampleLARBookingId the sample l a r booking ID of this sample l a r booking
 	*/
-	@Override
+
 	public void setSampleLARBookingId(long sampleLARBookingId) {
 		_sampleLARBooking.setSampleLARBookingId(sampleLARBookingId);
 	}
@@ -444,7 +444,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param userId the user ID of this sample l a r booking
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_sampleLARBooking.setUserId(userId);
 	}
@@ -454,7 +454,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param userName the user name of this sample l a r booking
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_sampleLARBooking.setUserName(userName);
 	}
@@ -464,7 +464,7 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param userUuid the user uuid of this sample l a r booking
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_sampleLARBooking.setUserUuid(userUuid);
 	}
@@ -474,12 +474,12 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 	*
 	* @param uuid the uuid of this sample l a r booking
 	*/
-	@Override
+
 	public void setUuid(java.lang.String uuid) {
 		_sampleLARBooking.setUuid(uuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -499,27 +499,27 @@ public class SampleLARBookingWrapper implements SampleLARBooking,
 		return false;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return _sampleLARBooking.getStagedModelType();
 	}
 
-	@Override
+
 	public SampleLARBooking getWrappedModel() {
 		return _sampleLARBooking;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _sampleLARBooking.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _sampleLARBooking.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_sampleLARBooking.resetOriginalValues();
 	}
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/ClpSerializer.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/ClpSerializer.java
index 1fdb3c06dec..7e3dd8190e8 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/ClpSerializer.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalService.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalService.java
index ce660813cd2..40d54835f3d 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalService.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service;
@@ -82,11 +82,11 @@ public interface SampleLARBookingLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -197,7 +197,7 @@ public interface SampleLARBookingLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getSampleLARBookingsCount(long groupId);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceClp.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceClp.java
index e1fefe8f76a..2068dcabe97 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceClp.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service;
@@ -181,7 +181,7 @@ public class SampleLARBookingLocalServiceClp
 		_methodParameterTypes30 = new String[] { "long" };
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -204,7 +204,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -227,7 +227,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		Object returnObj = null;
@@ -254,7 +254,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -277,7 +277,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -307,7 +307,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -337,7 +337,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking addSampleLARBooking(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		Object returnObj = null;
@@ -363,7 +363,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking addSampleLARBooking(
 		long userId, long groupId, java.lang.String bookingNumber,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -402,7 +402,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking createSampleLARBooking(
 		long sampleLARBookingId) {
 		Object returnObj = null;
@@ -426,7 +426,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking deleteSampleLARBooking(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		Object returnObj = null;
@@ -452,7 +452,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking deleteSampleLARBooking(
 		long sampleLARBookingId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -481,7 +481,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking fetchSampleLARBooking(
 		long sampleLARBookingId) {
 		Object returnObj = null;
@@ -505,7 +505,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking fetchSampleLARBookingByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		Object returnObj = null;
@@ -530,7 +530,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking getSampleLARBooking(
 		long sampleLARBookingId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -559,7 +559,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking getSampleLARBookingByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -589,7 +589,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking updateSampleLARBooking(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		Object returnObj = null;
@@ -615,7 +615,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking updateSampleLARBooking(
 		long userId, long sampleLARBookingId, java.lang.String bookingNumber,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -654,7 +654,7 @@ public class SampleLARBookingLocalServiceClp
 		return (com.liferay.samplelar.model.SampleLARBooking)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getSampleLARBookingsCount() {
 		Object returnObj = null;
 
@@ -677,7 +677,7 @@ public class SampleLARBookingLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getSampleLARBookingsCount(long groupId) {
 		Object returnObj = null;
 
@@ -700,14 +700,14 @@ public class SampleLARBookingLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -730,7 +730,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -755,7 +755,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -787,7 +787,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -822,7 +822,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookings(
 		int start, int end) {
 		Object returnObj = null;
@@ -846,7 +846,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<com.liferay.samplelar.model.SampleLARBooking>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookings(
 		long groupId, int start, int end) {
 		Object returnObj = null;
@@ -871,7 +871,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<com.liferay.samplelar.model.SampleLARBooking>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookingsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		Object returnObj = null;
@@ -896,7 +896,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<com.liferay.samplelar.model.SampleLARBooking>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookingsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.samplelar.model.SampleLARBooking> orderByComparator) {
@@ -932,7 +932,7 @@ public class SampleLARBookingLocalServiceClp
 		return (java.util.List<com.liferay.samplelar.model.SampleLARBooking>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -957,7 +957,7 @@ public class SampleLARBookingLocalServiceClp
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -987,7 +987,7 @@ public class SampleLARBookingLocalServiceClp
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void deleteSampleLARBookings(long groupId) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName30,
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceUtil.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceUtil.java
index 5ce1b1e8039..79325c7efbf 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceUtil.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceWrapper.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceWrapper.java
index 7bb591add28..012848f2355 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceWrapper.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/SampleLARBookingLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service;
@@ -34,23 +34,23 @@ public class SampleLARBookingLocalServiceWrapper
 		_sampleLARBookingLocalService = sampleLARBookingLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _sampleLARBookingLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _sampleLARBookingLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		return _sampleLARBookingLocalService.getExportActionableDynamicQuery(portletDataContext);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _sampleLARBookingLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -58,14 +58,14 @@ public class SampleLARBookingLocalServiceWrapper
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _sampleLARBookingLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -78,13 +78,13 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param sampleLARBooking the sample l a r booking
 	* @return the sample l a r booking that was added
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking addSampleLARBooking(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		return _sampleLARBookingLocalService.addSampleLARBooking(sampleLARBooking);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking addSampleLARBooking(
 		long userId, long groupId, java.lang.String bookingNumber,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -99,7 +99,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param sampleLARBookingId the primary key for the new sample l a r booking
 	* @return the new sample l a r booking
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking createSampleLARBooking(
 		long sampleLARBookingId) {
 		return _sampleLARBookingLocalService.createSampleLARBooking(sampleLARBookingId);
@@ -111,7 +111,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param sampleLARBooking the sample l a r booking
 	* @return the sample l a r booking that was removed
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking deleteSampleLARBooking(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		return _sampleLARBookingLocalService.deleteSampleLARBooking(sampleLARBooking);
@@ -124,14 +124,14 @@ public class SampleLARBookingLocalServiceWrapper
 	* @return the sample l a r booking that was removed
 	* @throws PortalException if a sample l a r booking with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking deleteSampleLARBooking(
 		long sampleLARBookingId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _sampleLARBookingLocalService.deleteSampleLARBooking(sampleLARBookingId);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking fetchSampleLARBooking(
 		long sampleLARBookingId) {
 		return _sampleLARBookingLocalService.fetchSampleLARBooking(sampleLARBookingId);
@@ -144,7 +144,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param groupId the primary key of the group
 	* @return the matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking fetchSampleLARBookingByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		return _sampleLARBookingLocalService.fetchSampleLARBookingByUuidAndGroupId(uuid,
@@ -158,7 +158,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @return the sample l a r booking
 	* @throws PortalException if a sample l a r booking with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking getSampleLARBooking(
 		long sampleLARBookingId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -173,7 +173,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @return the matching sample l a r booking
 	* @throws PortalException if a matching sample l a r booking could not be found
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking getSampleLARBookingByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -187,13 +187,13 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param sampleLARBooking the sample l a r booking
 	* @return the sample l a r booking that was updated
 	*/
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking updateSampleLARBooking(
 		com.liferay.samplelar.model.SampleLARBooking sampleLARBooking) {
 		return _sampleLARBookingLocalService.updateSampleLARBooking(sampleLARBooking);
 	}
 
-	@Override
+
 	public com.liferay.samplelar.model.SampleLARBooking updateSampleLARBooking(
 		long userId, long sampleLARBookingId, java.lang.String bookingNumber,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -207,17 +207,17 @@ public class SampleLARBookingLocalServiceWrapper
 	*
 	* @return the number of sample l a r bookings
 	*/
-	@Override
+
 	public int getSampleLARBookingsCount() {
 		return _sampleLARBookingLocalService.getSampleLARBookingsCount();
 	}
 
-	@Override
+
 	public int getSampleLARBookingsCount(long groupId) {
 		return _sampleLARBookingLocalService.getSampleLARBookingsCount(groupId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -230,7 +230,7 @@ public class SampleLARBookingLocalServiceWrapper
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _sampleLARBookingLocalService.getOSGiServiceIdentifier();
 	}
@@ -241,7 +241,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _sampleLARBookingLocalService.dynamicQuery(dynamicQuery);
@@ -259,7 +259,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -280,7 +280,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -300,13 +300,13 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param end the upper bound of the range of sample l a r bookings (not inclusive)
 	* @return the range of sample l a r bookings
 	*/
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookings(
 		int start, int end) {
 		return _sampleLARBookingLocalService.getSampleLARBookings(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookings(
 		long groupId, int start, int end) {
 		return _sampleLARBookingLocalService.getSampleLARBookings(groupId,
@@ -320,7 +320,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param companyId the primary key of the company
 	* @return the matching sample l a r bookings, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookingsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		return _sampleLARBookingLocalService.getSampleLARBookingsByUuidAndCompanyId(uuid,
@@ -337,7 +337,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the range of matching sample l a r bookings, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.samplelar.model.SampleLARBooking> getSampleLARBookingsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.samplelar.model.SampleLARBooking> orderByComparator) {
@@ -351,7 +351,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _sampleLARBookingLocalService.dynamicQueryCount(dynamicQuery);
@@ -364,7 +364,7 @@ public class SampleLARBookingLocalServiceWrapper
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -372,17 +372,17 @@ public class SampleLARBookingLocalServiceWrapper
 			projection);
 	}
 
-	@Override
+
 	public void deleteSampleLARBookings(long groupId) {
 		_sampleLARBookingLocalService.deleteSampleLARBookings(groupId);
 	}
 
-	@Override
+
 	public SampleLARBookingLocalService getWrappedService() {
 		return _sampleLARBookingLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		SampleLARBookingLocalService sampleLARBookingLocalService) {
 		_sampleLARBookingLocalService = sampleLARBookingLocalService;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/messaging/ClpMessageListener.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/messaging/ClpMessageListener.java
index 93ac70d4de6..f0fe46a5591 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/messaging/ClpMessageListener.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingPersistence.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingPersistence.java
index 27d2571b32a..1b4cd152295 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingPersistence.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.persistence;
@@ -555,7 +555,7 @@ public interface SampleLARBookingPersistence extends BasePersistence<SampleLARBo
 	*/
 	public SampleLARBooking fetchByPrimaryKey(long sampleLARBookingId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, SampleLARBooking> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -623,6 +623,6 @@ public interface SampleLARBookingPersistence extends BasePersistence<SampleLARBo
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingUtil.java b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingUtil.java
index 36a0a1a41f8..95f3b86caa3 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingUtil.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/service/com/liferay/samplelar/service/persistence/SampleLARBookingUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.persistence;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARBookingStagedModelDataHandler.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARBookingStagedModelDataHandler.java
index 3c6bd4bab0d..e0a15493bae 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARBookingStagedModelDataHandler.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARBookingStagedModelDataHandler.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.lar;
@@ -35,13 +35,13 @@ public class SampleLARBookingStagedModelDataHandler
 	public static final String[] CLASS_NAMES =
 		{SampleLARBooking.class.getName()};
 
-	@Override
+
 	public void deleteStagedModel(SampleLARBooking sampleLARBooking) {
 		SampleLARBookingLocalServiceUtil.deleteSampleLARBooking(
 			sampleLARBooking);
 	}
 
-	@Override
+
 	public void deleteStagedModel(
 		String uuid, long groupId, String className, String extraData) {
 
@@ -53,7 +53,7 @@ public class SampleLARBookingStagedModelDataHandler
 		}
 	}
 
-	@Override
+
 	public SampleLARBooking fetchStagedModelByUuidAndGroupId(
 		String uuid, long groupId) {
 
@@ -61,7 +61,7 @@ public class SampleLARBookingStagedModelDataHandler
 			fetchSampleLARBookingByUuidAndGroupId(uuid, groupId);
 	}
 
-	@Override
+
 	public List<SampleLARBooking> fetchStagedModelsByUuidAndCompanyId(
 		String uuid, long companyId) {
 
@@ -71,17 +71,17 @@ public class SampleLARBookingStagedModelDataHandler
 				new StagedModelModifiedDateComparator<SampleLARBooking>());
 	}
 
-	@Override
+
 	public String[] getClassNames() {
 		return CLASS_NAMES;
 	}
 
-	@Override
+
 	public String getDisplayName(SampleLARBooking sampleLARBooking) {
 		return sampleLARBooking.getBookingNumber();
 	}
 
-	@Override
+
 	protected void doExportStagedModel(
 			PortletDataContext portletDataContext,
 			SampleLARBooking sampleLARBooking)
@@ -96,7 +96,7 @@ public class SampleLARBookingStagedModelDataHandler
 			sampleLARBooking);
 	}
 
-	@Override
+
 	protected void doImportStagedModel(
 			PortletDataContext portletDataContext,
 			SampleLARBooking sampleLARBooking)
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARPortletDataHandler.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARPortletDataHandler.java
index ea2017e4f92..7321afcc61b 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARPortletDataHandler.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/lar/SampleLARPortletDataHandler.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.lar;
@@ -50,7 +50,7 @@ public class SampleLARPortletDataHandler extends BasePortletDataHandler {
 			SampleLARBookingImpl.class, "SampleLARBooking");
 	}
 
-	@Override
+
 	protected PortletPreferences doDeleteData(
 			PortletDataContext portletDataContext, String portletId,
 			PortletPreferences portletPreferences)
@@ -68,7 +68,7 @@ public class SampleLARPortletDataHandler extends BasePortletDataHandler {
 		return portletPreferences;
 	}
 
-	@Override
+
 	protected String doExportData(
 			PortletDataContext portletDataContext, String portletId,
 			PortletPreferences portletPreferences)
@@ -92,7 +92,7 @@ public class SampleLARPortletDataHandler extends BasePortletDataHandler {
 		return getExportDataRootElementString(rootElement);
 	}
 
-	@Override
+
 	protected PortletPreferences doImportData(
 			PortletDataContext portletDataContext, String portletId,
 			PortletPreferences portletPreferences, String data)
@@ -117,7 +117,7 @@ public class SampleLARPortletDataHandler extends BasePortletDataHandler {
 		return null;
 	}
 
-	@Override
+
 	protected void doPrepareManifestSummary(
 			PortletDataContext portletDataContext,
 			PortletPreferences portletPreferences)
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingBaseImpl.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingBaseImpl.java
index 5ed06f4e3ad..fe0c6c6b754 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingBaseImpl.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model.impl;
@@ -39,7 +39,7 @@ public abstract class SampleLARBookingBaseImpl extends SampleLARBookingModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a sample l a r booking model instance should use the {@link SampleLARBooking} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SampleLARBookingLocalServiceUtil.addSampleLARBooking(this);
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingCacheModel.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingCacheModel.java
index 8f5735b745f..c63e7e9966e 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingCacheModel.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class SampleLARBookingCacheModel implements CacheModel<SampleLARBooking>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class SampleLARBookingCacheModel implements CacheModel<SampleLARBooking>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, sampleLARBookingId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -93,7 +93,7 @@ public class SampleLARBookingCacheModel implements CacheModel<SampleLARBooking>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public SampleLARBooking toEntityModel() {
 		SampleLARBookingImpl sampleLARBookingImpl = new SampleLARBookingImpl();
 
@@ -149,7 +149,7 @@ public class SampleLARBookingCacheModel implements CacheModel<SampleLARBooking>,
 		return sampleLARBookingImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		uuid = objectInput.readUTF();
 
@@ -167,7 +167,7 @@ public class SampleLARBookingCacheModel implements CacheModel<SampleLARBooking>,
 		lastPublishDate = objectInput.readLong();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		if (uuid == null) {
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingImpl.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingImpl.java
index 901868bac19..dd3a863af63 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingImpl.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model.impl;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingModelImpl.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingModelImpl.java
index ac31170fe0e..5560e17ff86 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingModelImpl.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/model/impl/SampleLARBookingModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.model.impl;
@@ -120,37 +120,37 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 	public SampleLARBookingModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _sampleLARBookingId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSampleLARBookingId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _sampleLARBookingId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SampleLARBooking.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SampleLARBooking.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -171,7 +171,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -234,7 +234,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public String getUuid() {
 		if (_uuid == null) {
 			return StringPool.BLANK;
@@ -244,7 +244,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		if (_originalUuid == null) {
 			_originalUuid = _uuid;
@@ -257,22 +257,22 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return GetterUtil.getString(_originalUuid);
 	}
 
-	@Override
+
 	public long getSampleLARBookingId() {
 		return _sampleLARBookingId;
 	}
 
-	@Override
+
 	public void setSampleLARBookingId(long sampleLARBookingId) {
 		_sampleLARBookingId = sampleLARBookingId;
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_columnBitmask |= GROUPID_COLUMN_BITMASK;
 
@@ -289,12 +289,12 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return _originalGroupId;
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_columnBitmask |= COMPANYID_COLUMN_BITMASK;
 
@@ -311,17 +311,17 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return _originalCompanyId;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -333,11 +333,11 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -347,22 +347,22 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -371,14 +371,14 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
 		_modifiedDate = modifiedDate;
 	}
 
-	@Override
+
 	public String getBookingNumber() {
 		if (_bookingNumber == null) {
 			return StringPool.BLANK;
@@ -388,24 +388,24 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public void setBookingNumber(String bookingNumber) {
 		_columnBitmask = -1L;
 
 		_bookingNumber = bookingNumber;
 	}
 
-	@Override
+
 	public Date getLastPublishDate() {
 		return _lastPublishDate;
 	}
 
-	@Override
+
 	public void setLastPublishDate(Date lastPublishDate) {
 		_lastPublishDate = lastPublishDate;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				SampleLARBooking.class.getName()));
@@ -415,20 +415,20 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			SampleLARBooking.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public SampleLARBooking toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (SampleLARBooking)ProxyUtil.newProxyInstance(_classLoader,
@@ -438,7 +438,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		SampleLARBookingImpl sampleLARBookingImpl = new SampleLARBookingImpl();
 
@@ -458,7 +458,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return sampleLARBookingImpl;
 	}
 
-	@Override
+
 	public int compareTo(SampleLARBooking sampleLARBooking) {
 		int value = 0;
 
@@ -471,7 +471,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -493,22 +493,22 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		SampleLARBookingModelImpl sampleLARBookingModelImpl = this;
 
@@ -527,7 +527,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		sampleLARBookingModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<SampleLARBooking> toCacheModel() {
 		SampleLARBookingCacheModel sampleLARBookingCacheModel = new SampleLARBookingCacheModel();
 
@@ -593,7 +593,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return sampleLARBookingCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(21);
 
@@ -622,7 +622,7 @@ public class SampleLARBookingModelImpl extends BaseModelImpl<SampleLARBooking>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(34);
 
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/portlet/SampleLARPortlet.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/portlet/SampleLARPortlet.java
index b873b3ba059..ec50e43d984 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/portlet/SampleLARPortlet.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/portlet/SampleLARPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.portlet;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceBaseImpl.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceBaseImpl.java
index fe236da0f0b..77b7ddcda6a 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceBaseImpl.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.base;
@@ -86,7 +86,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @return the sample l a r booking that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SampleLARBooking addSampleLARBooking(
 		SampleLARBooking sampleLARBooking) {
 		sampleLARBooking.setNew(true);
@@ -100,7 +100,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param sampleLARBookingId the primary key for the new sample l a r booking
 	 * @return the new sample l a r booking
 	 */
-	@Override
+
 	public SampleLARBooking createSampleLARBooking(long sampleLARBookingId) {
 		return sampleLARBookingPersistence.create(sampleLARBookingId);
 	}
@@ -113,7 +113,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @throws PortalException if a sample l a r booking with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SampleLARBooking deleteSampleLARBooking(long sampleLARBookingId)
 		throws PortalException {
 		return sampleLARBookingPersistence.remove(sampleLARBookingId);
@@ -126,13 +126,13 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @return the sample l a r booking that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SampleLARBooking deleteSampleLARBooking(
 		SampleLARBooking sampleLARBooking) {
 		return sampleLARBookingPersistence.remove(sampleLARBooking);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -146,7 +146,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return sampleLARBookingPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -163,7 +163,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return sampleLARBookingPersistence.findWithDynamicQuery(dynamicQuery,
@@ -183,7 +183,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return sampleLARBookingPersistence.findWithDynamicQuery(dynamicQuery,
@@ -196,7 +196,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return sampleLARBookingPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -208,14 +208,14 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return sampleLARBookingPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public SampleLARBooking fetchSampleLARBooking(long sampleLARBookingId) {
 		return sampleLARBookingPersistence.fetchByPrimaryKey(sampleLARBookingId);
 	}
@@ -227,7 +227,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param groupId the primary key of the group
 	 * @return the matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchSampleLARBookingByUuidAndGroupId(String uuid,
 		long groupId) {
 		return sampleLARBookingPersistence.fetchByUUID_G(uuid, groupId);
@@ -240,13 +240,13 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @return the sample l a r booking
 	 * @throws PortalException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking getSampleLARBooking(long sampleLARBookingId)
 		throws PortalException {
 		return sampleLARBookingPersistence.findByPrimaryKey(sampleLARBookingId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -259,7 +259,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -282,11 +282,11 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 		actionableDynamicQuery.setPrimaryKeyPropertyName("sampleLARBookingId");
 	}
 
-	@Override
+
 	public ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		final PortletDataContext portletDataContext) {
 		final ExportActionableDynamicQuery exportActionableDynamicQuery = new ExportActionableDynamicQuery() {
-				@Override
+
 				public long performCount() throws PortalException {
 					ManifestSummary manifestSummary = portletDataContext.getManifestSummary();
 
@@ -310,7 +310,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 		initActionableDynamicQuery(exportActionableDynamicQuery);
 
 		exportActionableDynamicQuery.setAddCriteriaMethod(new ActionableDynamicQuery.AddCriteriaMethod() {
-				@Override
+
 				public void addCriteria(DynamicQuery dynamicQuery) {
 					portletDataContext.addDateRangeCriteria(dynamicQuery,
 						"modifiedDate");
@@ -322,7 +322,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 		exportActionableDynamicQuery.setGroupId(portletDataContext.getScopeGroupId());
 
 		exportActionableDynamicQuery.setPerformActionMethod(new ActionableDynamicQuery.PerformActionMethod<SampleLARBooking>() {
-				@Override
+
 				public void performAction(SampleLARBooking sampleLARBooking)
 					throws PortalException {
 					StagedModelDataHandlerUtil.exportStagedModel(portletDataContext,
@@ -338,13 +338,13 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return sampleLARBookingLocalService.deleteSampleLARBooking((SampleLARBooking)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return sampleLARBookingPersistence.findByPrimaryKey(primaryKeyObj);
@@ -357,7 +357,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param companyId the primary key of the company
 	 * @return the matching sample l a r bookings, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<SampleLARBooking> getSampleLARBookingsByUuidAndCompanyId(
 		String uuid, long companyId) {
 		return sampleLARBookingPersistence.findByUuid_C(uuid, companyId);
@@ -373,7 +373,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the range of matching sample l a r bookings, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<SampleLARBooking> getSampleLARBookingsByUuidAndCompanyId(
 		String uuid, long companyId, int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
@@ -389,7 +389,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @return the matching sample l a r booking
 	 * @throws PortalException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking getSampleLARBookingByUuidAndGroupId(String uuid,
 		long groupId) throws PortalException {
 		return sampleLARBookingPersistence.findByUUID_G(uuid, groupId);
@@ -406,7 +406,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @param end the upper bound of the range of sample l a r bookings (not inclusive)
 	 * @return the range of sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> getSampleLARBookings(int start, int end) {
 		return sampleLARBookingPersistence.findAll(start, end);
 	}
@@ -416,7 +416,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 *
 	 * @return the number of sample l a r bookings
 	 */
-	@Override
+
 	public int getSampleLARBookingsCount() {
 		return sampleLARBookingPersistence.countAll();
 	}
@@ -428,7 +428,7 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 * @return the sample l a r booking that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SampleLARBooking updateSampleLARBooking(
 		SampleLARBooking sampleLARBooking) {
 		return sampleLARBookingPersistence.update(sampleLARBooking);
@@ -604,12 +604,12 @@ public abstract class SampleLARBookingLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return SampleLARBookingLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceClpInvoker.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceClpInvoker.java
index b5a74339389..7e732e3012c 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceClpInvoker.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/base/SampleLARBookingLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.base;
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/impl/SampleLARBookingLocalServiceImpl.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/impl/SampleLARBookingLocalServiceImpl.java
index 93e16a61226..8345a0964dd 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/impl/SampleLARBookingLocalServiceImpl.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/impl/SampleLARBookingLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.impl;
@@ -33,7 +33,7 @@ import java.util.List;
 public class SampleLARBookingLocalServiceImpl
 	extends SampleLARBookingLocalServiceBaseImpl {
 
-	@Override
+
 	public SampleLARBooking addSampleLARBooking(
 			long userId, long groupId, String bookingNumber,
 			ServiceContext serviceContext)
@@ -62,7 +62,7 @@ public class SampleLARBookingLocalServiceImpl
 		return sampleLARBooking;
 	}
 
-	@Override
+
 	public SampleLARBooking deleteSampleLARBooking(long sampleLARBookingId) {
 		SampleLARBooking sampleLARBooking =
 			sampleLARBookingPersistence.fetchByPrimaryKey(sampleLARBookingId);
@@ -71,7 +71,7 @@ public class SampleLARBookingLocalServiceImpl
 			sampleLARBooking);
 	}
 
-	@Override
+
 	@SystemEvent(type = SystemEventConstants.TYPE_DELETE)
 	public SampleLARBooking deleteSampleLARBooking(
 		SampleLARBooking sampleLARBooking) {
@@ -79,7 +79,7 @@ public class SampleLARBookingLocalServiceImpl
 		return sampleLARBookingPersistence.remove(sampleLARBooking);
 	}
 
-	@Override
+
 	public void deleteSampleLARBookings(long groupId) {
 		List<SampleLARBooking> sampleLARBookings =
 			sampleLARBookingPersistence.findByGroupId(groupId);
@@ -90,19 +90,19 @@ public class SampleLARBookingLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public List<SampleLARBooking> getSampleLARBookings(
 		long groupId, int start, int end) {
 
 		return sampleLARBookingPersistence.findByGroupId(groupId, start, end);
 	}
 
-	@Override
+
 	public int getSampleLARBookingsCount(long groupId) {
 		return sampleLARBookingPersistence.countByGroupId(groupId);
 	}
 
-	@Override
+
 	public SampleLARBooking updateSampleLARBooking(
 			long userId, long sampleLARBookingId, String bookingNumber,
 			ServiceContext serviceContext)
diff --git a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/persistence/impl/SampleLARBookingPersistenceImpl.java b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/persistence/impl/SampleLARBookingPersistenceImpl.java
index c4fee097760..3452e89b6a3 100644
--- a/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/persistence/impl/SampleLARBookingPersistenceImpl.java
+++ b/portlets/sample-lar-portlet/docroot/WEB-INF/src/com/liferay/samplelar/service/persistence/impl/SampleLARBookingPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplelar.service.persistence.impl;
@@ -122,7 +122,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param uuid the uuid
 	 * @return the matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid(String uuid) {
 		return findByUuid(uuid, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -139,7 +139,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param end the upper bound of the range of sample l a r bookings (not inclusive)
 	 * @return the range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid(String uuid, int start, int end) {
 		return findByUuid(uuid, start, end, null);
 	}
@@ -157,7 +157,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid(String uuid, int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		return findByUuid(uuid, start, end, orderByComparator, true);
@@ -177,7 +177,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid(String uuid, int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator,
 		boolean retrieveFromCache) {
@@ -302,7 +302,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the first matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByUuid_First(String uuid,
 		OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -332,7 +332,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByUuid_First(String uuid,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		List<SampleLARBooking> list = findByUuid(uuid, 0, 1, orderByComparator);
@@ -352,7 +352,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the last matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByUuid_Last(String uuid,
 		OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -382,7 +382,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByUuid_Last(String uuid,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		int count = countByUuid(uuid);
@@ -410,7 +410,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the previous, current, and next sample l a r booking
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking[] findByUuid_PrevAndNext(long sampleLARBookingId,
 		String uuid, OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -566,7 +566,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 *
 	 * @param uuid the uuid
 	 */
-	@Override
+
 	public void removeByUuid(String uuid) {
 		for (SampleLARBooking sampleLARBooking : findByUuid(uuid,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -580,7 +580,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param uuid the uuid
 	 * @return the number of matching sample l a r bookings
 	 */
-	@Override
+
 	public int countByUuid(String uuid) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID;
 
@@ -662,7 +662,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByUUID_G(String uuid, long groupId)
 		throws NoSuchBookingException {
 		SampleLARBooking sampleLARBooking = fetchByUUID_G(uuid, groupId);
@@ -697,7 +697,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param groupId the group ID
 	 * @return the matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByUUID_G(String uuid, long groupId) {
 		return fetchByUUID_G(uuid, groupId, true);
 	}
@@ -710,7 +710,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByUUID_G(String uuid, long groupId,
 		boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { uuid, groupId };
@@ -815,7 +815,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param groupId the group ID
 	 * @return the sample l a r booking that was removed
 	 */
-	@Override
+
 	public SampleLARBooking removeByUUID_G(String uuid, long groupId)
 		throws NoSuchBookingException {
 		SampleLARBooking sampleLARBooking = findByUUID_G(uuid, groupId);
@@ -830,7 +830,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param groupId the group ID
 	 * @return the number of matching sample l a r bookings
 	 */
-	@Override
+
 	public int countByUUID_G(String uuid, long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_G;
 
@@ -928,7 +928,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param companyId the company ID
 	 * @return the matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid_C(String uuid, long companyId) {
 		return findByUuid_C(uuid, companyId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -947,7 +947,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param end the upper bound of the range of sample l a r bookings (not inclusive)
 	 * @return the range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid_C(String uuid, long companyId,
 		int start, int end) {
 		return findByUuid_C(uuid, companyId, start, end, null);
@@ -967,7 +967,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid_C(String uuid, long companyId,
 		int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
@@ -989,7 +989,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByUuid_C(String uuid, long companyId,
 		int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator,
@@ -1125,7 +1125,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the first matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -1159,7 +1159,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		List<SampleLARBooking> list = findByUuid_C(uuid, companyId, 0, 1,
@@ -1181,7 +1181,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the last matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -1215,7 +1215,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		int count = countByUuid_C(uuid, companyId);
@@ -1244,7 +1244,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the previous, current, and next sample l a r booking
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking[] findByUuid_C_PrevAndNext(
 		long sampleLARBookingId, String uuid, long companyId,
 		OrderByComparator<SampleLARBooking> orderByComparator)
@@ -1406,7 +1406,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param uuid the uuid
 	 * @param companyId the company ID
 	 */
-	@Override
+
 	public void removeByUuid_C(String uuid, long companyId) {
 		for (SampleLARBooking sampleLARBooking : findByUuid_C(uuid, companyId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1421,7 +1421,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param companyId the company ID
 	 * @return the number of matching sample l a r bookings
 	 */
-	@Override
+
 	public int countByUuid_C(String uuid, long companyId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_C;
 
@@ -1517,7 +1517,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param groupId the group ID
 	 * @return the matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByGroupId(long groupId) {
 		return findByGroupId(groupId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1534,7 +1534,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param end the upper bound of the range of sample l a r bookings (not inclusive)
 	 * @return the range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByGroupId(long groupId, int start, int end) {
 		return findByGroupId(groupId, start, end, null);
 	}
@@ -1552,7 +1552,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByGroupId(long groupId, int start,
 		int end, OrderByComparator<SampleLARBooking> orderByComparator) {
 		return findByGroupId(groupId, start, end, orderByComparator, true);
@@ -1572,7 +1572,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findByGroupId(long groupId, int start,
 		int end, OrderByComparator<SampleLARBooking> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1683,7 +1683,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the first matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByGroupId_First(long groupId,
 		OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -1713,7 +1713,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByGroupId_First(long groupId,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		List<SampleLARBooking> list = findByGroupId(groupId, 0, 1,
@@ -1734,7 +1734,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the last matching sample l a r booking
 	 * @throws NoSuchBookingException if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByGroupId_Last(long groupId,
 		OrderByComparator<SampleLARBooking> orderByComparator)
 		throws NoSuchBookingException {
@@ -1764,7 +1764,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching sample l a r booking, or <code>null</code> if a matching sample l a r booking could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByGroupId_Last(long groupId,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		int count = countByGroupId(groupId);
@@ -1792,7 +1792,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the previous, current, and next sample l a r booking
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking[] findByGroupId_PrevAndNext(
 		long sampleLARBookingId, long groupId,
 		OrderByComparator<SampleLARBooking> orderByComparator)
@@ -1935,7 +1935,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 *
 	 * @param groupId the group ID
 	 */
-	@Override
+
 	public void removeByGroupId(long groupId) {
 		for (SampleLARBooking sampleLARBooking : findByGroupId(groupId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1949,7 +1949,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param groupId the group ID
 	 * @return the number of matching sample l a r bookings
 	 */
-	@Override
+
 	public int countByGroupId(long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_GROUPID;
 
@@ -2005,7 +2005,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 *
 	 * @param sampleLARBooking the sample l a r booking
 	 */
-	@Override
+
 	public void cacheResult(SampleLARBooking sampleLARBooking) {
 		entityCache.putResult(SampleLARBookingModelImpl.ENTITY_CACHE_ENABLED,
 			SampleLARBookingImpl.class, sampleLARBooking.getPrimaryKey(),
@@ -2024,7 +2024,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 *
 	 * @param sampleLARBookings the sample l a r bookings
 	 */
-	@Override
+
 	public void cacheResult(List<SampleLARBooking> sampleLARBookings) {
 		for (SampleLARBooking sampleLARBooking : sampleLARBookings) {
 			if (entityCache.getResult(
@@ -2046,7 +2046,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(SampleLARBookingImpl.class);
 
@@ -2062,7 +2062,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(SampleLARBooking sampleLARBooking) {
 		entityCache.removeResult(SampleLARBookingModelImpl.ENTITY_CACHE_ENABLED,
 			SampleLARBookingImpl.class, sampleLARBooking.getPrimaryKey());
@@ -2073,7 +2073,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 		clearUniqueFindersCache((SampleLARBookingModelImpl)sampleLARBooking);
 	}
 
-	@Override
+
 	public void clearCache(List<SampleLARBooking> sampleLARBookings) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -2143,7 +2143,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param sampleLARBookingId the primary key for the new sample l a r booking
 	 * @return the new sample l a r booking
 	 */
-	@Override
+
 	public SampleLARBooking create(long sampleLARBookingId) {
 		SampleLARBooking sampleLARBooking = new SampleLARBookingImpl();
 
@@ -2166,7 +2166,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the sample l a r booking that was removed
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking remove(long sampleLARBookingId)
 		throws NoSuchBookingException {
 		return remove((Serializable)sampleLARBookingId);
@@ -2179,7 +2179,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the sample l a r booking that was removed
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking remove(Serializable primaryKey)
 		throws NoSuchBookingException {
 		Session session = null;
@@ -2212,7 +2212,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 		}
 	}
 
-	@Override
+
 	protected SampleLARBooking removeImpl(SampleLARBooking sampleLARBooking) {
 		sampleLARBooking = toUnwrappedModel(sampleLARBooking);
 
@@ -2244,7 +2244,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 		return sampleLARBooking;
 	}
 
-	@Override
+
 	public SampleLARBooking updateImpl(SampleLARBooking sampleLARBooking) {
 		sampleLARBooking = toUnwrappedModel(sampleLARBooking);
 
@@ -2409,7 +2409,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the sample l a r booking
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchBookingException {
 		SampleLARBooking sampleLARBooking = fetchByPrimaryKey(primaryKey);
@@ -2433,7 +2433,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @return the sample l a r booking
 	 * @throws NoSuchBookingException if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking findByPrimaryKey(long sampleLARBookingId)
 		throws NoSuchBookingException {
 		return findByPrimaryKey((Serializable)sampleLARBookingId);
@@ -2445,7 +2445,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param primaryKey the primary key of the sample l a r booking
 	 * @return the sample l a r booking, or <code>null</code> if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByPrimaryKey(Serializable primaryKey) {
 		SampleLARBooking sampleLARBooking = (SampleLARBooking)entityCache.getResult(SampleLARBookingModelImpl.ENTITY_CACHE_ENABLED,
 				SampleLARBookingImpl.class, primaryKey);
@@ -2492,12 +2492,12 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param sampleLARBookingId the primary key of the sample l a r booking
 	 * @return the sample l a r booking, or <code>null</code> if a sample l a r booking with the primary key could not be found
 	 */
-	@Override
+
 	public SampleLARBooking fetchByPrimaryKey(long sampleLARBookingId) {
 		return fetchByPrimaryKey((Serializable)sampleLARBookingId);
 	}
 
-	@Override
+
 	public Map<Serializable, SampleLARBooking> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -2595,7 +2595,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 *
 	 * @return the sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -2611,7 +2611,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param end the upper bound of the range of sample l a r bookings (not inclusive)
 	 * @return the range of sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -2628,7 +2628,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findAll(int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -2647,7 +2647,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of sample l a r bookings
 	 */
-	@Override
+
 	public List<SampleLARBooking> findAll(int start, int end,
 		OrderByComparator<SampleLARBooking> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2737,7 +2737,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 * Removes all the sample l a r bookings from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (SampleLARBooking sampleLARBooking : findAll()) {
 			remove(sampleLARBooking);
@@ -2749,7 +2749,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 	 *
 	 * @return the number of sample l a r bookings
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -2781,12 +2781,12 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return SampleLARBookingModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -2821,12 +2821,12 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 				"uuid"
 			});
 	private static final SampleLARBooking _nullSampleLARBooking = new SampleLARBookingImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<SampleLARBooking> toCacheModel() {
 				return _nullSampleLARBookingCacheModel;
 			}
@@ -2834,7 +2834,7 @@ public class SampleLARBookingPersistenceImpl extends BasePersistenceImpl<SampleL
 
 	private static final CacheModel<SampleLARBooking> _nullSampleLARBookingCacheModel =
 		new CacheModel<SampleLARBooking>() {
-			@Override
+
 			public SampleLARBooking toEntityModel() {
 				return _nullSampleLARBooking;
 			}
diff --git a/portlets/sample-lar-portlet/docroot/init.jsp b/portlets/sample-lar-portlet/docroot/init.jsp
index 53416ebd3a4..ea86a4df03e 100644
--- a/portlets/sample-lar-portlet/docroot/init.jsp
+++ b/portlets/sample-lar-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-lar-portlet/docroot/view.jsp b/portlets/sample-lar-portlet/docroot/view.jsp
index b458bc547fe..e9382a04eaf 100644
--- a/portlets/sample-lar-portlet/docroot/view.jsp
+++ b/portlets/sample-lar-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-lar-portlet/docroot/view_sample_lar_bookings.jsp b/portlets/sample-lar-portlet/docroot/view_sample_lar_bookings.jsp
index 1f27387f729..7913f9625e4 100644
--- a/portlets/sample-lar-portlet/docroot/view_sample_lar_bookings.jsp
+++ b/portlets/sample-lar-portlet/docroot/view_sample_lar_bookings.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PayPalClassicUtil.java b/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PayPalClassicUtil.java
index 475948bf9b3..4fd4463b26b 100644
--- a/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PayPalClassicUtil.java
+++ b/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PayPalClassicUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplepaypalclassic.util;
diff --git a/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsKeys.java b/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsKeys.java
index e8e460f3d0a..e52deb03cb6 100644
--- a/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsKeys.java
+++ b/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplepaypalclassic.util;
diff --git a/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsValues.java b/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsValues.java
index ed5e4084328..e05d7476875 100644
--- a/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsValues.java
+++ b/portlets/sample-paypal-classic-portlet/docroot/WEB-INF/src/com/liferay/samplepaypalclassic/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplepaypalclassic.util;
diff --git a/portlets/sample-paypal-classic-portlet/docroot/view.jsp b/portlets/sample-paypal-classic-portlet/docroot/view.jsp
index 439740ac53d..7eafc3a0d3a 100644
--- a/portlets/sample-paypal-classic-portlet/docroot/view.jsp
+++ b/portlets/sample-paypal-classic-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-permissions-portlet/docroot/view.jsp b/portlets/sample-permissions-portlet/docroot/view.jsp
index b670cf56d44..e9391893061 100644
--- a/portlets/sample-permissions-portlet/docroot/view.jsp
+++ b/portlets/sample-permissions-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-portal-client-portlet/docroot/view.jsp b/portlets/sample-portal-client-portlet/docroot/view.jsp
index 3ae029386f8..b32ddfb390e 100644
--- a/portlets/sample-portal-client-portlet/docroot/view.jsp
+++ b/portlets/sample-portal-client-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-portal-service-portlet/docroot/view.jsp b/portlets/sample-portal-service-portlet/docroot/view.jsp
index 1e60a5919fc..44e0ef9aa13 100644
--- a/portlets/sample-portal-service-portlet/docroot/view.jsp
+++ b/portlets/sample-portal-service-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/exception/NoSuchFooException.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/exception/NoSuchFooException.java
index 00b53382b9e..ac8928f4fe7 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/exception/NoSuchFooException.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/exception/NoSuchFooException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.exception;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/Foo.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/Foo.java
index 1c545a647e4..e16672053dd 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/Foo.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/Foo.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model;
@@ -38,17 +38,17 @@ public interface Foo extends FooModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.sampleservicebuilder.model.impl.FooImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<Foo, Long> FOO_ID_ACCESSOR = new Accessor<Foo, Long>() {
-			@Override
+
 			public Long get(Foo foo) {
 				return foo.getFooId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<Foo> getTypeClass() {
 				return Foo.class;
 			}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooClp.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooClp.java
index a6ceee59883..4d51eda1a00 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooClp.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model;
@@ -49,37 +49,37 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 	public FooClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Foo.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Foo.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setFooId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -103,7 +103,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -187,12 +187,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public String getUuid() {
 		return _uuid;
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		_uuid = uuid;
 
@@ -210,12 +210,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getFooId() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setFooId(long fooId) {
 		_fooId = fooId;
 
@@ -233,12 +233,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -256,12 +256,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -279,12 +279,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -302,7 +302,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -314,16 +314,16 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -341,12 +341,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -364,12 +364,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -387,12 +387,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public String getField1() {
 		return _field1;
 	}
 
-	@Override
+
 	public void setField1(String field1) {
 		_field1 = field1;
 
@@ -410,17 +410,17 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public boolean getField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public boolean isField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public void setField2(boolean field2) {
 		_field2 = field2;
 
@@ -438,12 +438,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public int getField3() {
 		return _field3;
 	}
 
-	@Override
+
 	public void setField3(int field3) {
 		_field3 = field3;
 
@@ -461,12 +461,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Date getField4() {
 		return _field4;
 	}
 
-	@Override
+
 	public void setField4(Date field4) {
 		_field4 = field4;
 
@@ -484,12 +484,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public String getField5() {
 		return _field5;
 	}
 
-	@Override
+
 	public void setField5(String field5) {
 		_field5 = field5;
 
@@ -507,7 +507,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				Foo.class.getName()));
@@ -562,7 +562,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			FooLocalServiceUtil.addFoo(this);
@@ -572,13 +572,13 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Foo toEscapedModel() {
 		return (Foo)ProxyUtil.newProxyInstance(Foo.class.getClassLoader(),
 			new Class[] { Foo.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		FooClp clone = new FooClp();
 
@@ -599,7 +599,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(Foo foo) {
 		int value = 0;
 
@@ -612,7 +612,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -638,22 +638,22 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(27);
 
@@ -688,7 +688,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(43);
 
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooModel.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooModel.java
index d8f8f239752..565462abbb9 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooModel.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model;
@@ -72,7 +72,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 * @return the uuid of this foo
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUuid();
 
 	/**
@@ -80,7 +80,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param uuid the uuid of this foo
 	 */
-	@Override
+
 	public void setUuid(String uuid);
 
 	/**
@@ -102,7 +102,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @return the group ID of this foo
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -110,7 +110,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param groupId the group ID of this foo
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -118,7 +118,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @return the company ID of this foo
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -126,7 +126,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param companyId the company ID of this foo
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -134,7 +134,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @return the user ID of this foo
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -142,7 +142,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param userId the user ID of this foo
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -150,7 +150,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @return the user uuid of this foo
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -158,7 +158,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param userUuid the user uuid of this foo
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -167,7 +167,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 * @return the user name of this foo
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -175,7 +175,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param userName the user name of this foo
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -183,7 +183,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @return the create date of this foo
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -191,7 +191,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param createDate the create date of this foo
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -199,7 +199,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @return the modified date of this foo
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -207,7 +207,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 *
 	 * @param modifiedDate the modified date of this foo
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -289,60 +289,60 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel,
 	 */
 	public void setField5(String field5);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(Foo foo);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<Foo> toCacheModel();
 
-	@Override
+
 	public Foo toEscapedModel();
 
-	@Override
+
 	public Foo toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooSoap.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooSoap.java
index f875ffa2066..e2339aae42a 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooSoap.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooWrapper.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooWrapper.java
index 08c7c3b9ab0..984ddb62c2c 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooWrapper.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/model/FooWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model;
@@ -45,17 +45,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		_foo = foo;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Foo.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Foo.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -76,7 +76,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -157,12 +157,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		}
 	}
 
-	@Override
+
 	public Foo toEscapedModel() {
 		return new FooWrapper(_foo.toEscapedModel());
 	}
 
-	@Override
+
 	public Foo toUnescapedModel() {
 		return new FooWrapper(_foo.toUnescapedModel());
 	}
@@ -172,17 +172,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field2 of this foo
 	*/
-	@Override
+
 	public boolean getField2() {
 		return _foo.getField2();
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _foo.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _foo.isEscapedModel();
 	}
@@ -192,27 +192,27 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return <code>true</code> if this foo is field2; <code>false</code> otherwise
 	*/
-	@Override
+
 	public boolean isField2() {
 		return _foo.isField2();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _foo.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _foo.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<Foo> toCacheModel() {
 		return _foo.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(Foo foo) {
 		return _foo.compareTo(foo);
 	}
@@ -222,22 +222,22 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field3 of this foo
 	*/
-	@Override
+
 	public int getField3() {
 		return _foo.getField3();
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _foo.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _foo.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new FooWrapper((Foo)_foo.clone());
 	}
@@ -247,7 +247,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field1 of this foo
 	*/
-	@Override
+
 	public java.lang.String getField1() {
 		return _foo.getField1();
 	}
@@ -257,7 +257,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field5 of this foo
 	*/
-	@Override
+
 	public java.lang.String getField5() {
 		return _foo.getField5();
 	}
@@ -267,7 +267,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the user name of this foo
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _foo.getUserName();
 	}
@@ -277,7 +277,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the user uuid of this foo
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _foo.getUserUuid();
 	}
@@ -287,17 +287,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the uuid of this foo
 	*/
-	@Override
+
 	public java.lang.String getUuid() {
 		return _foo.getUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _foo.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _foo.toXmlString();
 	}
@@ -307,7 +307,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the create date of this foo
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _foo.getCreateDate();
 	}
@@ -317,7 +317,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field4 of this foo
 	*/
-	@Override
+
 	public Date getField4() {
 		return _foo.getField4();
 	}
@@ -327,7 +327,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the modified date of this foo
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _foo.getModifiedDate();
 	}
@@ -337,7 +337,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the company ID of this foo
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _foo.getCompanyId();
 	}
@@ -347,7 +347,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the foo ID of this foo
 	*/
-	@Override
+
 	public long getFooId() {
 		return _foo.getFooId();
 	}
@@ -357,7 +357,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the group ID of this foo
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _foo.getGroupId();
 	}
@@ -367,7 +367,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the primary key of this foo
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _foo.getPrimaryKey();
 	}
@@ -377,17 +377,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the user ID of this foo
 	*/
-	@Override
+
 	public long getUserId() {
 		return _foo.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_foo.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_foo.setCachedModel(cachedModel);
 	}
@@ -397,7 +397,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param companyId the company ID of this foo
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_foo.setCompanyId(companyId);
 	}
@@ -407,23 +407,23 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param createDate the create date of this foo
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_foo.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_foo.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_foo.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_foo.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -433,7 +433,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field1 the field1 of this foo
 	*/
-	@Override
+
 	public void setField1(java.lang.String field1) {
 		_foo.setField1(field1);
 	}
@@ -443,7 +443,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field2 the field2 of this foo
 	*/
-	@Override
+
 	public void setField2(boolean field2) {
 		_foo.setField2(field2);
 	}
@@ -453,7 +453,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field3 the field3 of this foo
 	*/
-	@Override
+
 	public void setField3(int field3) {
 		_foo.setField3(field3);
 	}
@@ -463,7 +463,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field4 the field4 of this foo
 	*/
-	@Override
+
 	public void setField4(Date field4) {
 		_foo.setField4(field4);
 	}
@@ -473,7 +473,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field5 the field5 of this foo
 	*/
-	@Override
+
 	public void setField5(java.lang.String field5) {
 		_foo.setField5(field5);
 	}
@@ -483,7 +483,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param fooId the foo ID of this foo
 	*/
-	@Override
+
 	public void setFooId(long fooId) {
 		_foo.setFooId(fooId);
 	}
@@ -493,7 +493,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param groupId the group ID of this foo
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_foo.setGroupId(groupId);
 	}
@@ -503,12 +503,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param modifiedDate the modified date of this foo
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_foo.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_foo.setNew(n);
 	}
@@ -518,12 +518,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param primaryKey the primary key of this foo
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_foo.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_foo.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -533,7 +533,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param userId the user ID of this foo
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_foo.setUserId(userId);
 	}
@@ -543,7 +543,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param userName the user name of this foo
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_foo.setUserName(userName);
 	}
@@ -553,7 +553,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param userUuid the user uuid of this foo
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_foo.setUserUuid(userUuid);
 	}
@@ -563,12 +563,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param uuid the uuid of this foo
 	*/
-	@Override
+
 	public void setUuid(java.lang.String uuid) {
 		_foo.setUuid(uuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -587,27 +587,27 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		return false;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return _foo.getStagedModelType();
 	}
 
-	@Override
+
 	public Foo getWrappedModel() {
 		return _foo;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _foo.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _foo.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_foo.resetOriginalValues();
 	}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/ClpSerializer.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/ClpSerializer.java
index 91a5d0f9f73..5dd0439d05a 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/ClpSerializer.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalService.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalService.java
index 9e9604d7cbd..faf09ba9250 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalService.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
@@ -81,11 +81,11 @@ public interface FooLocalService extends BaseLocalService, InvokableLocalService
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -184,7 +184,7 @@ public interface FooLocalService extends BaseLocalService, InvokableLocalService
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public java.lang.Object getLocalObject() throws java.lang.Exception;
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceClp.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceClp.java
index e28bb7edd8f..7a95b82abcd 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceClp.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
@@ -211,7 +211,7 @@ public class FooLocalServiceClp implements FooLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -234,7 +234,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -257,7 +257,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		Object returnObj = null;
@@ -284,7 +284,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -307,7 +307,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -337,7 +337,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -367,7 +367,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo addFoo(
 		com.liferay.sampleservicebuilder.model.Foo foo) {
 		Object returnObj = null;
@@ -392,7 +392,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo createFoo(long fooId) {
 		Object returnObj = null;
 
@@ -415,7 +415,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo deleteFoo(
 		com.liferay.sampleservicebuilder.model.Foo foo) {
 		Object returnObj = null;
@@ -440,7 +440,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo deleteFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -468,7 +468,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo fetchFoo(long fooId) {
 		Object returnObj = null;
 
@@ -491,7 +491,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo fetchFooByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		Object returnObj = null;
@@ -516,7 +516,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo getFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -544,7 +544,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo getFooByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -574,7 +574,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo updateFoo(
 		com.liferay.sampleservicebuilder.model.Foo foo) {
 		Object returnObj = null;
@@ -599,7 +599,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.sampleservicebuilder.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getField1FoosCount(java.lang.String[] field1s) {
 		Object returnObj = null;
 
@@ -623,7 +623,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getFoosCount() {
 		Object returnObj = null;
 
@@ -646,7 +646,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object getLocalObject() throws java.lang.Exception {
 		Object returnObj = null;
 
@@ -673,14 +673,14 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.lang.Object)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -703,7 +703,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -728,7 +728,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -760,7 +760,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -795,7 +795,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getField1Foos(
 		java.lang.String[] field1s, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> obc) {
@@ -829,7 +829,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos() {
 		Object returnObj = null;
 
@@ -852,7 +852,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos(
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> obc) {
 		Object returnObj = null;
@@ -877,7 +877,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos(
 		int start, int end) {
 		Object returnObj = null;
@@ -901,7 +901,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos(
 		int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> obc) {
@@ -927,7 +927,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoosByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		Object returnObj = null;
@@ -952,7 +952,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoosByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> orderByComparator) {
@@ -988,7 +988,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -1013,7 +1013,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -1043,7 +1043,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void addFoo(java.lang.String field1, boolean field2, int field3,
 		java.util.Date field4, java.lang.String field5,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -1082,7 +1082,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		}
 	}
 
-	@Override
+
 	public void deleteFoos() {
 		try {
 			_invokableLocalService.invokeMethod(_methodName33,
@@ -1101,7 +1101,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		}
 	}
 
-	@Override
+
 	public void updateAsset(long userId,
 		com.liferay.sampleservicebuilder.model.Foo foo,
 		long[] assetCategoryIds, java.lang.String[] assetTagNames)
@@ -1136,7 +1136,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		}
 	}
 
-	@Override
+
 	public void updateFoo(long fooId, java.lang.String field1, boolean field2,
 		int field3, java.util.Date field4, java.lang.String field5,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceUtil.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceUtil.java
index 16c29c32385..b3917174e09 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceUtil.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceWrapper.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceWrapper.java
index 42b2f8d3e6c..a2054738311 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceWrapper.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
@@ -32,23 +32,23 @@ public class FooLocalServiceWrapper implements FooLocalService,
 		_fooLocalService = fooLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _fooLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _fooLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		return _fooLocalService.getExportActionableDynamicQuery(portletDataContext);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _fooLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -56,14 +56,14 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -76,7 +76,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param foo the foo
 	* @return the foo that was added
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo addFoo(
 		com.liferay.sampleservicebuilder.model.Foo foo) {
 		return _fooLocalService.addFoo(foo);
@@ -88,7 +88,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param fooId the primary key for the new foo
 	* @return the new foo
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo createFoo(long fooId) {
 		return _fooLocalService.createFoo(fooId);
 	}
@@ -99,7 +99,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param foo the foo
 	* @return the foo that was removed
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo deleteFoo(
 		com.liferay.sampleservicebuilder.model.Foo foo) {
 		return _fooLocalService.deleteFoo(foo);
@@ -112,13 +112,13 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @return the foo that was removed
 	* @throws PortalException if a foo with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo deleteFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.deleteFoo(fooId);
 	}
 
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo fetchFoo(long fooId) {
 		return _fooLocalService.fetchFoo(fooId);
 	}
@@ -130,7 +130,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param groupId the primary key of the group
 	* @return the matching foo, or <code>null</code> if a matching foo could not be found
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo fetchFooByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		return _fooLocalService.fetchFooByUuidAndGroupId(uuid, groupId);
@@ -143,7 +143,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @return the foo
 	* @throws PortalException if a foo with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo getFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getFoo(fooId);
@@ -157,7 +157,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @return the matching foo
 	* @throws PortalException if a matching foo could not be found
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo getFooByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -170,13 +170,13 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param foo the foo
 	* @return the foo that was updated
 	*/
-	@Override
+
 	public com.liferay.sampleservicebuilder.model.Foo updateFoo(
 		com.liferay.sampleservicebuilder.model.Foo foo) {
 		return _fooLocalService.updateFoo(foo);
 	}
 
-	@Override
+
 	public int getField1FoosCount(java.lang.String[] field1s) {
 		return _fooLocalService.getField1FoosCount(field1s);
 	}
@@ -186,17 +186,17 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	*
 	* @return the number of foos
 	*/
-	@Override
+
 	public int getFoosCount() {
 		return _fooLocalService.getFoosCount();
 	}
 
-	@Override
+
 	public java.lang.Object getLocalObject() throws java.lang.Exception {
 		return _fooLocalService.getLocalObject();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -208,7 +208,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _fooLocalService.getOSGiServiceIdentifier();
 	}
@@ -219,7 +219,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _fooLocalService.dynamicQuery(dynamicQuery);
@@ -237,7 +237,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -257,7 +257,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -266,19 +266,19 @@ public class FooLocalServiceWrapper implements FooLocalService,
 			orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getField1Foos(
 		java.lang.String[] field1s, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> obc) {
 		return _fooLocalService.getField1Foos(field1s, start, end, obc);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos() {
 		return _fooLocalService.getFoos();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos(
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> obc) {
 		return _fooLocalService.getFoos(obc);
@@ -295,13 +295,13 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param end the upper bound of the range of foos (not inclusive)
 	* @return the range of foos
 	*/
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos(
 		int start, int end) {
 		return _fooLocalService.getFoos(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos(
 		int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> obc) {
@@ -315,7 +315,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param companyId the primary key of the company
 	* @return the matching foos, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoosByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		return _fooLocalService.getFoosByUuidAndCompanyId(uuid, companyId);
@@ -331,7 +331,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the range of matching foos, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoosByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.sampleservicebuilder.model.Foo> orderByComparator) {
@@ -345,7 +345,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _fooLocalService.dynamicQueryCount(dynamicQuery);
@@ -358,14 +358,14 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _fooLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public void addFoo(java.lang.String field1, boolean field2, int field3,
 		java.util.Date field4, java.lang.String field5,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -374,12 +374,12 @@ public class FooLocalServiceWrapper implements FooLocalService,
 			serviceContext);
 	}
 
-	@Override
+
 	public void deleteFoos() {
 		_fooLocalService.deleteFoos();
 	}
 
-	@Override
+
 	public void updateAsset(long userId,
 		com.liferay.sampleservicebuilder.model.Foo foo,
 		long[] assetCategoryIds, java.lang.String[] assetTagNames)
@@ -388,7 +388,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 			assetTagNames);
 	}
 
-	@Override
+
 	public void updateFoo(long fooId, java.lang.String field1, boolean field2,
 		int field3, java.util.Date field4, java.lang.String field5,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -397,12 +397,12 @@ public class FooLocalServiceWrapper implements FooLocalService,
 			field5, serviceContext);
 	}
 
-	@Override
+
 	public FooLocalService getWrappedService() {
 		return _fooLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(FooLocalService fooLocalService) {
 		_fooLocalService = fooLocalService;
 	}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooService.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooService.java
index e1a9b93dab3..340a122ca20 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooService.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
@@ -57,7 +57,7 @@ public interface FooService extends BaseService, InvokableService {
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public User getUser(long userId) throws PortalException;
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceClp.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceClp.java
index c5416e0f551..a24a112e808 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceClp.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
@@ -44,7 +44,7 @@ public class FooServiceClp implements FooService {
 		_methodParameterTypes4 = new String[] {  };
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.User getUser(long userId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -72,14 +72,14 @@ public class FooServiceClp implements FooService {
 		return (com.liferay.portal.kernel.model.User)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -102,7 +102,7 @@ public class FooServiceClp implements FooService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos() {
 		Object returnObj = null;
 
@@ -125,7 +125,7 @@ public class FooServiceClp implements FooService {
 		return (java.util.List<com.liferay.sampleservicebuilder.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.portal.kernel.model.Group> getUserSitesGroups()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceUtil.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceUtil.java
index 2906de0003c..6d5dd6c5ee3 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceUtil.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceWrapper.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceWrapper.java
index a78c4488ed2..5bc221272fd 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceWrapper.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/FooServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service;
@@ -32,13 +32,13 @@ public class FooServiceWrapper implements FooService,
 		_fooService = fooService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.User getUser(long userId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooService.getUser(userId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -50,28 +50,28 @@ public class FooServiceWrapper implements FooService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _fooService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.sampleservicebuilder.model.Foo> getFoos() {
 		return _fooService.getFoos();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.portal.kernel.model.Group> getUserSitesGroups()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooService.getUserSitesGroups();
 	}
 
-	@Override
+
 	public FooService getWrappedService() {
 		return _fooService;
 	}
 
-	@Override
+
 	public void setWrappedService(FooService fooService) {
 		_fooService = fooService;
 	}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/messaging/ClpMessageListener.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/messaging/ClpMessageListener.java
index 33b695bf222..b083df08630 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/messaging/ClpMessageListener.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.messaging;
@@ -32,7 +32,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooPersistence.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooPersistence.java
index 1c0d007bb4e..a7e3930f304 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooPersistence.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.persistence;
@@ -746,7 +746,7 @@ public interface FooPersistence extends BasePersistence<Foo> {
 	*/
 	public Foo fetchByPrimaryKey(long fooId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, Foo> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -814,6 +814,6 @@ public interface FooPersistence extends BasePersistence<Foo> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooUtil.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooUtil.java
index 7da8e74c181..2b9cc0f6905 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooUtil.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/service/persistence/FooUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.persistence;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/util/comparator/FooField4Comparator.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/util/comparator/FooField4Comparator.java
index 020b7cafe2a..d65c956b5e2 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/util/comparator/FooField4Comparator.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/service/com/liferay/sampleservicebuilder/util/comparator/FooField4Comparator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.util.comparator;
@@ -35,7 +35,7 @@ public class FooField4Comparator extends OrderByComparator<Foo> {
 		_asc = asc;
 	}
 
-	@Override
+
 	public int compare(Foo foo1, Foo foo2) {
 		int value = DateUtil.compareTo(foo1.getField4(), foo2.getField4());
 
@@ -47,7 +47,7 @@ public class FooField4Comparator extends OrderByComparator<Foo> {
 		}
 	}
 
-	@Override
+
 	public String getOrderBy() {
 		if (_asc) {
 			return ORDER_BY_ASC;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/FooCustomAttributesDisplay.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/FooCustomAttributesDisplay.java
index b71984941a5..57568738aa0 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/FooCustomAttributesDisplay.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/FooCustomAttributesDisplay.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder;
@@ -18,11 +18,11 @@ import com.liferay.expando.kernel.model.BaseCustomAttributesDisplay;
 import com.liferay.sampleservicebuilder.model.Foo;
 
 /**
- * @author Raymond Augé
+ * @author Raymond Aug??
  */
 public class FooCustomAttributesDisplay extends BaseCustomAttributesDisplay {
 
-	@Override
+
 	public String getClassName() {
 		return Foo.class.getName();
 	}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/hook/events/StartupAction.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/hook/events/StartupAction.java
index 707dc7fc0e2..30adbfc62fd 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/hook/events/StartupAction.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/hook/events/StartupAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.hook.events;
@@ -28,11 +28,11 @@ import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.sampleservicebuilder.service.FooLocalServiceUtil;
 
 /**
- * @author Inácio Nery
+ * @author In??cio Nery
  */
 public class StartupAction extends SimpleAction {
 
-	@Override
+
 	public void run(String[] ids) throws ActionException {
 		try {
 			doRun(GetterUtil.getLong(ids[0]));
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooBaseImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooBaseImpl.java
index 8aa98bc9de7..e60a81f2e6e 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooBaseImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model.impl;
@@ -38,7 +38,7 @@ public abstract class FooBaseImpl extends FooModelImpl implements Foo {
 	 *
 	 * Never modify or reference this class directly. All methods that expect a foo model instance should use the {@link Foo} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			FooLocalServiceUtil.addFoo(this);
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooCacheModel.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooCacheModel.java
index 75f03e7bc24..864f8bff3d3 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooCacheModel.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model.impl;
@@ -39,7 +39,7 @@ import java.util.Date;
  */
 @ProviderType
 public class FooCacheModel implements CacheModel<Foo>, Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -58,12 +58,12 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, fooId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(27);
 
@@ -98,7 +98,7 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		return sb.toString();
 	}
 
-	@Override
+
 	public Foo toEntityModel() {
 		FooImpl fooImpl = new FooImpl();
 
@@ -164,7 +164,7 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		return fooImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		uuid = objectInput.readUTF();
 
@@ -187,7 +187,7 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		field5 = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		if (uuid == null) {
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooImpl.java
index 6660c0fde4c..50f80cb118f 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model.impl;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooModelImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooModelImpl.java
index aa96966fdd9..ea5cfd8576a 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooModelImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/model/impl/FooModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.model.impl;
@@ -182,37 +182,37 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	public FooModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setFooId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Foo.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Foo.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -236,7 +236,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -318,7 +318,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public String getUuid() {
 		if (_uuid == null) {
 			return StringPool.BLANK;
@@ -328,7 +328,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		if (_originalUuid == null) {
 			_originalUuid = _uuid;
@@ -342,23 +342,23 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public long getFooId() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setFooId(long fooId) {
 		_fooId = fooId;
 	}
 
 	@JSON
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_columnBitmask |= GROUPID_COLUMN_BITMASK;
 
@@ -376,12 +376,12 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_columnBitmask |= COMPANYID_COLUMN_BITMASK;
 
@@ -399,17 +399,17 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -421,12 +421,12 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
 	@JSON
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -436,24 +436,24 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
 	@JSON
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
 	@JSON
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -462,7 +462,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -470,7 +470,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public String getField1() {
 		if (_field1 == null) {
 			return StringPool.BLANK;
@@ -480,7 +480,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setField1(String field1) {
 		_columnBitmask = -1L;
 
@@ -496,17 +496,17 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public boolean getField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public boolean isField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public void setField2(boolean field2) {
 		_columnBitmask |= FIELD2_COLUMN_BITMASK;
 
@@ -524,29 +524,29 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	}
 
 	@JSON
-	@Override
+
 	public int getField3() {
 		return _field3;
 	}
 
-	@Override
+
 	public void setField3(int field3) {
 		_field3 = field3;
 	}
 
 	@JSON
-	@Override
+
 	public Date getField4() {
 		return _field4;
 	}
 
-	@Override
+
 	public void setField4(Date field4) {
 		_field4 = field4;
 	}
 
 	@JSON
-	@Override
+
 	public String getField5() {
 		if (_field5 == null) {
 			return StringPool.BLANK;
@@ -556,12 +556,12 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setField5(String field5) {
 		_field5 = field5;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				Foo.class.getName()));
@@ -571,20 +571,20 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			Foo.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public Foo toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (Foo)ProxyUtil.newProxyInstance(_classLoader,
@@ -594,7 +594,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		FooImpl fooImpl = new FooImpl();
 
@@ -617,7 +617,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return fooImpl;
 	}
 
-	@Override
+
 	public int compareTo(Foo foo) {
 		int value = 0;
 
@@ -630,7 +630,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -652,22 +652,22 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		FooModelImpl fooModelImpl = this;
 
@@ -692,7 +692,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		fooModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<Foo> toCacheModel() {
 		FooCacheModel fooCacheModel = new FooCacheModel();
 
@@ -770,7 +770,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return fooCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(27);
 
@@ -805,7 +805,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(43);
 
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/portlet/ServiceBuilderPortlet.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/portlet/ServiceBuilderPortlet.java
index 2a936da7ec5..dab578d3ed6 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/portlet/ServiceBuilderPortlet.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/portlet/ServiceBuilderPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.portlet;
@@ -41,7 +41,7 @@ import javax.portlet.PortletException;
  */
 public class ServiceBuilderPortlet extends MVCPortlet {
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceBaseImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceBaseImpl.java
index 21a432c9691..4fe54d822d5 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceBaseImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.base;
@@ -88,7 +88,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Foo addFoo(Foo foo) {
 		foo.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param fooId the primary key for the new foo
 	 * @return the new foo
 	 */
-	@Override
+
 	public Foo createFoo(long fooId) {
 		return fooPersistence.create(fooId);
 	}
@@ -114,7 +114,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a foo with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Foo deleteFoo(long fooId) throws PortalException {
 		return fooPersistence.remove(fooId);
 	}
@@ -126,12 +126,12 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Foo deleteFoo(Foo foo) {
 		return fooPersistence.remove(foo);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -145,7 +145,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return fooPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -162,7 +162,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return fooPersistence.findWithDynamicQuery(dynamicQuery, start, end);
@@ -181,7 +181,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return fooPersistence.findWithDynamicQuery(dynamicQuery, start, end,
@@ -194,7 +194,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return fooPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -206,13 +206,13 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return fooPersistence.countWithDynamicQuery(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public Foo fetchFoo(long fooId) {
 		return fooPersistence.fetchByPrimaryKey(fooId);
 	}
@@ -224,7 +224,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param groupId the primary key of the group
 	 * @return the matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchFooByUuidAndGroupId(String uuid, long groupId) {
 		return fooPersistence.fetchByUUID_G(uuid, groupId);
 	}
@@ -236,12 +236,12 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo
 	 * @throws PortalException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo getFoo(long fooId) throws PortalException {
 		return fooPersistence.findByPrimaryKey(fooId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -254,7 +254,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -276,11 +276,11 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 		actionableDynamicQuery.setPrimaryKeyPropertyName("fooId");
 	}
 
-	@Override
+
 	public ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		final PortletDataContext portletDataContext) {
 		final ExportActionableDynamicQuery exportActionableDynamicQuery = new ExportActionableDynamicQuery() {
-				@Override
+
 				public long performCount() throws PortalException {
 					ManifestSummary manifestSummary = portletDataContext.getManifestSummary();
 
@@ -304,7 +304,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 		initActionableDynamicQuery(exportActionableDynamicQuery);
 
 		exportActionableDynamicQuery.setAddCriteriaMethod(new ActionableDynamicQuery.AddCriteriaMethod() {
-				@Override
+
 				public void addCriteria(DynamicQuery dynamicQuery) {
 					portletDataContext.addDateRangeCriteria(dynamicQuery,
 						"modifiedDate");
@@ -314,7 +314,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 		exportActionableDynamicQuery.setCompanyId(portletDataContext.getCompanyId());
 
 		exportActionableDynamicQuery.setPerformActionMethod(new ActionableDynamicQuery.PerformActionMethod<Foo>() {
-				@Override
+
 				public void performAction(Foo foo) throws PortalException {
 					StagedModelDataHandlerUtil.exportStagedModel(portletDataContext,
 						foo);
@@ -329,13 +329,13 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return fooLocalService.deleteFoo((Foo)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return fooPersistence.findByPrimaryKey(primaryKeyObj);
@@ -348,7 +348,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param companyId the primary key of the company
 	 * @return the matching foos, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<Foo> getFoosByUuidAndCompanyId(String uuid, long companyId) {
 		return fooPersistence.findByUuid_C(uuid, companyId);
 	}
@@ -363,7 +363,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the range of matching foos, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<Foo> getFoosByUuidAndCompanyId(String uuid, long companyId,
 		int start, int end, OrderByComparator<Foo> orderByComparator) {
 		return fooPersistence.findByUuid_C(uuid, companyId, start, end,
@@ -378,7 +378,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the matching foo
 	 * @throws PortalException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo getFooByUuidAndGroupId(String uuid, long groupId)
 		throws PortalException {
 		return fooPersistence.findByUUID_G(uuid, groupId);
@@ -395,7 +395,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of foos
 	 */
-	@Override
+
 	public List<Foo> getFoos(int start, int end) {
 		return fooPersistence.findAll(start, end);
 	}
@@ -405,7 +405,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of foos
 	 */
-	@Override
+
 	public int getFoosCount() {
 		return fooPersistence.countAll();
 	}
@@ -417,7 +417,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Foo updateFoo(Foo foo) {
 		return fooPersistence.update(foo);
 	}
@@ -665,12 +665,12 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return FooLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceClpInvoker.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceClpInvoker.java
index 380a9e7a3c3..c7ee25d5420 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceClpInvoker.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.base;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceBaseImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceBaseImpl.java
index 1f0d64cdb23..ce15fa71fd7 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceBaseImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.base;
@@ -388,12 +388,12 @@ public abstract class FooServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return FooService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceClpInvoker.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceClpInvoker.java
index bbc837bd40d..832b15a2551 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceClpInvoker.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/base/FooServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.base;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceHttp.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceHttp.java
index 9acc98fafcf..1d5a00e2494 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceHttp.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.http;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceSoap.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceSoap.java
index 4e4ba8845be..98d5b2b87fa 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceSoap.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/http/FooServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.http;
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooLocalServiceImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooLocalServiceImpl.java
index ed561a28cff..a2c1245dcdc 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooLocalServiceImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.impl;
@@ -70,7 +70,7 @@ public class FooLocalServiceImpl extends FooLocalServiceBaseImpl {
 			serviceContext.getAssetTagNames());
 	}
 
-	@Override
+
 	public Foo deleteFoo(Foo foo) {
 		try {
 			assetEntryLocalService.deleteEntry(
@@ -82,7 +82,7 @@ public class FooLocalServiceImpl extends FooLocalServiceBaseImpl {
 		return fooPersistence.remove(foo);
 	}
 
-	@Override
+
 	public Foo deleteFoo(long fooId) {
 		Foo foo = fooPersistence.fetchByPrimaryKey(fooId);
 
@@ -93,24 +93,24 @@ public class FooLocalServiceImpl extends FooLocalServiceBaseImpl {
 		return deleteFoo(foo);
 	}
 
-	@Override
+
 	public void deleteFoos() {
 		fooPersistence.removeAll();
 	}
 
-	@Override
+
 	public List<Foo> getField1Foos(
 		String[] field1s, int start, int end, OrderByComparator<Foo> obc) {
 
 		return fooPersistence.findByField1(field1s, start, end, obc);
 	}
 
-	@Override
+
 	public int getField1FoosCount(String[] field1s) {
 		return fooPersistence.countByField1(field1s);
 	}
 
-	@Override
+
 	public List<Foo> getFoos() {
 		return fooPersistence.findAll();
 	}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooServiceImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooServiceImpl.java
index bf1520c5881..4fc1d5e3148 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooServiceImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/impl/FooServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.impl;
@@ -29,7 +29,7 @@ import java.util.List;
  */
 public class FooServiceImpl extends FooServiceBaseImpl {
 
-	@Override
+
 	public List<Foo> getFoos() {
 		return fooLocalService.getFoos();
 	}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/persistence/impl/FooPersistenceImpl.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/persistence/impl/FooPersistenceImpl.java
index da9847fd328..556c6a3a88b 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/persistence/impl/FooPersistenceImpl.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/service/persistence/impl/FooPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.service.persistence.impl;
@@ -122,7 +122,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param uuid the uuid
 	 * @return the matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid(String uuid) {
 		return findByUuid(uuid, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -139,7 +139,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid(String uuid, int start, int end) {
 		return findByUuid(uuid, start, end, null);
 	}
@@ -157,7 +157,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid(String uuid, int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findByUuid(uuid, start, end, orderByComparator, true);
@@ -177,7 +177,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid(String uuid, int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -299,7 +299,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the first matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByUuid_First(String uuid,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByUuid_First(uuid, orderByComparator);
@@ -327,7 +327,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByUuid_First(String uuid,
 		OrderByComparator<Foo> orderByComparator) {
 		List<Foo> list = findByUuid(uuid, 0, 1, orderByComparator);
@@ -347,7 +347,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the last matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByUuid_Last(String uuid,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByUuid_Last(uuid, orderByComparator);
@@ -375,7 +375,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByUuid_Last(String uuid,
 		OrderByComparator<Foo> orderByComparator) {
 		int count = countByUuid(uuid);
@@ -402,7 +402,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the previous, current, and next foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo[] findByUuid_PrevAndNext(long fooId, String uuid,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = findByPrimaryKey(fooId);
@@ -556,7 +556,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param uuid the uuid
 	 */
-	@Override
+
 	public void removeByUuid(String uuid) {
 		for (Foo foo : findByUuid(uuid, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 				null)) {
@@ -570,7 +570,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param uuid the uuid
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByUuid(String uuid) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID;
 
@@ -651,7 +651,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByUUID_G(String uuid, long groupId)
 		throws NoSuchFooException {
 		Foo foo = fetchByUUID_G(uuid, groupId);
@@ -686,7 +686,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param groupId the group ID
 	 * @return the matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByUUID_G(String uuid, long groupId) {
 		return fetchByUUID_G(uuid, groupId, true);
 	}
@@ -699,7 +699,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByUUID_G(String uuid, long groupId,
 		boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { uuid, groupId };
@@ -803,7 +803,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param groupId the group ID
 	 * @return the foo that was removed
 	 */
-	@Override
+
 	public Foo removeByUUID_G(String uuid, long groupId)
 		throws NoSuchFooException {
 		Foo foo = findByUUID_G(uuid, groupId);
@@ -818,7 +818,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param groupId the group ID
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByUUID_G(String uuid, long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_G;
 
@@ -914,7 +914,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param companyId the company ID
 	 * @return the matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid_C(String uuid, long companyId) {
 		return findByUuid_C(uuid, companyId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -933,7 +933,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid_C(String uuid, long companyId, int start,
 		int end) {
 		return findByUuid_C(uuid, companyId, start, end, null);
@@ -953,7 +953,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid_C(String uuid, long companyId, int start,
 		int end, OrderByComparator<Foo> orderByComparator) {
 		return findByUuid_C(uuid, companyId, start, end, orderByComparator, true);
@@ -974,7 +974,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByUuid_C(String uuid, long companyId, int start,
 		int end, OrderByComparator<Foo> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1107,7 +1107,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the first matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByUuid_C_First(uuid, companyId, orderByComparator);
@@ -1139,7 +1139,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<Foo> orderByComparator) {
 		List<Foo> list = findByUuid_C(uuid, companyId, 0, 1, orderByComparator);
@@ -1160,7 +1160,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the last matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByUuid_C_Last(uuid, companyId, orderByComparator);
@@ -1192,7 +1192,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<Foo> orderByComparator) {
 		int count = countByUuid_C(uuid, companyId);
@@ -1221,7 +1221,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the previous, current, and next foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo[] findByUuid_C_PrevAndNext(long fooId, String uuid,
 		long companyId, OrderByComparator<Foo> orderByComparator)
 		throws NoSuchFooException {
@@ -1382,7 +1382,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param uuid the uuid
 	 * @param companyId the company ID
 	 */
-	@Override
+
 	public void removeByUuid_C(String uuid, long companyId) {
 		for (Foo foo : findByUuid_C(uuid, companyId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1397,7 +1397,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param companyId the company ID
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByUuid_C(String uuid, long companyId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_C;
 
@@ -1494,7 +1494,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field1 the field1
 	 * @return the matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String field1) {
 		return findByField1(field1, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1511,7 +1511,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String field1, int start, int end) {
 		return findByField1(field1, start, end, null);
 	}
@@ -1529,7 +1529,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String field1, int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findByField1(field1, start, end, orderByComparator, true);
@@ -1549,7 +1549,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String field1, int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -1671,7 +1671,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the first matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByField1_First(String field1,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByField1_First(field1, orderByComparator);
@@ -1699,7 +1699,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByField1_First(String field1,
 		OrderByComparator<Foo> orderByComparator) {
 		List<Foo> list = findByField1(field1, 0, 1, orderByComparator);
@@ -1719,7 +1719,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the last matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByField1_Last(String field1,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByField1_Last(field1, orderByComparator);
@@ -1747,7 +1747,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByField1_Last(String field1,
 		OrderByComparator<Foo> orderByComparator) {
 		int count = countByField1(field1);
@@ -1775,7 +1775,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the previous, current, and next foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo[] findByField1_PrevAndNext(long fooId, String field1,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = findByPrimaryKey(fooId);
@@ -1935,7 +1935,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field1s the field1s
 	 * @return the matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String[] field1s) {
 		return findByField1(field1s, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1952,7 +1952,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String[] field1s, int start, int end) {
 		return findByField1(field1s, start, end, null);
 	}
@@ -1970,7 +1970,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String[] field1s, int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findByField1(field1s, start, end, orderByComparator, true);
@@ -1990,7 +1990,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField1(String[] field1s, int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		if (field1s == null) {
@@ -2133,7 +2133,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param field1 the field1
 	 */
-	@Override
+
 	public void removeByField1(String field1) {
 		for (Foo foo : findByField1(field1, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -2147,7 +2147,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field1 the field1
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByField1(String field1) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_FIELD1;
 
@@ -2212,7 +2212,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field1s the field1s
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByField1(String[] field1s) {
 		if (field1s == null) {
 			field1s = new String[0];
@@ -2326,7 +2326,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field2 the field2
 	 * @return the matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2) {
 		return findByField2(field2, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -2343,7 +2343,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2, int start, int end) {
 		return findByField2(field2, start, end, null);
 	}
@@ -2361,7 +2361,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2, int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findByField2(field2, start, end, orderByComparator, true);
@@ -2381,7 +2381,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2, int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -2489,7 +2489,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the first matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByField2_First(boolean field2,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByField2_First(field2, orderByComparator);
@@ -2517,7 +2517,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByField2_First(boolean field2,
 		OrderByComparator<Foo> orderByComparator) {
 		List<Foo> list = findByField2(field2, 0, 1, orderByComparator);
@@ -2537,7 +2537,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the last matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByField2_Last(boolean field2,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByField2_Last(field2, orderByComparator);
@@ -2565,7 +2565,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByField2_Last(boolean field2,
 		OrderByComparator<Foo> orderByComparator) {
 		int count = countByField2(field2);
@@ -2593,7 +2593,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the previous, current, and next foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo[] findByField2_PrevAndNext(long fooId, boolean field2,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = findByPrimaryKey(fooId);
@@ -2734,7 +2734,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param field2 the field2
 	 */
-	@Override
+
 	public void removeByField2(boolean field2) {
 		for (Foo foo : findByField2(field2, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -2748,7 +2748,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field2 the field2
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByField2(boolean field2) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_FIELD2;
 
@@ -2804,7 +2804,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param foo the foo
 	 */
-	@Override
+
 	public void cacheResult(Foo foo) {
 		entityCache.putResult(FooModelImpl.ENTITY_CACHE_ENABLED, FooImpl.class,
 			foo.getPrimaryKey(), foo);
@@ -2820,7 +2820,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param foos the foos
 	 */
-	@Override
+
 	public void cacheResult(List<Foo> foos) {
 		for (Foo foo : foos) {
 			if (entityCache.getResult(FooModelImpl.ENTITY_CACHE_ENABLED,
@@ -2840,7 +2840,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(FooImpl.class);
 
@@ -2856,7 +2856,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(Foo foo) {
 		entityCache.removeResult(FooModelImpl.ENTITY_CACHE_ENABLED,
 			FooImpl.class, foo.getPrimaryKey());
@@ -2867,7 +2867,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		clearUniqueFindersCache((FooModelImpl)foo);
 	}
 
-	@Override
+
 	public void clearCache(List<Foo> foos) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -2933,7 +2933,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param fooId the primary key for the new foo
 	 * @return the new foo
 	 */
-	@Override
+
 	public Foo create(long fooId) {
 		Foo foo = new FooImpl();
 
@@ -2956,7 +2956,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo that was removed
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo remove(long fooId) throws NoSuchFooException {
 		return remove((Serializable)fooId);
 	}
@@ -2968,7 +2968,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo that was removed
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo remove(Serializable primaryKey) throws NoSuchFooException {
 		Session session = null;
 
@@ -2999,7 +2999,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		}
 	}
 
-	@Override
+
 	protected Foo removeImpl(Foo foo) {
 		foo = toUnwrappedModel(foo);
 
@@ -3030,7 +3030,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		return foo;
 	}
 
-	@Override
+
 	public Foo updateImpl(Foo foo) {
 		foo = toUnwrappedModel(foo);
 
@@ -3205,7 +3205,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchFooException {
 		Foo foo = fetchByPrimaryKey(primaryKey);
@@ -3229,7 +3229,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo findByPrimaryKey(long fooId) throws NoSuchFooException {
 		return findByPrimaryKey((Serializable)fooId);
 	}
@@ -3240,7 +3240,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param primaryKey the primary key of the foo
 	 * @return the foo, or <code>null</code> if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo fetchByPrimaryKey(Serializable primaryKey) {
 		Foo foo = (Foo)entityCache.getResult(FooModelImpl.ENTITY_CACHE_ENABLED,
 				FooImpl.class, primaryKey);
@@ -3285,12 +3285,12 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param fooId the primary key of the foo
 	 * @return the foo, or <code>null</code> if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo fetchByPrimaryKey(long fooId) {
 		return fetchByPrimaryKey((Serializable)fooId);
 	}
 
-	@Override
+
 	public Map<Serializable, Foo> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -3387,7 +3387,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @return the foos
 	 */
-	@Override
+
 	public List<Foo> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -3403,7 +3403,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of foos
 	 */
-	@Override
+
 	public List<Foo> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -3420,7 +3420,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of foos
 	 */
-	@Override
+
 	public List<Foo> findAll(int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -3439,7 +3439,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of foos
 	 */
-	@Override
+
 	public List<Foo> findAll(int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -3526,7 +3526,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * Removes all the foos from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (Foo foo : findAll()) {
 			remove(foo);
@@ -3538,7 +3538,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @return the number of foos
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -3570,12 +3570,12 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return FooModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -3610,19 +3610,19 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 				"uuid"
 			});
 	private static final Foo _nullFoo = new FooImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<Foo> toCacheModel() {
 				return _nullFooCacheModel;
 			}
 		};
 
 	private static final CacheModel<Foo> _nullFooCacheModel = new CacheModel<Foo>() {
-			@Override
+
 			public Foo toEntityModel() {
 				return _nullFoo;
 			}
diff --git a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/util/LocalObject.java b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/util/LocalObject.java
index 7d6f8a0d3af..45ce2dc1af8 100644
--- a/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/util/LocalObject.java
+++ b/portlets/sample-service-builder-portlet/docroot/WEB-INF/src/com/liferay/sampleservicebuilder/util/LocalObject.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampleservicebuilder.util;
diff --git a/portlets/sample-service-builder-portlet/docroot/edit_foo.jsp b/portlets/sample-service-builder-portlet/docroot/edit_foo.jsp
index 7070815e499..658b4de8601 100644
--- a/portlets/sample-service-builder-portlet/docroot/edit_foo.jsp
+++ b/portlets/sample-service-builder-portlet/docroot/edit_foo.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-service-builder-portlet/docroot/foo_action.jsp b/portlets/sample-service-builder-portlet/docroot/foo_action.jsp
index 9e42104f3e3..7a7c1607408 100644
--- a/portlets/sample-service-builder-portlet/docroot/foo_action.jsp
+++ b/portlets/sample-service-builder-portlet/docroot/foo_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-service-builder-portlet/docroot/init.jsp b/portlets/sample-service-builder-portlet/docroot/init.jsp
index 84666f1e57d..bd8736e8469 100644
--- a/portlets/sample-service-builder-portlet/docroot/init.jsp
+++ b/portlets/sample-service-builder-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-service-builder-portlet/docroot/view.jsp b/portlets/sample-service-builder-portlet/docroot/view.jsp
index 4f69967e3ff..526dc5d6116 100644
--- a/portlets/sample-service-builder-portlet/docroot/view.jsp
+++ b/portlets/sample-service-builder-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-sign-in-portlet/docroot/WEB-INF/src/com/liferay/samplesignin/portlet/SignInPortlet.java b/portlets/sample-sign-in-portlet/docroot/WEB-INF/src/com/liferay/samplesignin/portlet/SignInPortlet.java
index 5bba2841b62..a2c1dca20f6 100644
--- a/portlets/sample-sign-in-portlet/docroot/WEB-INF/src/com/liferay/samplesignin/portlet/SignInPortlet.java
+++ b/portlets/sample-sign-in-portlet/docroot/WEB-INF/src/com/liferay/samplesignin/portlet/SignInPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplesignin.portlet;
@@ -35,7 +35,7 @@ import javax.portlet.PortletException;
  */
 public class SignInPortlet extends MVCPortlet {
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/sample-sign-in-portlet/docroot/view.jsp b/portlets/sample-sign-in-portlet/docroot/view.jsp
index 30635244d28..8b4cc51b489 100644
--- a/portlets/sample-sign-in-portlet/docroot/view.jsp
+++ b/portlets/sample-sign-in-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/SampleException.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/SampleException.java
index 001279dac7a..2e78f7d6251 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/SampleException.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/SampleException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts;
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/model/Book.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/model/Book.java
index cdb50c71b92..b40c1c7c2da 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/model/Book.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/model/Book.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.model;
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/DistributedAttributeServletContextListener.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/DistributedAttributeServletContextListener.java
index 242d8776411..f1b473304bb 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/DistributedAttributeServletContextListener.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/DistributedAttributeServletContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.servlet;
@@ -28,7 +28,7 @@ import javax.servlet.jsp.PageContext;
 public class DistributedAttributeServletContextListener
 	implements ServletContextListener {
 
-	@Override
+
 	public void contextDestroyed(ServletContextEvent servletContextEvent) {
 		DistributedRegistry.unregisterDistributed(
 			PageContext.EXCEPTION, Direction.DUPLEX, MatchType.POSTFIX);
@@ -39,7 +39,7 @@ public class DistributedAttributeServletContextListener
 			"x_param", Direction.DUPLEX, MatchType.POSTFIX);
 	}
 
-	@Override
+
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		DistributedRegistry.registerDistributed(
 			PageContext.EXCEPTION, Direction.DUPLEX, MatchType.POSTFIX);
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/TestSessionServlet.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/TestSessionServlet.java
index 78b2f3acbf4..0552e4bcbc6 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/TestSessionServlet.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/servlet/TestSessionServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.servlet;
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpSession;
  */
 public class TestSessionServlet extends HttpServlet {
 
-	@Override
+
 	public void service(
 			HttpServletRequest request, HttpServletResponse response)
 		throws IOException {
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/NestedAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/NestedAction.java
index 0aeec0855a9..4660da56696 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/NestedAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/NestedAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -34,7 +34,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class NestedAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/SubscribeAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/SubscribeAction.java
index 00d54d7dabb..8fa8b9ea2a2 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/SubscribeAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/SubscribeAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class SubscribeAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UnsubscribeAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UnsubscribeAction.java
index 328e2b3595e..629423b7a59 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UnsubscribeAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UnsubscribeAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class UnsubscribeAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadAction.java
index 0a3777586ab..0e4102a40c6 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -36,7 +36,7 @@ import org.apache.struts.upload.MultipartRequestHandler;
  */
 public class UploadAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadSuccessAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadSuccessAction.java
index ae2244be94b..e97fb1b14ea 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadSuccessAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/UploadSuccessAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -30,7 +30,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class UploadSuccessAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/ViewChartAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/ViewChartAction.java
index 3889cbdcabd..5c2b230121b 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/ViewChartAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/ViewChartAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -47,7 +47,7 @@ import org.jfree.data.general.PieDataset;
  */
 public class ViewChartAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/XAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/XAction.java
index c89c0b09010..a010446d777 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/XAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/action/XAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.action;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class XAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/NestedForm.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/NestedForm.java
index fe550d5f032..2a913ae11bc 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/NestedForm.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/NestedForm.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.form;
@@ -34,7 +34,7 @@ public class NestedForm extends ActionForm {
 		return _books;
 	}
 
-	@Override
+
 	public void reset(ActionMapping actionMapping, HttpServletRequest req) {
 		_books = new ArrayList<>();
 
@@ -45,12 +45,12 @@ public class NestedForm extends ActionForm {
 		_books.add(new Book("5", "Deuteronomy"));
 	}
 
-	@Override
+
 	public String toString() {
 		return _books.toString();
 	}
 
-	@Override
+
 	public ActionErrors validate(
 		ActionMapping actionMapping, HttpServletRequest req) {
 
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/SubscribeForm.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/SubscribeForm.java
index 562a5fa2fa9..19e20c930b1 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/SubscribeForm.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/SubscribeForm.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.form;
@@ -38,7 +38,7 @@ public class SubscribeForm extends ActionForm {
 		return _lastName;
 	}
 
-	@Override
+
 	public void reset(ActionMapping actionMapping, HttpServletRequest req) {
 		_firstName = null;
 		_lastName = null;
@@ -57,12 +57,12 @@ public class SubscribeForm extends ActionForm {
 		_lastName = lastName;
 	}
 
-	@Override
+
 	public String toString() {
 		return _firstName + " " + _lastName + " " + _emailAddress;
 	}
 
-	@Override
+
 	public ActionErrors validate(
 		ActionMapping actionMapping, HttpServletRequest req) {
 
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UnsubscribeForm.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UnsubscribeForm.java
index dc417bb5ea4..c9e1b2ad5d7 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UnsubscribeForm.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UnsubscribeForm.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.form;
@@ -36,7 +36,7 @@ public class UnsubscribeForm extends ValidatorForm {
 		return _lastName;
 	}
 
-	@Override
+
 	public void reset(ActionMapping actionMapping, HttpServletRequest req) {
 		_firstName = null;
 		_lastName = null;
@@ -55,7 +55,7 @@ public class UnsubscribeForm extends ValidatorForm {
 		_lastName = lastName;
 	}
 
-	@Override
+
 	public String toString() {
 		return _firstName + " " + _lastName + " " + _emailAddress;
 	}
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UploadForm.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UploadForm.java
index edaf07b3233..1277c7aaf13 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UploadForm.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/form/UploadForm.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.form;
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/NestedAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/NestedAction.java
index 59d4766b2fb..c491c7afbbc 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/NestedAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/NestedAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class NestedAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/SubscribeAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/SubscribeAction.java
index 68225e99e95..35883ead773 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/SubscribeAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/SubscribeAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class SubscribeAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UnsubscribeAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UnsubscribeAction.java
index 4045de8cc15..f91a16ebf58 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UnsubscribeAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UnsubscribeAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class UnsubscribeAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadAction.java
index 87c6d3d59d7..f2381b0c3e0 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -27,7 +27,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class UploadAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadSuccessAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadSuccessAction.java
index 4dcdd018487..5d24121364a 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadSuccessAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/UploadSuccessAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -30,7 +30,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class UploadSuccessAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/XAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/XAction.java
index 6c60321c94a..cf0b462620e 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/XAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/XAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class XAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/YAction.java b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/YAction.java
index 2780fffded6..d6ecbeb3cd3 100644
--- a/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/YAction.java
+++ b/portlets/sample-struts-portlet/docroot/WEB-INF/src/com/liferay/samplestruts/struts/render/YAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.samplestruts.struts.render;
@@ -30,7 +30,7 @@ import org.apache.struts.action.ActionMapping;
  */
 public class YAction extends Action {
 
-	@Override
+
 	public ActionForward execute(
 			ActionMapping actionMapping, ActionForm actionForm,
 			HttpServletRequest request, HttpServletResponse response)
diff --git a/portlets/sample-struts-portlet/docroot/html/common/error.jsp b/portlets/sample-struts-portlet/docroot/html/common/error.jsp
index e97241094a1..9449b62d2a7 100644
--- a/portlets/sample-struts-portlet/docroot/html/common/error.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/common/error.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/edit.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/edit.jsp
index bab7af7362b..a2bef975d92 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/edit.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/edit.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/help.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/help.jsp
index d5cefdb8575..d05293c447e 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/help.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/help.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/init.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/init.jsp
index 7d315dee10b..56aaf37709f 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/init.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nav.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nav.jsp
index 820d65d6482..9ca00b568f8 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nav.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nav.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested.jsp
index 6012b18f263..32a06cd0c37 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested_success.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested_success.jsp
index 8d8a6b7185b..d2ea2036750 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested_success.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/nested_success.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/sample_exception.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/sample_exception.jsp
index a2b0c9acf9c..a22acfbe359 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/sample_exception.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/sample_exception.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe.jsp
index b9f5d3d45e1..817ff1aca93 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe_success.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe_success.jsp
index 3dc4d9b3267..11f111eb2d1 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe_success.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/subscribe_success.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/template.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/template.jsp
index ed5f558ec01..94fba2f3bea 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/template.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/template.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe.jsp
index 79166c0c350..d2c0de5e672 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe_success.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe_success.jsp
index 6b82974e7d3..57f3a857435 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe_success.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/unsubscribe_success.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload.jsp
index 92ada078f66..9e0600c7c11 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload_success.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload_success.jsp
index e9805655a55..056c13e441e 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload_success.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/upload_success.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/view.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/view.jsp
index b9a4267902e..ac4d8ca9d72 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/view.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/x.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/x.jsp
index 2c58be49e67..cbd51c5727c 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/x.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/x.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/y.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/y.jsp
index 2b1ec156a3f..23d7d5a03e6 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/y.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/y.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/z.jsp b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/z.jsp
index bec4e0cbdb0..63efaa08294 100644
--- a/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/z.jsp
+++ b/portlets/sample-struts-portlet/docroot/html/portlet/sample_struts_portlet/z.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/Book.java b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/Book.java
index 9feaf10ad70..95c079bf52b 100644
--- a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/Book.java
+++ b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/Book.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampletapestry.bean;
diff --git a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/BookList.java b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/BookList.java
index f9cc2231aa4..2435dfcc644 100644
--- a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/BookList.java
+++ b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/bean/BookList.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampletapestry.bean;
diff --git a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/AddBook.java b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/AddBook.java
index 3f7e07e8bc0..454ee7a4bfa 100644
--- a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/AddBook.java
+++ b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/AddBook.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampletapestry.page;
diff --git a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/View.java b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/View.java
index a046fec70ea..843cb746590 100644
--- a/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/View.java
+++ b/portlets/sample-tapestry-portlet/docroot/WEB-INF/src/com/liferay/sampletapestry/page/View.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.sampletapestry.page;
diff --git a/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced.jsp b/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced.jsp
index 27bb6db95e1..ccf1a5b99d5 100644
--- a/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced.jsp
+++ b/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_column.jsp b/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_column.jsp
index a621f5d9ff7..4b3a3a271f0 100644
--- a/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_column.jsp
+++ b/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_column.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_user_display.jsp b/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_user_display.jsp
index b97dfb85917..76c107ac13e 100644
--- a/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_user_display.jsp
+++ b/portlets/sample-ui-search-container-taglib-portlet/docroot/advanced_user_display.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-search-container-taglib-portlet/docroot/basic.jsp b/portlets/sample-ui-search-container-taglib-portlet/docroot/basic.jsp
index f0e6d6e962d..e6737e4ba75 100644
--- a/portlets/sample-ui-search-container-taglib-portlet/docroot/basic.jsp
+++ b/portlets/sample-ui-search-container-taglib-portlet/docroot/basic.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-search-container-taglib-portlet/docroot/init.jsp b/portlets/sample-ui-search-container-taglib-portlet/docroot/init.jsp
index fa6c38472a9..ed8f6915d6f 100644
--- a/portlets/sample-ui-search-container-taglib-portlet/docroot/init.jsp
+++ b/portlets/sample-ui-search-container-taglib-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-search-container-taglib-portlet/docroot/view.jsp b/portlets/sample-ui-search-container-taglib-portlet/docroot/view.jsp
index e81b397f778..7aff2250740 100644
--- a/portlets/sample-ui-search-container-taglib-portlet/docroot/view.jsp
+++ b/portlets/sample-ui-search-container-taglib-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-taglibs-portlet/docroot/init.jsp b/portlets/sample-ui-taglibs-portlet/docroot/init.jsp
index 42143d0b1a3..ffe22d24f84 100644
--- a/portlets/sample-ui-taglibs-portlet/docroot/init.jsp
+++ b/portlets/sample-ui-taglibs-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-taglibs-portlet/docroot/tabs.jsp b/portlets/sample-ui-taglibs-portlet/docroot/tabs.jsp
index 034a6f59200..ac3277d55b3 100644
--- a/portlets/sample-ui-taglibs-portlet/docroot/tabs.jsp
+++ b/portlets/sample-ui-taglibs-portlet/docroot/tabs.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-taglibs-portlet/docroot/toggle.jsp b/portlets/sample-ui-taglibs-portlet/docroot/toggle.jsp
index dd67ea6f35a..a0ba55d7d4e 100644
--- a/portlets/sample-ui-taglibs-portlet/docroot/toggle.jsp
+++ b/portlets/sample-ui-taglibs-portlet/docroot/toggle.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/sample-ui-taglibs-portlet/docroot/view.jsp b/portlets/sample-ui-taglibs-portlet/docroot/view.jsp
index 967d164b3a4..e9017cf8540 100644
--- a/portlets/sample-ui-taglibs-portlet/docroot/view.jsp
+++ b/portlets/sample-ui-taglibs-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAActionException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAActionException.java
index 373aea265e1..1dd98511dbe 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAActionException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAActionException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeGroupException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeGroupException.java
index 71f6bcade13..3612ecd37f1 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeGroupException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeGroupException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeItemException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeItemException.java
index 2a501262a6f..bea048a727d 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeItemException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAChangeItemException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAIssueException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAIssueException.java
index a5e01a3f16c..8977aa1a5c9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAIssueException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAIssueException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAProjectException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAProjectException.java
index 63660395f0c..b6ca6ca1870 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAProjectException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchJIRAProjectException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRepositoryException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRepositoryException.java
index adf29c1929a..f60e29d1646 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRepositoryException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRepositoryException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRevisionException.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRevisionException.java
index 2b9d7998470..594c15c61a8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRevisionException.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/exception/NoSuchSVNRevisionException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.exception;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAAction.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAAction.java
index b23346c1fc4..547ad77c568 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAAction.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -38,17 +38,17 @@ public interface JIRAAction extends JIRAActionModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.socialcoding.model.impl.JIRAActionImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<JIRAAction, Long> JIRA_ACTION_ID_ACCESSOR = new Accessor<JIRAAction, Long>() {
-			@Override
+
 			public Long get(JIRAAction jiraAction) {
 				return jiraAction.getJiraActionId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<JIRAAction> getTypeClass() {
 				return JIRAAction.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionClp.java
index 87d214a8fee..fbdb4a56105 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -44,37 +44,37 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 	public JIRAActionClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAAction.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAAction.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraActionId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraActionId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraActionId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -93,7 +93,7 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraActionId = (Long)attributes.get("jiraActionId");
 
@@ -147,12 +147,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getJiraActionId() {
 		return _jiraActionId;
 	}
 
-	@Override
+
 	public void setJiraActionId(long jiraActionId) {
 		_jiraActionId = jiraActionId;
 
@@ -170,12 +170,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public String getJiraUserId() {
 		return _jiraUserId;
 	}
 
-	@Override
+
 	public void setJiraUserId(String jiraUserId) {
 		_jiraUserId = jiraUserId;
 
@@ -193,12 +193,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -216,12 +216,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -239,12 +239,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraIssueId = jiraIssueId;
 
@@ -262,12 +262,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public String getType() {
 		return _type;
 	}
 
-	@Override
+
 	public void setType(String type) {
 		_type = type;
 
@@ -285,12 +285,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public String getBody() {
 		return _body;
 	}
 
-	@Override
+
 	public void setBody(String body) {
 		_body = body;
 
@@ -308,12 +308,12 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public String getJiraGroupName() {
 		return _jiraGroupName;
 	}
 
-	@Override
+
 	public void setJiraGroupName(String jiraGroupName) {
 		_jiraGroupName = jiraGroupName;
 
@@ -380,7 +380,7 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAActionLocalServiceUtil.addJIRAAction(this);
@@ -390,13 +390,13 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public JIRAAction toEscapedModel() {
 		return (JIRAAction)ProxyUtil.newProxyInstance(JIRAAction.class.getClassLoader(),
 			new Class[] { JIRAAction.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAActionClp clone = new JIRAActionClp();
 
@@ -412,7 +412,7 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(JIRAAction jiraAction) {
 		int value = 0;
 
@@ -428,7 +428,7 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -454,22 +454,22 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(17);
 
@@ -494,7 +494,7 @@ public class JIRAActionClp extends BaseModelImpl<JIRAAction>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(28);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionModel.java
index 874be87f590..c230b3c488a 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -178,60 +178,60 @@ public interface JIRAActionModel extends BaseModel<JIRAAction> {
 	 */
 	public void setJiraGroupName(String jiraGroupName);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.JIRAAction jiraAction);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.JIRAAction> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionSoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionSoap.java
index 2c9b2df83d1..1d77c21c9b4 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionSoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionWrapper.java
index 2ec782819a7..2ac7c08424f 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAActionWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,17 +43,17 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 		_jiraAction = jiraAction;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAAction.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAAction.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -69,7 +69,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraActionId = (Long)attributes.get("jiraActionId");
 
@@ -120,57 +120,57 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _jiraAction.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _jiraAction.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _jiraAction.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _jiraAction.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.JIRAAction> toCacheModel() {
 		return _jiraAction.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction toEscapedModel() {
 		return new JIRAActionWrapper(_jiraAction.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction toUnescapedModel() {
 		return new JIRAActionWrapper(_jiraAction.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		return _jiraAction.compareTo(jiraAction);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _jiraAction.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraAction.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new JIRAActionWrapper((JIRAAction)_jiraAction.clone());
 	}
@@ -180,7 +180,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the body of this j i r a action
 	*/
-	@Override
+
 	public java.lang.String getBody() {
 		return _jiraAction.getBody();
 	}
@@ -190,7 +190,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the jira group name of this j i r a action
 	*/
-	@Override
+
 	public java.lang.String getJiraGroupName() {
 		return _jiraAction.getJiraGroupName();
 	}
@@ -200,7 +200,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the jira user ID of this j i r a action
 	*/
-	@Override
+
 	public java.lang.String getJiraUserId() {
 		return _jiraAction.getJiraUserId();
 	}
@@ -210,17 +210,17 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the type of this j i r a action
 	*/
-	@Override
+
 	public java.lang.String getType() {
 		return _jiraAction.getType();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _jiraAction.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _jiraAction.toXmlString();
 	}
@@ -230,7 +230,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the create date of this j i r a action
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _jiraAction.getCreateDate();
 	}
@@ -240,7 +240,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the modified date of this j i r a action
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _jiraAction.getModifiedDate();
 	}
@@ -250,7 +250,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the jira action ID of this j i r a action
 	*/
-	@Override
+
 	public long getJiraActionId() {
 		return _jiraAction.getJiraActionId();
 	}
@@ -260,7 +260,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the jira issue ID of this j i r a action
 	*/
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraAction.getJiraIssueId();
 	}
@@ -270,12 +270,12 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @return the primary key of this j i r a action
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraAction.getPrimaryKey();
 	}
 
-	@Override
+
 	public void persist() {
 		_jiraAction.persist();
 	}
@@ -285,12 +285,12 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param body the body of this j i r a action
 	*/
-	@Override
+
 	public void setBody(java.lang.String body) {
 		_jiraAction.setBody(body);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_jiraAction.setCachedModel(cachedModel);
 	}
@@ -300,23 +300,23 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param createDate the create date of this j i r a action
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_jiraAction.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_jiraAction.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_jiraAction.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_jiraAction.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -326,7 +326,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param jiraActionId the jira action ID of this j i r a action
 	*/
-	@Override
+
 	public void setJiraActionId(long jiraActionId) {
 		_jiraAction.setJiraActionId(jiraActionId);
 	}
@@ -336,7 +336,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param jiraGroupName the jira group name of this j i r a action
 	*/
-	@Override
+
 	public void setJiraGroupName(java.lang.String jiraGroupName) {
 		_jiraAction.setJiraGroupName(jiraGroupName);
 	}
@@ -346,7 +346,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param jiraIssueId the jira issue ID of this j i r a action
 	*/
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraAction.setJiraIssueId(jiraIssueId);
 	}
@@ -356,7 +356,7 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param jiraUserId the jira user ID of this j i r a action
 	*/
-	@Override
+
 	public void setJiraUserId(java.lang.String jiraUserId) {
 		_jiraAction.setJiraUserId(jiraUserId);
 	}
@@ -366,12 +366,12 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param modifiedDate the modified date of this j i r a action
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_jiraAction.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_jiraAction.setNew(n);
 	}
@@ -381,12 +381,12 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param primaryKey the primary key of this j i r a action
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_jiraAction.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_jiraAction.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -396,12 +396,12 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 	*
 	* @param type the type of this j i r a action
 	*/
-	@Override
+
 	public void setType(java.lang.String type) {
 		_jiraAction.setType(type);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -420,22 +420,22 @@ public class JIRAActionWrapper implements JIRAAction, ModelWrapper<JIRAAction> {
 		return false;
 	}
 
-	@Override
+
 	public JIRAAction getWrappedModel() {
 		return _jiraAction;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _jiraAction.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _jiraAction.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_jiraAction.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroup.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroup.java
index 4a5da178bd1..c6b4e4b3b0e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroup.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroup.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -39,17 +39,17 @@ public interface JIRAChangeGroup extends JIRAChangeGroupModel, PersistedModel {
 	 */
 	public static final Accessor<JIRAChangeGroup, Long> JIRA_CHANGE_GROUP_ID_ACCESSOR =
 		new Accessor<JIRAChangeGroup, Long>() {
-			@Override
+
 			public Long get(JIRAChangeGroup jiraChangeGroup) {
 				return jiraChangeGroup.getJiraChangeGroupId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<JIRAChangeGroup> getTypeClass() {
 				return JIRAChangeGroup.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupClp.java
index ff3a11b00a4..6c14cf32498 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -44,37 +44,37 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 	public JIRAChangeGroupClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAChangeGroup.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAChangeGroup.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraChangeGroupId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -89,7 +89,7 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraChangeGroupId = (Long)attributes.get("jiraChangeGroupId");
 
@@ -119,12 +119,12 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getJiraChangeGroupId() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setJiraChangeGroupId(long jiraChangeGroupId) {
 		_jiraChangeGroupId = jiraChangeGroupId;
 
@@ -143,12 +143,12 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public String getJiraUserId() {
 		return _jiraUserId;
 	}
 
-	@Override
+
 	public void setJiraUserId(String jiraUserId) {
 		_jiraUserId = jiraUserId;
 
@@ -166,12 +166,12 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -189,12 +189,12 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraIssueId = jiraIssueId;
 
@@ -262,7 +262,7 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAChangeGroupLocalServiceUtil.addJIRAChangeGroup(this);
@@ -272,14 +272,14 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public JIRAChangeGroup toEscapedModel() {
 		return (JIRAChangeGroup)ProxyUtil.newProxyInstance(JIRAChangeGroup.class.getClassLoader(),
 			new Class[] { JIRAChangeGroup.class },
 			new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAChangeGroupClp clone = new JIRAChangeGroupClp();
 
@@ -291,7 +291,7 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(JIRAChangeGroup jiraChangeGroup) {
 		int value = 0;
 
@@ -307,7 +307,7 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -333,22 +333,22 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(9);
 
@@ -365,7 +365,7 @@ public class JIRAChangeGroupClp extends BaseModelImpl<JIRAChangeGroup>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(16);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupModel.java
index 7cef91af66b..9ee202297b9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -119,61 +119,61 @@ public interface JIRAChangeGroupModel extends BaseModel<JIRAChangeGroup> {
 	 */
 	public void setJiraIssueId(long jiraIssueId);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.JIRAChangeGroup> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupSoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupSoap.java
index a409e030d24..ac8b06144fc 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupSoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupWrapper.java
index 4463814f7c2..babaead3cb9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeGroupWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -44,17 +44,17 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 		_jiraChangeGroup = jiraChangeGroup;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAChangeGroup.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAChangeGroup.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -66,7 +66,7 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraChangeGroupId = (Long)attributes.get("jiraChangeGroupId");
 
@@ -93,58 +93,58 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _jiraChangeGroup.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _jiraChangeGroup.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _jiraChangeGroup.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _jiraChangeGroup.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.JIRAChangeGroup> toCacheModel() {
 		return _jiraChangeGroup.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup toEscapedModel() {
 		return new JIRAChangeGroupWrapper(_jiraChangeGroup.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup toUnescapedModel() {
 		return new JIRAChangeGroupWrapper(_jiraChangeGroup.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		return _jiraChangeGroup.compareTo(jiraChangeGroup);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _jiraChangeGroup.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraChangeGroup.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new JIRAChangeGroupWrapper((JIRAChangeGroup)_jiraChangeGroup.clone());
 	}
@@ -154,17 +154,17 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @return the jira user ID of this j i r a change group
 	*/
-	@Override
+
 	public java.lang.String getJiraUserId() {
 		return _jiraChangeGroup.getJiraUserId();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _jiraChangeGroup.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _jiraChangeGroup.toXmlString();
 	}
@@ -174,7 +174,7 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @return the create date of this j i r a change group
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _jiraChangeGroup.getCreateDate();
 	}
@@ -184,7 +184,7 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @return the jira change group ID of this j i r a change group
 	*/
-	@Override
+
 	public long getJiraChangeGroupId() {
 		return _jiraChangeGroup.getJiraChangeGroupId();
 	}
@@ -194,7 +194,7 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @return the jira issue ID of this j i r a change group
 	*/
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraChangeGroup.getJiraIssueId();
 	}
@@ -204,17 +204,17 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @return the primary key of this j i r a change group
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraChangeGroup.getPrimaryKey();
 	}
 
-	@Override
+
 	public void persist() {
 		_jiraChangeGroup.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_jiraChangeGroup.setCachedModel(cachedModel);
 	}
@@ -224,23 +224,23 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @param createDate the create date of this j i r a change group
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_jiraChangeGroup.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_jiraChangeGroup.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_jiraChangeGroup.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_jiraChangeGroup.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -250,7 +250,7 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @param jiraChangeGroupId the jira change group ID of this j i r a change group
 	*/
-	@Override
+
 	public void setJiraChangeGroupId(long jiraChangeGroupId) {
 		_jiraChangeGroup.setJiraChangeGroupId(jiraChangeGroupId);
 	}
@@ -260,7 +260,7 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @param jiraIssueId the jira issue ID of this j i r a change group
 	*/
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraChangeGroup.setJiraIssueId(jiraIssueId);
 	}
@@ -270,12 +270,12 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @param jiraUserId the jira user ID of this j i r a change group
 	*/
-	@Override
+
 	public void setJiraUserId(java.lang.String jiraUserId) {
 		_jiraChangeGroup.setJiraUserId(jiraUserId);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_jiraChangeGroup.setNew(n);
 	}
@@ -285,17 +285,17 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 	*
 	* @param primaryKey the primary key of this j i r a change group
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_jiraChangeGroup.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_jiraChangeGroup.setPrimaryKeyObj(primaryKeyObj);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -315,22 +315,22 @@ public class JIRAChangeGroupWrapper implements JIRAChangeGroup,
 		return false;
 	}
 
-	@Override
+
 	public JIRAChangeGroup getWrappedModel() {
 		return _jiraChangeGroup;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _jiraChangeGroup.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _jiraChangeGroup.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_jiraChangeGroup.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItem.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItem.java
index 55c80b53d7b..bc73201055f 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItem.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -39,17 +39,17 @@ public interface JIRAChangeItem extends JIRAChangeItemModel, PersistedModel {
 	 */
 	public static final Accessor<JIRAChangeItem, Long> JIRA_CHANGE_ITEM_ID_ACCESSOR =
 		new Accessor<JIRAChangeItem, Long>() {
-			@Override
+
 			public Long get(JIRAChangeItem jiraChangeItem) {
 				return jiraChangeItem.getJiraChangeItemId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<JIRAChangeItem> getTypeClass() {
 				return JIRAChangeItem.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemClp.java
index f9dad52b29a..0b732f06d11 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -42,37 +42,37 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 	public JIRAChangeItemClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAChangeItem.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAChangeItem.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraChangeItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraChangeItemId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraChangeItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -90,7 +90,7 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraChangeItemId = (Long)attributes.get("jiraChangeItemId");
 
@@ -138,12 +138,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getJiraChangeItemId() {
 		return _jiraChangeItemId;
 	}
 
-	@Override
+
 	public void setJiraChangeItemId(long jiraChangeItemId) {
 		_jiraChangeItemId = jiraChangeItemId;
 
@@ -162,12 +162,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public long getJiraChangeGroupId() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setJiraChangeGroupId(long jiraChangeGroupId) {
 		_jiraChangeGroupId = jiraChangeGroupId;
 
@@ -186,12 +186,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public String getField() {
 		return _field;
 	}
 
-	@Override
+
 	public void setField(String field) {
 		_field = field;
 
@@ -209,12 +209,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public String getOldValue() {
 		return _oldValue;
 	}
 
-	@Override
+
 	public void setOldValue(String oldValue) {
 		_oldValue = oldValue;
 
@@ -232,12 +232,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public String getOldString() {
 		return _oldString;
 	}
 
-	@Override
+
 	public void setOldString(String oldString) {
 		_oldString = oldString;
 
@@ -255,12 +255,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public String getNewValue() {
 		return _newValue;
 	}
 
-	@Override
+
 	public void setNewValue(String newValue) {
 		_newValue = newValue;
 
@@ -278,12 +278,12 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public String getNewString() {
 		return _newString;
 	}
 
-	@Override
+
 	public void setNewString(String newString) {
 		_newString = newString;
 
@@ -351,7 +351,7 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAChangeItemLocalServiceUtil.addJIRAChangeItem(this);
@@ -361,14 +361,14 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public JIRAChangeItem toEscapedModel() {
 		return (JIRAChangeItem)ProxyUtil.newProxyInstance(JIRAChangeItem.class.getClassLoader(),
 			new Class[] { JIRAChangeItem.class },
 			new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAChangeItemClp clone = new JIRAChangeItemClp();
 
@@ -383,7 +383,7 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(JIRAChangeItem jiraChangeItem) {
 		long primaryKey = jiraChangeItem.getPrimaryKey();
 
@@ -398,7 +398,7 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -424,22 +424,22 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(15);
 
@@ -462,7 +462,7 @@ public class JIRAChangeItemClp extends BaseModelImpl<JIRAChangeItem>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(25);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemModel.java
index 7e542474428..f5fec2ee272 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -163,61 +163,61 @@ public interface JIRAChangeItemModel extends BaseModel<JIRAChangeItem> {
 	 */
 	public void setNewString(String newString);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.JIRAChangeItem> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemSoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemSoap.java
index 4bc2b9809bb..675a4364fa2 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemSoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemWrapper.java
index fceb5ad350b..592eac6c0f6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAChangeItemWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,17 +43,17 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 		_jiraChangeItem = jiraChangeItem;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAChangeItem.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAChangeItem.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -68,7 +68,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraChangeItemId = (Long)attributes.get("jiraChangeItemId");
 
@@ -113,58 +113,58 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _jiraChangeItem.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _jiraChangeItem.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _jiraChangeItem.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _jiraChangeItem.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.JIRAChangeItem> toCacheModel() {
 		return _jiraChangeItem.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem toEscapedModel() {
 		return new JIRAChangeItemWrapper(_jiraChangeItem.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem toUnescapedModel() {
 		return new JIRAChangeItemWrapper(_jiraChangeItem.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		return _jiraChangeItem.compareTo(jiraChangeItem);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _jiraChangeItem.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraChangeItem.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new JIRAChangeItemWrapper((JIRAChangeItem)_jiraChangeItem.clone());
 	}
@@ -174,7 +174,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the field of this j i r a change item
 	*/
-	@Override
+
 	public java.lang.String getField() {
 		return _jiraChangeItem.getField();
 	}
@@ -184,7 +184,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the new string of this j i r a change item
 	*/
-	@Override
+
 	public java.lang.String getNewString() {
 		return _jiraChangeItem.getNewString();
 	}
@@ -194,7 +194,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the new value of this j i r a change item
 	*/
-	@Override
+
 	public java.lang.String getNewValue() {
 		return _jiraChangeItem.getNewValue();
 	}
@@ -204,7 +204,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the old string of this j i r a change item
 	*/
-	@Override
+
 	public java.lang.String getOldString() {
 		return _jiraChangeItem.getOldString();
 	}
@@ -214,17 +214,17 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the old value of this j i r a change item
 	*/
-	@Override
+
 	public java.lang.String getOldValue() {
 		return _jiraChangeItem.getOldValue();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _jiraChangeItem.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _jiraChangeItem.toXmlString();
 	}
@@ -234,7 +234,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the jira change group ID of this j i r a change item
 	*/
-	@Override
+
 	public long getJiraChangeGroupId() {
 		return _jiraChangeItem.getJiraChangeGroupId();
 	}
@@ -244,7 +244,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the jira change item ID of this j i r a change item
 	*/
-	@Override
+
 	public long getJiraChangeItemId() {
 		return _jiraChangeItem.getJiraChangeItemId();
 	}
@@ -254,33 +254,33 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @return the primary key of this j i r a change item
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraChangeItem.getPrimaryKey();
 	}
 
-	@Override
+
 	public void persist() {
 		_jiraChangeItem.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_jiraChangeItem.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_jiraChangeItem.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_jiraChangeItem.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_jiraChangeItem.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -290,7 +290,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param field the field of this j i r a change item
 	*/
-	@Override
+
 	public void setField(java.lang.String field) {
 		_jiraChangeItem.setField(field);
 	}
@@ -300,7 +300,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param jiraChangeGroupId the jira change group ID of this j i r a change item
 	*/
-	@Override
+
 	public void setJiraChangeGroupId(long jiraChangeGroupId) {
 		_jiraChangeItem.setJiraChangeGroupId(jiraChangeGroupId);
 	}
@@ -310,12 +310,12 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param jiraChangeItemId the jira change item ID of this j i r a change item
 	*/
-	@Override
+
 	public void setJiraChangeItemId(long jiraChangeItemId) {
 		_jiraChangeItem.setJiraChangeItemId(jiraChangeItemId);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_jiraChangeItem.setNew(n);
 	}
@@ -325,7 +325,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param newString the new string of this j i r a change item
 	*/
-	@Override
+
 	public void setNewString(java.lang.String newString) {
 		_jiraChangeItem.setNewString(newString);
 	}
@@ -335,7 +335,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param newValue the new value of this j i r a change item
 	*/
-	@Override
+
 	public void setNewValue(java.lang.String newValue) {
 		_jiraChangeItem.setNewValue(newValue);
 	}
@@ -345,7 +345,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param oldString the old string of this j i r a change item
 	*/
-	@Override
+
 	public void setOldString(java.lang.String oldString) {
 		_jiraChangeItem.setOldString(oldString);
 	}
@@ -355,7 +355,7 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param oldValue the old value of this j i r a change item
 	*/
-	@Override
+
 	public void setOldValue(java.lang.String oldValue) {
 		_jiraChangeItem.setOldValue(oldValue);
 	}
@@ -365,17 +365,17 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 	*
 	* @param primaryKey the primary key of this j i r a change item
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_jiraChangeItem.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_jiraChangeItem.setPrimaryKeyObj(primaryKeyObj);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -395,22 +395,22 @@ public class JIRAChangeItemWrapper implements JIRAChangeItem,
 		return false;
 	}
 
-	@Override
+
 	public JIRAChangeItem getWrappedModel() {
 		return _jiraChangeItem;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _jiraChangeItem.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _jiraChangeItem.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_jiraChangeItem.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssue.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssue.java
index b27b5ed06a8..4b65db1c702 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssue.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssue.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -38,17 +38,17 @@ public interface JIRAIssue extends JIRAIssueModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.socialcoding.model.impl.JIRAIssueImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<JIRAIssue, Long> JIRA_ISSUE_ID_ACCESSOR = new Accessor<JIRAIssue, Long>() {
-			@Override
+
 			public Long get(JIRAIssue jiraIssue) {
 				return jiraIssue.getJiraIssueId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<JIRAIssue> getTypeClass() {
 				return JIRAIssue.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueClp.java
index bf8276ba27d..dfe5db22a9e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,37 +43,37 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 	public JIRAIssueClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAIssue.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAIssue.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraIssueId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -95,7 +95,7 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraIssueId = (Long)attributes.get("jiraIssueId");
 
@@ -167,12 +167,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraIssueId = jiraIssueId;
 
@@ -190,12 +190,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -213,12 +213,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -236,12 +236,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public long getProjectId() {
 		return _projectId;
 	}
 
-	@Override
+
 	public void setProjectId(long projectId) {
 		_projectId = projectId;
 
@@ -259,12 +259,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public long getIssueNumber() {
 		return _issueNumber;
 	}
 
-	@Override
+
 	public void setIssueNumber(long issueNumber) {
 		_issueNumber = issueNumber;
 
@@ -282,12 +282,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public String getSummary() {
 		return _summary;
 	}
 
-	@Override
+
 	public void setSummary(String summary) {
 		_summary = summary;
 
@@ -305,12 +305,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public String getDescription() {
 		return _description;
 	}
 
-	@Override
+
 	public void setDescription(String description) {
 		_description = description;
 
@@ -328,12 +328,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public String getReporterJiraUserId() {
 		return _reporterJiraUserId;
 	}
 
-	@Override
+
 	public void setReporterJiraUserId(String reporterJiraUserId) {
 		_reporterJiraUserId = reporterJiraUserId;
 
@@ -352,12 +352,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public String getAssigneeJiraUserId() {
 		return _assigneeJiraUserId;
 	}
 
-	@Override
+
 	public void setAssigneeJiraUserId(String assigneeJiraUserId) {
 		_assigneeJiraUserId = assigneeJiraUserId;
 
@@ -376,12 +376,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public String getResolution() {
 		return _resolution;
 	}
 
-	@Override
+
 	public void setResolution(String resolution) {
 		_resolution = resolution;
 
@@ -399,12 +399,12 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public String getStatus() {
 		return _status;
 	}
 
-	@Override
+
 	public void setStatus(String status) {
 		_status = status;
 
@@ -422,7 +422,7 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public java.lang.String getKey() {
 		try {
 			String methodName = "getKey";
@@ -490,7 +490,7 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAIssueLocalServiceUtil.addJIRAIssue(this);
@@ -500,13 +500,13 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		}
 	}
 
-	@Override
+
 	public JIRAIssue toEscapedModel() {
 		return (JIRAIssue)ProxyUtil.newProxyInstance(JIRAIssue.class.getClassLoader(),
 			new Class[] { JIRAIssue.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAIssueClp clone = new JIRAIssueClp();
 
@@ -525,7 +525,7 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(JIRAIssue jiraIssue) {
 		int value = 0;
 
@@ -541,7 +541,7 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -567,22 +567,22 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(23);
 
@@ -613,7 +613,7 @@ public class JIRAIssueClp extends BaseModelImpl<JIRAIssue> implements JIRAIssue
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(37);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueModel.java
index b1cdec6b256..3a57469ba99 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -222,60 +222,60 @@ public interface JIRAIssueModel extends BaseModel<JIRAIssue> {
 	 */
 	public void setStatus(String status);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.JIRAIssue jiraIssue);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.JIRAIssue> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueSoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueSoap.java
index 82838ee6042..99c8da2850b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueSoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueWrapper.java
index 9f2b3bc222b..2e56ff3bb8b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAIssueWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,17 +43,17 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 		_jiraIssue = jiraIssue;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAIssue.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAIssue.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -72,7 +72,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraIssueId = (Long)attributes.get("jiraIssueId");
 
@@ -141,57 +141,57 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _jiraIssue.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _jiraIssue.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _jiraIssue.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _jiraIssue.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.JIRAIssue> toCacheModel() {
 		return _jiraIssue.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue toEscapedModel() {
 		return new JIRAIssueWrapper(_jiraIssue.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue toUnescapedModel() {
 		return new JIRAIssueWrapper(_jiraIssue.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		return _jiraIssue.compareTo(jiraIssue);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _jiraIssue.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraIssue.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new JIRAIssueWrapper((JIRAIssue)_jiraIssue.clone());
 	}
@@ -201,7 +201,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the assignee jira user ID of this j i r a issue
 	*/
-	@Override
+
 	public java.lang.String getAssigneeJiraUserId() {
 		return _jiraIssue.getAssigneeJiraUserId();
 	}
@@ -211,12 +211,12 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the description of this j i r a issue
 	*/
-	@Override
+
 	public java.lang.String getDescription() {
 		return _jiraIssue.getDescription();
 	}
 
-	@Override
+
 	public java.lang.String getKey() {
 		return _jiraIssue.getKey();
 	}
@@ -226,7 +226,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the reporter jira user ID of this j i r a issue
 	*/
-	@Override
+
 	public java.lang.String getReporterJiraUserId() {
 		return _jiraIssue.getReporterJiraUserId();
 	}
@@ -236,7 +236,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the resolution of this j i r a issue
 	*/
-	@Override
+
 	public java.lang.String getResolution() {
 		return _jiraIssue.getResolution();
 	}
@@ -246,7 +246,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the status of this j i r a issue
 	*/
-	@Override
+
 	public java.lang.String getStatus() {
 		return _jiraIssue.getStatus();
 	}
@@ -256,17 +256,17 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the summary of this j i r a issue
 	*/
-	@Override
+
 	public java.lang.String getSummary() {
 		return _jiraIssue.getSummary();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _jiraIssue.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _jiraIssue.toXmlString();
 	}
@@ -276,7 +276,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the create date of this j i r a issue
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _jiraIssue.getCreateDate();
 	}
@@ -286,7 +286,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the modified date of this j i r a issue
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _jiraIssue.getModifiedDate();
 	}
@@ -296,7 +296,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the issue number of this j i r a issue
 	*/
-	@Override
+
 	public long getIssueNumber() {
 		return _jiraIssue.getIssueNumber();
 	}
@@ -306,7 +306,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the jira issue ID of this j i r a issue
 	*/
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssue.getJiraIssueId();
 	}
@@ -316,7 +316,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the primary key of this j i r a issue
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraIssue.getPrimaryKey();
 	}
@@ -326,12 +326,12 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @return the project ID of this j i r a issue
 	*/
-	@Override
+
 	public long getProjectId() {
 		return _jiraIssue.getProjectId();
 	}
 
-	@Override
+
 	public void persist() {
 		_jiraIssue.persist();
 	}
@@ -341,12 +341,12 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param assigneeJiraUserId the assignee jira user ID of this j i r a issue
 	*/
-	@Override
+
 	public void setAssigneeJiraUserId(java.lang.String assigneeJiraUserId) {
 		_jiraIssue.setAssigneeJiraUserId(assigneeJiraUserId);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_jiraIssue.setCachedModel(cachedModel);
 	}
@@ -356,7 +356,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param createDate the create date of this j i r a issue
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_jiraIssue.setCreateDate(createDate);
 	}
@@ -366,23 +366,23 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param description the description of this j i r a issue
 	*/
-	@Override
+
 	public void setDescription(java.lang.String description) {
 		_jiraIssue.setDescription(description);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_jiraIssue.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_jiraIssue.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_jiraIssue.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -392,7 +392,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param issueNumber the issue number of this j i r a issue
 	*/
-	@Override
+
 	public void setIssueNumber(long issueNumber) {
 		_jiraIssue.setIssueNumber(issueNumber);
 	}
@@ -402,7 +402,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param jiraIssueId the jira issue ID of this j i r a issue
 	*/
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraIssue.setJiraIssueId(jiraIssueId);
 	}
@@ -412,12 +412,12 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param modifiedDate the modified date of this j i r a issue
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_jiraIssue.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_jiraIssue.setNew(n);
 	}
@@ -427,12 +427,12 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param primaryKey the primary key of this j i r a issue
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_jiraIssue.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_jiraIssue.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -442,7 +442,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param projectId the project ID of this j i r a issue
 	*/
-	@Override
+
 	public void setProjectId(long projectId) {
 		_jiraIssue.setProjectId(projectId);
 	}
@@ -452,7 +452,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param reporterJiraUserId the reporter jira user ID of this j i r a issue
 	*/
-	@Override
+
 	public void setReporterJiraUserId(java.lang.String reporterJiraUserId) {
 		_jiraIssue.setReporterJiraUserId(reporterJiraUserId);
 	}
@@ -462,7 +462,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param resolution the resolution of this j i r a issue
 	*/
-	@Override
+
 	public void setResolution(java.lang.String resolution) {
 		_jiraIssue.setResolution(resolution);
 	}
@@ -472,7 +472,7 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param status the status of this j i r a issue
 	*/
-	@Override
+
 	public void setStatus(java.lang.String status) {
 		_jiraIssue.setStatus(status);
 	}
@@ -482,12 +482,12 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 	*
 	* @param summary the summary of this j i r a issue
 	*/
-	@Override
+
 	public void setSummary(java.lang.String summary) {
 		_jiraIssue.setSummary(summary);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -506,22 +506,22 @@ public class JIRAIssueWrapper implements JIRAIssue, ModelWrapper<JIRAIssue> {
 		return false;
 	}
 
-	@Override
+
 	public JIRAIssue getWrappedModel() {
 		return _jiraIssue;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _jiraIssue.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _jiraIssue.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_jiraIssue.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProject.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProject.java
index 9e40e108012..177a1224711 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProject.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProject.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -38,17 +38,17 @@ public interface JIRAProject extends JIRAProjectModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.socialcoding.model.impl.JIRAProjectImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<JIRAProject, Long> JIRA_PROJECT_ID_ACCESSOR = new Accessor<JIRAProject, Long>() {
-			@Override
+
 			public Long get(JIRAProject jiraProject) {
 				return jiraProject.getJiraProjectId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<JIRAProject> getTypeClass() {
 				return JIRAProject.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectClp.java
index 93845c3d4b8..1fe1b7be3e8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -42,37 +42,37 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 	public JIRAProjectClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAProject.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAProject.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraProjectId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraProjectId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraProjectId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -86,7 +86,7 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraProjectId = (Long)attributes.get("jiraProjectId");
 
@@ -110,12 +110,12 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getJiraProjectId() {
 		return _jiraProjectId;
 	}
 
-	@Override
+
 	public void setJiraProjectId(long jiraProjectId) {
 		_jiraProjectId = jiraProjectId;
 
@@ -133,12 +133,12 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public String getKey() {
 		return _key;
 	}
 
-	@Override
+
 	public void setKey(String key) {
 		_key = key;
 
@@ -156,12 +156,12 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public String getName() {
 		return _name;
 	}
 
-	@Override
+
 	public void setName(String name) {
 		_name = name;
 
@@ -228,7 +228,7 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAProjectLocalServiceUtil.addJIRAProject(this);
@@ -238,13 +238,13 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public JIRAProject toEscapedModel() {
 		return (JIRAProject)ProxyUtil.newProxyInstance(JIRAProject.class.getClassLoader(),
 			new Class[] { JIRAProject.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAProjectClp clone = new JIRAProjectClp();
 
@@ -255,7 +255,7 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(JIRAProject jiraProject) {
 		long primaryKey = jiraProject.getPrimaryKey();
 
@@ -270,7 +270,7 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -296,22 +296,22 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -326,7 +326,7 @@ public class JIRAProjectClp extends BaseModelImpl<JIRAProject>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(13);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectModel.java
index fe76fdc2746..6c727a49a4d 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -104,60 +104,60 @@ public interface JIRAProjectModel extends BaseModel<JIRAProject> {
 	 */
 	public void setName(String name);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.JIRAProject jiraProject);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.JIRAProject> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectSoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectSoap.java
index dfa47e54408..ebaef168c3a 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectSoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectWrapper.java
index cf95916ff54..c37e08bc904 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/JIRAProjectWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,17 +43,17 @@ public class JIRAProjectWrapper implements JIRAProject,
 		_jiraProject = jiraProject;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAProject.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAProject.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -64,7 +64,7 @@ public class JIRAProjectWrapper implements JIRAProject,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraProjectId = (Long)attributes.get("jiraProjectId");
 
@@ -85,57 +85,57 @@ public class JIRAProjectWrapper implements JIRAProject,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _jiraProject.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _jiraProject.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _jiraProject.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _jiraProject.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.JIRAProject> toCacheModel() {
 		return _jiraProject.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject toEscapedModel() {
 		return new JIRAProjectWrapper(_jiraProject.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject toUnescapedModel() {
 		return new JIRAProjectWrapper(_jiraProject.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		return _jiraProject.compareTo(jiraProject);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _jiraProject.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraProject.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new JIRAProjectWrapper((JIRAProject)_jiraProject.clone());
 	}
@@ -145,7 +145,7 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @return the key of this j i r a project
 	*/
-	@Override
+
 	public java.lang.String getKey() {
 		return _jiraProject.getKey();
 	}
@@ -155,17 +155,17 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @return the name of this j i r a project
 	*/
-	@Override
+
 	public java.lang.String getName() {
 		return _jiraProject.getName();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _jiraProject.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _jiraProject.toXmlString();
 	}
@@ -175,7 +175,7 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @return the jira project ID of this j i r a project
 	*/
-	@Override
+
 	public long getJiraProjectId() {
 		return _jiraProject.getJiraProjectId();
 	}
@@ -185,33 +185,33 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @return the primary key of this j i r a project
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraProject.getPrimaryKey();
 	}
 
-	@Override
+
 	public void persist() {
 		_jiraProject.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_jiraProject.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_jiraProject.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_jiraProject.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_jiraProject.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -221,7 +221,7 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @param jiraProjectId the jira project ID of this j i r a project
 	*/
-	@Override
+
 	public void setJiraProjectId(long jiraProjectId) {
 		_jiraProject.setJiraProjectId(jiraProjectId);
 	}
@@ -231,7 +231,7 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @param key the key of this j i r a project
 	*/
-	@Override
+
 	public void setKey(java.lang.String key) {
 		_jiraProject.setKey(key);
 	}
@@ -241,12 +241,12 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @param name the name of this j i r a project
 	*/
-	@Override
+
 	public void setName(java.lang.String name) {
 		_jiraProject.setName(name);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_jiraProject.setNew(n);
 	}
@@ -256,17 +256,17 @@ public class JIRAProjectWrapper implements JIRAProject,
 	*
 	* @param primaryKey the primary key of this j i r a project
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_jiraProject.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_jiraProject.setPrimaryKeyObj(primaryKeyObj);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -285,22 +285,22 @@ public class JIRAProjectWrapper implements JIRAProject,
 		return false;
 	}
 
-	@Override
+
 	public JIRAProject getWrappedModel() {
 		return _jiraProject;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _jiraProject.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _jiraProject.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_jiraProject.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepository.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepository.java
index 8ba567b419a..b999f65fd71 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepository.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepository.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -39,17 +39,17 @@ public interface SVNRepository extends SVNRepositoryModel, PersistedModel {
 	 */
 	public static final Accessor<SVNRepository, Long> SVN_REPOSITORY_ID_ACCESSOR =
 		new Accessor<SVNRepository, Long>() {
-			@Override
+
 			public Long get(SVNRepository svnRepository) {
 				return svnRepository.getSvnRepositoryId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<SVNRepository> getTypeClass() {
 				return SVNRepository.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryClp.java
index 8679f8ddc8f..2546c766e44 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -42,37 +42,37 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 	public SVNRepositoryClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SVNRepository.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SVNRepository.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSvnRepositoryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -86,7 +86,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long svnRepositoryId = (Long)attributes.get("svnRepositoryId");
 
@@ -110,12 +110,12 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getSvnRepositoryId() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setSvnRepositoryId(long svnRepositoryId) {
 		_svnRepositoryId = svnRepositoryId;
 
@@ -133,12 +133,12 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public String getUrl() {
 		return _url;
 	}
 
-	@Override
+
 	public void setUrl(String url) {
 		_url = url;
 
@@ -156,12 +156,12 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public long getRevisionNumber() {
 		return _revisionNumber;
 	}
 
-	@Override
+
 	public void setRevisionNumber(long revisionNumber) {
 		_revisionNumber = revisionNumber;
 
@@ -179,7 +179,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getName() {
 		try {
 			String methodName = "getName";
@@ -198,7 +198,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getShortURL() {
 		try {
 			String methodName = "getShortURL";
@@ -267,7 +267,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SVNRepositoryLocalServiceUtil.addSVNRepository(this);
@@ -277,13 +277,13 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public SVNRepository toEscapedModel() {
 		return (SVNRepository)ProxyUtil.newProxyInstance(SVNRepository.class.getClassLoader(),
 			new Class[] { SVNRepository.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		SVNRepositoryClp clone = new SVNRepositoryClp();
 
@@ -294,7 +294,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(SVNRepository svnRepository) {
 		int value = 0;
 
@@ -307,7 +307,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -333,22 +333,22 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -363,7 +363,7 @@ public class SVNRepositoryClp extends BaseModelImpl<SVNRepository>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(13);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryModel.java
index 9e5114a826b..f3b521c2357 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -103,61 +103,61 @@ public interface SVNRepositoryModel extends BaseModel<SVNRepository> {
 	 */
 	public void setRevisionNumber(long revisionNumber);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(
 		com.liferay.socialcoding.model.SVNRepository svnRepository);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.SVNRepository> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositorySoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositorySoap.java
index 5518c8c7780..c46d61590d2 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositorySoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositorySoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryWrapper.java
index 9a63897df90..d9f97c84d8c 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRepositoryWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,17 +43,17 @@ public class SVNRepositoryWrapper implements SVNRepository,
 		_svnRepository = svnRepository;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SVNRepository.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SVNRepository.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -64,7 +64,7 @@ public class SVNRepositoryWrapper implements SVNRepository,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long svnRepositoryId = (Long)attributes.get("svnRepositoryId");
 
@@ -85,68 +85,68 @@ public class SVNRepositoryWrapper implements SVNRepository,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _svnRepository.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _svnRepository.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _svnRepository.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _svnRepository.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.SVNRepository> toCacheModel() {
 		return _svnRepository.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository toEscapedModel() {
 		return new SVNRepositoryWrapper(_svnRepository.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository toUnescapedModel() {
 		return new SVNRepositoryWrapper(_svnRepository.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		return _svnRepository.compareTo(svnRepository);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _svnRepository.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _svnRepository.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new SVNRepositoryWrapper((SVNRepository)_svnRepository.clone());
 	}
 
-	@Override
+
 	public java.lang.String getName() {
 		return _svnRepository.getName();
 	}
 
-	@Override
+
 	public java.lang.String getShortURL() {
 		return _svnRepository.getShortURL();
 	}
@@ -156,17 +156,17 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @return the url of this s v n repository
 	*/
-	@Override
+
 	public java.lang.String getUrl() {
 		return _svnRepository.getUrl();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _svnRepository.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _svnRepository.toXmlString();
 	}
@@ -176,7 +176,7 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @return the primary key of this s v n repository
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _svnRepository.getPrimaryKey();
 	}
@@ -186,7 +186,7 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @return the revision number of this s v n repository
 	*/
-	@Override
+
 	public long getRevisionNumber() {
 		return _svnRepository.getRevisionNumber();
 	}
@@ -196,38 +196,38 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @return the svn repository ID of this s v n repository
 	*/
-	@Override
+
 	public long getSvnRepositoryId() {
 		return _svnRepository.getSvnRepositoryId();
 	}
 
-	@Override
+
 	public void persist() {
 		_svnRepository.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_svnRepository.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_svnRepository.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_svnRepository.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_svnRepository.setExpandoBridgeAttributes(serviceContext);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_svnRepository.setNew(n);
 	}
@@ -237,12 +237,12 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @param primaryKey the primary key of this s v n repository
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_svnRepository.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_svnRepository.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -252,7 +252,7 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @param revisionNumber the revision number of this s v n repository
 	*/
-	@Override
+
 	public void setRevisionNumber(long revisionNumber) {
 		_svnRepository.setRevisionNumber(revisionNumber);
 	}
@@ -262,7 +262,7 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @param svnRepositoryId the svn repository ID of this s v n repository
 	*/
-	@Override
+
 	public void setSvnRepositoryId(long svnRepositoryId) {
 		_svnRepository.setSvnRepositoryId(svnRepositoryId);
 	}
@@ -272,12 +272,12 @@ public class SVNRepositoryWrapper implements SVNRepository,
 	*
 	* @param url the url of this s v n repository
 	*/
-	@Override
+
 	public void setUrl(java.lang.String url) {
 		_svnRepository.setUrl(url);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -296,22 +296,22 @@ public class SVNRepositoryWrapper implements SVNRepository,
 		return false;
 	}
 
-	@Override
+
 	public SVNRepository getWrappedModel() {
 		return _svnRepository;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _svnRepository.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _svnRepository.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_svnRepository.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevision.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevision.java
index 5a69b7c4b9d..8f400a0c5ff 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevision.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevision.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -38,17 +38,17 @@ public interface SVNRevision extends SVNRevisionModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.socialcoding.model.impl.SVNRevisionImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<SVNRevision, Long> SVN_REVISION_ID_ACCESSOR = new Accessor<SVNRevision, Long>() {
-			@Override
+
 			public Long get(SVNRevision svnRevision) {
 				return svnRevision.getSvnRevisionId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<SVNRevision> getTypeClass() {
 				return SVNRevision.class;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionClp.java
index fa949b2ef47..46138915c52 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -43,37 +43,37 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 	public SVNRevisionClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SVNRevision.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SVNRevision.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _svnRevisionId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSvnRevisionId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _svnRevisionId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -90,7 +90,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long svnRevisionId = (Long)attributes.get("svnRevisionId");
 
@@ -132,12 +132,12 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getSvnRevisionId() {
 		return _svnRevisionId;
 	}
 
-	@Override
+
 	public void setSvnRevisionId(long svnRevisionId) {
 		_svnRevisionId = svnRevisionId;
 
@@ -155,12 +155,12 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public String getSvnUserId() {
 		return _svnUserId;
 	}
 
-	@Override
+
 	public void setSvnUserId(String svnUserId) {
 		_svnUserId = svnUserId;
 
@@ -178,12 +178,12 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -201,12 +201,12 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public long getSvnRepositoryId() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setSvnRepositoryId(long svnRepositoryId) {
 		_svnRepositoryId = svnRepositoryId;
 
@@ -224,12 +224,12 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public long getRevisionNumber() {
 		return _revisionNumber;
 	}
 
-	@Override
+
 	public void setRevisionNumber(long revisionNumber) {
 		_revisionNumber = revisionNumber;
 
@@ -247,12 +247,12 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public String getComments() {
 		return _comments;
 	}
 
-	@Override
+
 	public void setComments(String comments) {
 		_comments = comments;
 
@@ -270,7 +270,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public java.lang.Object[] getJIRAIssueAndComments() {
 		try {
 			String methodName = "getJIRAIssueAndComments";
@@ -289,7 +289,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getWebRevisionNumberURL() {
 		try {
 			String methodName = "getWebRevisionNumberURL";
@@ -308,7 +308,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository getSVNRepository() {
 		try {
 			String methodName = "getSVNRepository";
@@ -376,7 +376,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SVNRevisionLocalServiceUtil.addSVNRevision(this);
@@ -386,13 +386,13 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public SVNRevision toEscapedModel() {
 		return (SVNRevision)ProxyUtil.newProxyInstance(SVNRevision.class.getClassLoader(),
 			new Class[] { SVNRevision.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		SVNRevisionClp clone = new SVNRevisionClp();
 
@@ -406,7 +406,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(SVNRevision svnRevision) {
 		int value = 0;
 
@@ -429,7 +429,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -455,22 +455,22 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(13);
 
@@ -491,7 +491,7 @@ public class SVNRevisionClp extends BaseModelImpl<SVNRevision>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(22);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionModel.java
index ecbd0817240..9f3ef1c6673 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -148,60 +148,60 @@ public interface SVNRevisionModel extends BaseModel<SVNRevision> {
 	 */
 	public void setComments(String comments);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.SVNRevision svnRevision);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.socialcoding.model.SVNRevision> toCacheModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision toEscapedModel();
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionSoap.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionSoap.java
index 51934fa4b14..bef863aa2cb 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionSoap.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionWrapper.java
index c34cade681f..139b1160cb1 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/model/SVNRevisionWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model;
@@ -44,17 +44,17 @@ public class SVNRevisionWrapper implements SVNRevision,
 		_svnRevision = svnRevision;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SVNRevision.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SVNRevision.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -68,7 +68,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long svnRevisionId = (Long)attributes.get("svnRevisionId");
 
@@ -107,67 +107,67 @@ public class SVNRevisionWrapper implements SVNRevision,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _svnRevision.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _svnRevision.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _svnRevision.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _svnRevision.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.socialcoding.model.SVNRevision> toCacheModel() {
 		return _svnRevision.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository getSVNRepository() {
 		return _svnRevision.getSVNRepository();
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision toEscapedModel() {
 		return new SVNRevisionWrapper(_svnRevision.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision toUnescapedModel() {
 		return new SVNRevisionWrapper(_svnRevision.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		return _svnRevision.compareTo(svnRevision);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _svnRevision.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _svnRevision.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new SVNRevisionWrapper((SVNRevision)_svnRevision.clone());
 	}
 
-	@Override
+
 	public java.lang.Object[] getJIRAIssueAndComments() {
 		return _svnRevision.getJIRAIssueAndComments();
 	}
@@ -177,7 +177,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the comments of this s v n revision
 	*/
-	@Override
+
 	public java.lang.String getComments() {
 		return _svnRevision.getComments();
 	}
@@ -187,22 +187,22 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the svn user ID of this s v n revision
 	*/
-	@Override
+
 	public java.lang.String getSvnUserId() {
 		return _svnRevision.getSvnUserId();
 	}
 
-	@Override
+
 	public java.lang.String getWebRevisionNumberURL() {
 		return _svnRevision.getWebRevisionNumberURL();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _svnRevision.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _svnRevision.toXmlString();
 	}
@@ -212,7 +212,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the create date of this s v n revision
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _svnRevision.getCreateDate();
 	}
@@ -222,7 +222,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the primary key of this s v n revision
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _svnRevision.getPrimaryKey();
 	}
@@ -232,7 +232,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the revision number of this s v n revision
 	*/
-	@Override
+
 	public long getRevisionNumber() {
 		return _svnRevision.getRevisionNumber();
 	}
@@ -242,7 +242,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the svn repository ID of this s v n revision
 	*/
-	@Override
+
 	public long getSvnRepositoryId() {
 		return _svnRevision.getSvnRepositoryId();
 	}
@@ -252,17 +252,17 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @return the svn revision ID of this s v n revision
 	*/
-	@Override
+
 	public long getSvnRevisionId() {
 		return _svnRevision.getSvnRevisionId();
 	}
 
-	@Override
+
 	public void persist() {
 		_svnRevision.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_svnRevision.setCachedModel(cachedModel);
 	}
@@ -272,7 +272,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param comments the comments of this s v n revision
 	*/
-	@Override
+
 	public void setComments(java.lang.String comments) {
 		_svnRevision.setComments(comments);
 	}
@@ -282,28 +282,28 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param createDate the create date of this s v n revision
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_svnRevision.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_svnRevision.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_svnRevision.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_svnRevision.setExpandoBridgeAttributes(serviceContext);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_svnRevision.setNew(n);
 	}
@@ -313,12 +313,12 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param primaryKey the primary key of this s v n revision
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_svnRevision.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_svnRevision.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -328,7 +328,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param revisionNumber the revision number of this s v n revision
 	*/
-	@Override
+
 	public void setRevisionNumber(long revisionNumber) {
 		_svnRevision.setRevisionNumber(revisionNumber);
 	}
@@ -338,7 +338,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param svnRepositoryId the svn repository ID of this s v n revision
 	*/
-	@Override
+
 	public void setSvnRepositoryId(long svnRepositoryId) {
 		_svnRevision.setSvnRepositoryId(svnRepositoryId);
 	}
@@ -348,7 +348,7 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param svnRevisionId the svn revision ID of this s v n revision
 	*/
-	@Override
+
 	public void setSvnRevisionId(long svnRevisionId) {
 		_svnRevision.setSvnRevisionId(svnRevisionId);
 	}
@@ -358,12 +358,12 @@ public class SVNRevisionWrapper implements SVNRevision,
 	*
 	* @param svnUserId the svn user ID of this s v n revision
 	*/
-	@Override
+
 	public void setSvnUserId(java.lang.String svnUserId) {
 		_svnRevision.setSvnUserId(svnUserId);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -382,22 +382,22 @@ public class SVNRevisionWrapper implements SVNRevision,
 		return false;
 	}
 
-	@Override
+
 	public SVNRevision getWrappedModel() {
 		return _svnRevision;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _svnRevision.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _svnRevision.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_svnRevision.resetOriginalValues();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/ClpSerializer.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/ClpSerializer.java
index e4f13565fa3..24666030d46 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/ClpSerializer.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalService.java
index 7b107ca1635..15c0d5f1f90 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -72,11 +72,11 @@ public interface JIRAActionLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -149,7 +149,7 @@ public interface JIRAActionLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getJIRAActionsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceClp.java
index 2e8394f414f..e75dcb885dd 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -129,7 +129,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -152,7 +152,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -175,7 +175,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -198,7 +198,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -228,7 +228,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -258,7 +258,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction addJIRAAction(
 		com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		Object returnObj = null;
@@ -283,7 +283,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction createJIRAAction(
 		long jiraActionId) {
 		Object returnObj = null;
@@ -307,7 +307,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction deleteJIRAAction(
 		com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		Object returnObj = null;
@@ -332,7 +332,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction deleteJIRAAction(
 		long jiraActionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -361,7 +361,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction fetchJIRAAction(
 		long jiraActionId) {
 		Object returnObj = null;
@@ -385,7 +385,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction getJIRAAction(
 		long jiraActionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -414,7 +414,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction updateJIRAAction(
 		com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		Object returnObj = null;
@@ -439,7 +439,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (com.liferay.socialcoding.model.JIRAAction)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getJIRAActionsCount() {
 		Object returnObj = null;
 
@@ -462,14 +462,14 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -492,7 +492,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -517,7 +517,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -549,7 +549,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -584,7 +584,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAAction> getJIRAActions(
 		int start, int end) {
 		Object returnObj = null;
@@ -608,7 +608,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAAction>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -633,7 +633,7 @@ public class JIRAActionLocalServiceClp implements JIRAActionLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceUtil.java
index 5d9ae6b303f..950ee7fe0c9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceWrapper.java
index 31f0b2bbe69..a7273a0e212 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAActionLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -33,17 +33,17 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 		_jiraActionLocalService = jiraActionLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _jiraActionLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _jiraActionLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _jiraActionLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraActionLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,7 +71,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param jiraAction the j i r a action
 	* @return the j i r a action that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction addJIRAAction(
 		com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		return _jiraActionLocalService.addJIRAAction(jiraAction);
@@ -83,7 +83,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param jiraActionId the primary key for the new j i r a action
 	* @return the new j i r a action
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction createJIRAAction(
 		long jiraActionId) {
 		return _jiraActionLocalService.createJIRAAction(jiraActionId);
@@ -95,7 +95,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param jiraAction the j i r a action
 	* @return the j i r a action that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction deleteJIRAAction(
 		com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		return _jiraActionLocalService.deleteJIRAAction(jiraAction);
@@ -108,14 +108,14 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @return the j i r a action that was removed
 	* @throws PortalException if a j i r a action with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction deleteJIRAAction(
 		long jiraActionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraActionLocalService.deleteJIRAAction(jiraActionId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction fetchJIRAAction(
 		long jiraActionId) {
 		return _jiraActionLocalService.fetchJIRAAction(jiraActionId);
@@ -128,7 +128,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @return the j i r a action
 	* @throws PortalException if a j i r a action with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction getJIRAAction(
 		long jiraActionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -141,7 +141,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param jiraAction the j i r a action
 	* @return the j i r a action that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAAction updateJIRAAction(
 		com.liferay.socialcoding.model.JIRAAction jiraAction) {
 		return _jiraActionLocalService.updateJIRAAction(jiraAction);
@@ -152,12 +152,12 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	*
 	* @return the number of j i r a actions
 	*/
-	@Override
+
 	public int getJIRAActionsCount() {
 		return _jiraActionLocalService.getJIRAActionsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -170,7 +170,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _jiraActionLocalService.getOSGiServiceIdentifier();
 	}
@@ -181,7 +181,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraActionLocalService.dynamicQuery(dynamicQuery);
@@ -199,7 +199,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -219,7 +219,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -239,7 +239,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param end the upper bound of the range of j i r a actions (not inclusive)
 	* @return the range of j i r a actions
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAAction> getJIRAActions(
 		int start, int end) {
 		return _jiraActionLocalService.getJIRAActions(start, end);
@@ -251,7 +251,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraActionLocalService.dynamicQueryCount(dynamicQuery);
@@ -264,7 +264,7 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -272,12 +272,12 @@ public class JIRAActionLocalServiceWrapper implements JIRAActionLocalService,
 			projection);
 	}
 
-	@Override
+
 	public JIRAActionLocalService getWrappedService() {
 		return _jiraActionLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(JIRAActionLocalService jiraActionLocalService) {
 		_jiraActionLocalService = jiraActionLocalService;
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalService.java
index 374a50d3a15..dd26f935777 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -72,11 +72,11 @@ public interface JIRAChangeGroupLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -151,7 +151,7 @@ public interface JIRAChangeGroupLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getJIRAChangeGroupsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceClp.java
index d54ec888287..b6ce96d74ef 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -130,7 +130,7 @@ public class JIRAChangeGroupLocalServiceClp
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -153,7 +153,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -176,7 +176,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -199,7 +199,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -229,7 +229,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -259,7 +259,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup addJIRAChangeGroup(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		Object returnObj = null;
@@ -284,7 +284,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup createJIRAChangeGroup(
 		long jiraChangeGroupId) {
 		Object returnObj = null;
@@ -308,7 +308,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup deleteJIRAChangeGroup(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		Object returnObj = null;
@@ -333,7 +333,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup deleteJIRAChangeGroup(
 		long jiraChangeGroupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -362,7 +362,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup fetchJIRAChangeGroup(
 		long jiraChangeGroupId) {
 		Object returnObj = null;
@@ -386,7 +386,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup getJIRAChangeGroup(
 		long jiraChangeGroupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -415,7 +415,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup updateJIRAChangeGroup(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		Object returnObj = null;
@@ -440,7 +440,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (com.liferay.socialcoding.model.JIRAChangeGroup)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getJIRAChangeGroupsCount() {
 		Object returnObj = null;
 
@@ -463,14 +463,14 @@ public class JIRAChangeGroupLocalServiceClp
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -493,7 +493,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -518,7 +518,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -550,7 +550,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -585,7 +585,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAChangeGroup> getJIRAChangeGroups(
 		int start, int end) {
 		Object returnObj = null;
@@ -609,7 +609,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return (java.util.List<com.liferay.socialcoding.model.JIRAChangeGroup>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -634,7 +634,7 @@ public class JIRAChangeGroupLocalServiceClp
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceUtil.java
index a032054069a..7e4d77151da 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceWrapper.java
index 047b3dcfda3..9b4b85161b4 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeGroupLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -34,17 +34,17 @@ public class JIRAChangeGroupLocalServiceWrapper
 		_jiraChangeGroupLocalService = jiraChangeGroupLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _jiraChangeGroupLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _jiraChangeGroupLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _jiraChangeGroupLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -52,14 +52,14 @@ public class JIRAChangeGroupLocalServiceWrapper
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraChangeGroupLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -72,7 +72,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param jiraChangeGroup the j i r a change group
 	* @return the j i r a change group that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup addJIRAChangeGroup(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		return _jiraChangeGroupLocalService.addJIRAChangeGroup(jiraChangeGroup);
@@ -84,7 +84,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param jiraChangeGroupId the primary key for the new j i r a change group
 	* @return the new j i r a change group
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup createJIRAChangeGroup(
 		long jiraChangeGroupId) {
 		return _jiraChangeGroupLocalService.createJIRAChangeGroup(jiraChangeGroupId);
@@ -96,7 +96,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param jiraChangeGroup the j i r a change group
 	* @return the j i r a change group that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup deleteJIRAChangeGroup(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		return _jiraChangeGroupLocalService.deleteJIRAChangeGroup(jiraChangeGroup);
@@ -109,14 +109,14 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @return the j i r a change group that was removed
 	* @throws PortalException if a j i r a change group with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup deleteJIRAChangeGroup(
 		long jiraChangeGroupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraChangeGroupLocalService.deleteJIRAChangeGroup(jiraChangeGroupId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup fetchJIRAChangeGroup(
 		long jiraChangeGroupId) {
 		return _jiraChangeGroupLocalService.fetchJIRAChangeGroup(jiraChangeGroupId);
@@ -129,7 +129,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @return the j i r a change group
 	* @throws PortalException if a j i r a change group with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup getJIRAChangeGroup(
 		long jiraChangeGroupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -142,7 +142,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param jiraChangeGroup the j i r a change group
 	* @return the j i r a change group that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeGroup updateJIRAChangeGroup(
 		com.liferay.socialcoding.model.JIRAChangeGroup jiraChangeGroup) {
 		return _jiraChangeGroupLocalService.updateJIRAChangeGroup(jiraChangeGroup);
@@ -153,12 +153,12 @@ public class JIRAChangeGroupLocalServiceWrapper
 	*
 	* @return the number of j i r a change groups
 	*/
-	@Override
+
 	public int getJIRAChangeGroupsCount() {
 		return _jiraChangeGroupLocalService.getJIRAChangeGroupsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -171,7 +171,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _jiraChangeGroupLocalService.getOSGiServiceIdentifier();
 	}
@@ -182,7 +182,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraChangeGroupLocalService.dynamicQuery(dynamicQuery);
@@ -200,7 +200,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -221,7 +221,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -241,7 +241,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param end the upper bound of the range of j i r a change groups (not inclusive)
 	* @return the range of j i r a change groups
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAChangeGroup> getJIRAChangeGroups(
 		int start, int end) {
 		return _jiraChangeGroupLocalService.getJIRAChangeGroups(start, end);
@@ -253,7 +253,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraChangeGroupLocalService.dynamicQueryCount(dynamicQuery);
@@ -266,7 +266,7 @@ public class JIRAChangeGroupLocalServiceWrapper
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -274,12 +274,12 @@ public class JIRAChangeGroupLocalServiceWrapper
 			projection);
 	}
 
-	@Override
+
 	public JIRAChangeGroupLocalService getWrappedService() {
 		return _jiraChangeGroupLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		JIRAChangeGroupLocalService jiraChangeGroupLocalService) {
 		_jiraChangeGroupLocalService = jiraChangeGroupLocalService;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalService.java
index bdb3ad8012f..5e304e9d548 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -72,11 +72,11 @@ public interface JIRAChangeItemLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -149,7 +149,7 @@ public interface JIRAChangeItemLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getJIRAChangeItemsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceClp.java
index b3c83a963da..63acc80802b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -133,7 +133,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -156,7 +156,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -179,7 +179,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -202,7 +202,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -232,7 +232,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -262,7 +262,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem addJIRAChangeItem(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		Object returnObj = null;
@@ -287,7 +287,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem createJIRAChangeItem(
 		long jiraChangeItemId) {
 		Object returnObj = null;
@@ -311,7 +311,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem deleteJIRAChangeItem(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		Object returnObj = null;
@@ -336,7 +336,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem deleteJIRAChangeItem(
 		long jiraChangeItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -365,7 +365,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem fetchJIRAChangeItem(
 		long jiraChangeItemId) {
 		Object returnObj = null;
@@ -389,7 +389,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem getJIRAChangeItem(
 		long jiraChangeItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -418,7 +418,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem updateJIRAChangeItem(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		Object returnObj = null;
@@ -443,7 +443,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (com.liferay.socialcoding.model.JIRAChangeItem)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getJIRAChangeItemsCount() {
 		Object returnObj = null;
 
@@ -466,14 +466,14 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -496,7 +496,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -521,7 +521,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -553,7 +553,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -588,7 +588,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAChangeItem> getJIRAChangeItems(
 		int start, int end) {
 		Object returnObj = null;
@@ -612,7 +612,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (java.util.List<com.liferay.socialcoding.model.JIRAChangeItem>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAChangeItem> getJIRAChangeItems(
 		long jiraChangeGroupId) {
 		Object returnObj = null;
@@ -636,7 +636,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return (java.util.List<com.liferay.socialcoding.model.JIRAChangeItem>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -661,7 +661,7 @@ public class JIRAChangeItemLocalServiceClp implements JIRAChangeItemLocalService
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceUtil.java
index 938b0f35cdf..c3d6717ece9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceWrapper.java
index f8f5fdfb591..95bf697e351 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAChangeItemLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -34,17 +34,17 @@ public class JIRAChangeItemLocalServiceWrapper
 		_jiraChangeItemLocalService = jiraChangeItemLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _jiraChangeItemLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _jiraChangeItemLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _jiraChangeItemLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -52,14 +52,14 @@ public class JIRAChangeItemLocalServiceWrapper
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraChangeItemLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -72,7 +72,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param jiraChangeItem the j i r a change item
 	* @return the j i r a change item that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem addJIRAChangeItem(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		return _jiraChangeItemLocalService.addJIRAChangeItem(jiraChangeItem);
@@ -84,7 +84,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param jiraChangeItemId the primary key for the new j i r a change item
 	* @return the new j i r a change item
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem createJIRAChangeItem(
 		long jiraChangeItemId) {
 		return _jiraChangeItemLocalService.createJIRAChangeItem(jiraChangeItemId);
@@ -96,7 +96,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param jiraChangeItem the j i r a change item
 	* @return the j i r a change item that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem deleteJIRAChangeItem(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		return _jiraChangeItemLocalService.deleteJIRAChangeItem(jiraChangeItem);
@@ -109,14 +109,14 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @return the j i r a change item that was removed
 	* @throws PortalException if a j i r a change item with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem deleteJIRAChangeItem(
 		long jiraChangeItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraChangeItemLocalService.deleteJIRAChangeItem(jiraChangeItemId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem fetchJIRAChangeItem(
 		long jiraChangeItemId) {
 		return _jiraChangeItemLocalService.fetchJIRAChangeItem(jiraChangeItemId);
@@ -129,7 +129,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @return the j i r a change item
 	* @throws PortalException if a j i r a change item with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem getJIRAChangeItem(
 		long jiraChangeItemId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -142,7 +142,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param jiraChangeItem the j i r a change item
 	* @return the j i r a change item that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAChangeItem updateJIRAChangeItem(
 		com.liferay.socialcoding.model.JIRAChangeItem jiraChangeItem) {
 		return _jiraChangeItemLocalService.updateJIRAChangeItem(jiraChangeItem);
@@ -153,12 +153,12 @@ public class JIRAChangeItemLocalServiceWrapper
 	*
 	* @return the number of j i r a change items
 	*/
-	@Override
+
 	public int getJIRAChangeItemsCount() {
 		return _jiraChangeItemLocalService.getJIRAChangeItemsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -171,7 +171,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _jiraChangeItemLocalService.getOSGiServiceIdentifier();
 	}
@@ -182,7 +182,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraChangeItemLocalService.dynamicQuery(dynamicQuery);
@@ -200,7 +200,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -220,7 +220,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -240,13 +240,13 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param end the upper bound of the range of j i r a change items (not inclusive)
 	* @return the range of j i r a change items
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAChangeItem> getJIRAChangeItems(
 		int start, int end) {
 		return _jiraChangeItemLocalService.getJIRAChangeItems(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAChangeItem> getJIRAChangeItems(
 		long jiraChangeGroupId) {
 		return _jiraChangeItemLocalService.getJIRAChangeItems(jiraChangeGroupId);
@@ -258,7 +258,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraChangeItemLocalService.dynamicQueryCount(dynamicQuery);
@@ -271,7 +271,7 @@ public class JIRAChangeItemLocalServiceWrapper
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -279,12 +279,12 @@ public class JIRAChangeItemLocalServiceWrapper
 			projection);
 	}
 
-	@Override
+
 	public JIRAChangeItemLocalService getWrappedService() {
 		return _jiraChangeItemLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		JIRAChangeItemLocalService jiraChangeItemLocalService) {
 		_jiraChangeItemLocalService = jiraChangeItemLocalService;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalService.java
index b1ecb5c1b15..5422a1dd5a3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -73,11 +73,11 @@ public interface JIRAIssueLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -193,7 +193,7 @@ public interface JIRAIssueLocalService extends BaseLocalService,
 	public int getReporterJIRAIssuesCount(long projectId,
 		java.lang.String reporterJiraUserId, java.lang.String status);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceClp.java
index 575d6a626c8..e01df68ccf4 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -220,7 +220,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		_methodParameterTypes38 = new String[] { "long" };
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -243,7 +243,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -266,7 +266,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -289,7 +289,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -319,7 +319,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -349,7 +349,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue addJIRAIssue(
 		com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		Object returnObj = null;
@@ -374,7 +374,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue createJIRAIssue(
 		long jiraIssueId) {
 		Object returnObj = null;
@@ -398,7 +398,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue deleteJIRAIssue(
 		com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		Object returnObj = null;
@@ -423,7 +423,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue deleteJIRAIssue(
 		long jiraIssueId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -452,7 +452,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue fetchJIRAIssue(
 		long jiraIssueId) {
 		Object returnObj = null;
@@ -476,7 +476,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getFirstAssigneeJIRAIssue(
 		long projectId, java.lang.String assigneeJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -510,7 +510,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getFirstReporterJIRAIssue(
 		long projectId, java.lang.String reporterJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -544,7 +544,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getJIRAIssue(
 		java.lang.String key)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -574,7 +574,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getJIRAIssue(
 		long jiraIssueId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -603,7 +603,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getLastAssigneeJIRAIssue(
 		long projectId, java.lang.String assigneeJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -637,7 +637,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getLastreporterJIRAIssue(
 		long projectId, java.lang.String reporterJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -671,7 +671,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue updateJIRAIssue(
 		com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		Object returnObj = null;
@@ -696,7 +696,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (com.liferay.socialcoding.model.JIRAIssue)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getAssigneeJIRAIssuesCount(java.util.Date modifiedDate,
 		long projectId, java.lang.String assigneeJiraUserId) {
 		Object returnObj = null;
@@ -727,7 +727,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getAssigneeJIRAIssuesCount(long projectId,
 		java.lang.String assigneeJiraUserId) {
 		Object returnObj = null;
@@ -756,7 +756,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getAssigneeJIRAIssuesCount(long projectId,
 		java.lang.String assigneeJiraUserId, java.lang.String status) {
 		Object returnObj = null;
@@ -787,7 +787,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getJIRAIssuesCount() {
 		Object returnObj = null;
 
@@ -810,7 +810,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getReporterJIRAIssuesCount(java.util.Date modifiedDate,
 		long projectId, java.lang.String reporterJiraUserId) {
 		Object returnObj = null;
@@ -841,7 +841,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getReporterJIRAIssuesCount(long projectId,
 		java.lang.String reporterJiraUserId) {
 		Object returnObj = null;
@@ -870,7 +870,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getReporterJIRAIssuesCount(long projectId,
 		java.lang.String reporterJiraUserId, java.lang.String status) {
 		Object returnObj = null;
@@ -901,14 +901,14 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -931,7 +931,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -956,7 +956,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -988,7 +988,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -1023,7 +1023,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getAssigneeJIRAIssues(
 		java.util.Date modifiedDate, long projectId,
 		java.lang.String assigneeJiraUserId, int start, int end) {
@@ -1059,7 +1059,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getAssigneeJIRAIssues(
 		long projectId, java.lang.String assigneeJiraUserId, int start, int end) {
 		Object returnObj = null;
@@ -1092,7 +1092,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getAssigneeJIRAIssues(
 		long projectId, java.lang.String assigneeJiraUserId,
 		java.lang.String status, int start, int end) {
@@ -1128,7 +1128,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getJIRAIssues(
 		int start, int end) {
 		Object returnObj = null;
@@ -1152,7 +1152,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getReporterJIRAIssues(
 		java.util.Date modifiedDate, long projectId,
 		java.lang.String reporterJiraUserId, int start, int end) {
@@ -1188,7 +1188,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getReporterJIRAIssues(
 		long projectId, java.lang.String reporterJiraUserId, int start, int end) {
 		Object returnObj = null;
@@ -1221,7 +1221,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getReporterJIRAIssues(
 		long projectId, java.lang.String reporterJiraUserId,
 		java.lang.String status, int start, int end) {
@@ -1257,7 +1257,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAIssue>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -1282,7 +1282,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -1312,7 +1312,7 @@ public class JIRAIssueLocalServiceClp implements JIRAIssueLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void updateJIRAIssues(long projectId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceUtil.java
index 8ab86bc4e26..43ad7310537 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceWrapper.java
index 8b3a39db28e..f4e149affbe 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAIssueLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -33,17 +33,17 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 		_jiraIssueLocalService = jiraIssueLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _jiraIssueLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _jiraIssueLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _jiraIssueLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraIssueLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,7 +71,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param jiraIssue the j i r a issue
 	* @return the j i r a issue that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue addJIRAIssue(
 		com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		return _jiraIssueLocalService.addJIRAIssue(jiraIssue);
@@ -83,7 +83,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param jiraIssueId the primary key for the new j i r a issue
 	* @return the new j i r a issue
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue createJIRAIssue(
 		long jiraIssueId) {
 		return _jiraIssueLocalService.createJIRAIssue(jiraIssueId);
@@ -95,7 +95,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param jiraIssue the j i r a issue
 	* @return the j i r a issue that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue deleteJIRAIssue(
 		com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		return _jiraIssueLocalService.deleteJIRAIssue(jiraIssue);
@@ -108,20 +108,20 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @return the j i r a issue that was removed
 	* @throws PortalException if a j i r a issue with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue deleteJIRAIssue(
 		long jiraIssueId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraIssueLocalService.deleteJIRAIssue(jiraIssueId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue fetchJIRAIssue(
 		long jiraIssueId) {
 		return _jiraIssueLocalService.fetchJIRAIssue(jiraIssueId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getFirstAssigneeJIRAIssue(
 		long projectId, java.lang.String assigneeJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -129,7 +129,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 			assigneeJiraUserId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getFirstReporterJIRAIssue(
 		long projectId, java.lang.String reporterJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -137,7 +137,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 			reporterJiraUserId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getJIRAIssue(
 		java.lang.String key)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -151,14 +151,14 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @return the j i r a issue
 	* @throws PortalException if a j i r a issue with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getJIRAIssue(
 		long jiraIssueId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraIssueLocalService.getJIRAIssue(jiraIssueId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getLastAssigneeJIRAIssue(
 		long projectId, java.lang.String assigneeJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -166,7 +166,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 			assigneeJiraUserId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue getLastreporterJIRAIssue(
 		long projectId, java.lang.String reporterJiraUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -180,27 +180,27 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param jiraIssue the j i r a issue
 	* @return the j i r a issue that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAIssue updateJIRAIssue(
 		com.liferay.socialcoding.model.JIRAIssue jiraIssue) {
 		return _jiraIssueLocalService.updateJIRAIssue(jiraIssue);
 	}
 
-	@Override
+
 	public int getAssigneeJIRAIssuesCount(java.util.Date modifiedDate,
 		long projectId, java.lang.String assigneeJiraUserId) {
 		return _jiraIssueLocalService.getAssigneeJIRAIssuesCount(modifiedDate,
 			projectId, assigneeJiraUserId);
 	}
 
-	@Override
+
 	public int getAssigneeJIRAIssuesCount(long projectId,
 		java.lang.String assigneeJiraUserId) {
 		return _jiraIssueLocalService.getAssigneeJIRAIssuesCount(projectId,
 			assigneeJiraUserId);
 	}
 
-	@Override
+
 	public int getAssigneeJIRAIssuesCount(long projectId,
 		java.lang.String assigneeJiraUserId, java.lang.String status) {
 		return _jiraIssueLocalService.getAssigneeJIRAIssuesCount(projectId,
@@ -212,33 +212,33 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	*
 	* @return the number of j i r a issues
 	*/
-	@Override
+
 	public int getJIRAIssuesCount() {
 		return _jiraIssueLocalService.getJIRAIssuesCount();
 	}
 
-	@Override
+
 	public int getReporterJIRAIssuesCount(java.util.Date modifiedDate,
 		long projectId, java.lang.String reporterJiraUserId) {
 		return _jiraIssueLocalService.getReporterJIRAIssuesCount(modifiedDate,
 			projectId, reporterJiraUserId);
 	}
 
-	@Override
+
 	public int getReporterJIRAIssuesCount(long projectId,
 		java.lang.String reporterJiraUserId) {
 		return _jiraIssueLocalService.getReporterJIRAIssuesCount(projectId,
 			reporterJiraUserId);
 	}
 
-	@Override
+
 	public int getReporterJIRAIssuesCount(long projectId,
 		java.lang.String reporterJiraUserId, java.lang.String status) {
 		return _jiraIssueLocalService.getReporterJIRAIssuesCount(projectId,
 			reporterJiraUserId, status);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -251,7 +251,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _jiraIssueLocalService.getOSGiServiceIdentifier();
 	}
@@ -262,7 +262,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraIssueLocalService.dynamicQuery(dynamicQuery);
@@ -280,7 +280,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -300,7 +300,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -309,7 +309,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 			orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getAssigneeJIRAIssues(
 		java.util.Date modifiedDate, long projectId,
 		java.lang.String assigneeJiraUserId, int start, int end) {
@@ -317,14 +317,14 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 			projectId, assigneeJiraUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getAssigneeJIRAIssues(
 		long projectId, java.lang.String assigneeJiraUserId, int start, int end) {
 		return _jiraIssueLocalService.getAssigneeJIRAIssues(projectId,
 			assigneeJiraUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getAssigneeJIRAIssues(
 		long projectId, java.lang.String assigneeJiraUserId,
 		java.lang.String status, int start, int end) {
@@ -343,13 +343,13 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param end the upper bound of the range of j i r a issues (not inclusive)
 	* @return the range of j i r a issues
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getJIRAIssues(
 		int start, int end) {
 		return _jiraIssueLocalService.getJIRAIssues(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getReporterJIRAIssues(
 		java.util.Date modifiedDate, long projectId,
 		java.lang.String reporterJiraUserId, int start, int end) {
@@ -357,14 +357,14 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 			projectId, reporterJiraUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getReporterJIRAIssues(
 		long projectId, java.lang.String reporterJiraUserId, int start, int end) {
 		return _jiraIssueLocalService.getReporterJIRAIssues(projectId,
 			reporterJiraUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAIssue> getReporterJIRAIssues(
 		long projectId, java.lang.String reporterJiraUserId,
 		java.lang.String status, int start, int end) {
@@ -378,7 +378,7 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraIssueLocalService.dynamicQueryCount(dynamicQuery);
@@ -391,25 +391,25 @@ public class JIRAIssueLocalServiceWrapper implements JIRAIssueLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _jiraIssueLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public void updateJIRAIssues(long projectId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_jiraIssueLocalService.updateJIRAIssues(projectId);
 	}
 
-	@Override
+
 	public JIRAIssueLocalService getWrappedService() {
 		return _jiraIssueLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(JIRAIssueLocalService jiraIssueLocalService) {
 		_jiraIssueLocalService = jiraIssueLocalService;
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalService.java
index b2a942536b6..a00776d70a6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -72,11 +72,11 @@ public interface JIRAProjectLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -149,7 +149,7 @@ public interface JIRAProjectLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getJIRAProjectsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceClp.java
index 3007b407095..060249ac3f8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -129,7 +129,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -152,7 +152,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -175,7 +175,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -198,7 +198,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -228,7 +228,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -258,7 +258,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject addJIRAProject(
 		com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		Object returnObj = null;
@@ -283,7 +283,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject createJIRAProject(
 		long jiraProjectId) {
 		Object returnObj = null;
@@ -307,7 +307,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject deleteJIRAProject(
 		com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		Object returnObj = null;
@@ -332,7 +332,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject deleteJIRAProject(
 		long jiraProjectId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -361,7 +361,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject fetchJIRAProject(
 		long jiraProjectId) {
 		Object returnObj = null;
@@ -385,7 +385,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject getJIRAProject(
 		long jiraProjectId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -414,7 +414,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject updateJIRAProject(
 		com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		Object returnObj = null;
@@ -439,7 +439,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (com.liferay.socialcoding.model.JIRAProject)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getJIRAProjectsCount() {
 		Object returnObj = null;
 
@@ -462,14 +462,14 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -492,7 +492,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -517,7 +517,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -549,7 +549,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -584,7 +584,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAProject> getJIRAProjects(
 		int start, int end) {
 		Object returnObj = null;
@@ -608,7 +608,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.JIRAProject>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -633,7 +633,7 @@ public class JIRAProjectLocalServiceClp implements JIRAProjectLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceUtil.java
index 5130284d248..46a38497548 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceWrapper.java
index 78004d5566f..96aeaf91b86 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/JIRAProjectLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -33,17 +33,17 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 		_jiraProjectLocalService = jiraProjectLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _jiraProjectLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _jiraProjectLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _jiraProjectLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraProjectLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,7 +71,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param jiraProject the j i r a project
 	* @return the j i r a project that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject addJIRAProject(
 		com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		return _jiraProjectLocalService.addJIRAProject(jiraProject);
@@ -83,7 +83,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param jiraProjectId the primary key for the new j i r a project
 	* @return the new j i r a project
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject createJIRAProject(
 		long jiraProjectId) {
 		return _jiraProjectLocalService.createJIRAProject(jiraProjectId);
@@ -95,7 +95,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param jiraProject the j i r a project
 	* @return the j i r a project that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject deleteJIRAProject(
 		com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		return _jiraProjectLocalService.deleteJIRAProject(jiraProject);
@@ -108,14 +108,14 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @return the j i r a project that was removed
 	* @throws PortalException if a j i r a project with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject deleteJIRAProject(
 		long jiraProjectId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _jiraProjectLocalService.deleteJIRAProject(jiraProjectId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject fetchJIRAProject(
 		long jiraProjectId) {
 		return _jiraProjectLocalService.fetchJIRAProject(jiraProjectId);
@@ -128,7 +128,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @return the j i r a project
 	* @throws PortalException if a j i r a project with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject getJIRAProject(
 		long jiraProjectId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -141,7 +141,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param jiraProject the j i r a project
 	* @return the j i r a project that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.JIRAProject updateJIRAProject(
 		com.liferay.socialcoding.model.JIRAProject jiraProject) {
 		return _jiraProjectLocalService.updateJIRAProject(jiraProject);
@@ -152,12 +152,12 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	*
 	* @return the number of j i r a projects
 	*/
-	@Override
+
 	public int getJIRAProjectsCount() {
 		return _jiraProjectLocalService.getJIRAProjectsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -170,7 +170,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _jiraProjectLocalService.getOSGiServiceIdentifier();
 	}
@@ -181,7 +181,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraProjectLocalService.dynamicQuery(dynamicQuery);
@@ -199,7 +199,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -219,7 +219,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -239,7 +239,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param end the upper bound of the range of j i r a projects (not inclusive)
 	* @return the range of j i r a projects
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.JIRAProject> getJIRAProjects(
 		int start, int end) {
 		return _jiraProjectLocalService.getJIRAProjects(start, end);
@@ -251,7 +251,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _jiraProjectLocalService.dynamicQueryCount(dynamicQuery);
@@ -264,7 +264,7 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -272,12 +272,12 @@ public class JIRAProjectLocalServiceWrapper implements JIRAProjectLocalService,
 			projection);
 	}
 
-	@Override
+
 	public JIRAProjectLocalService getWrappedService() {
 		return _jiraProjectLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		JIRAProjectLocalService jiraProjectLocalService) {
 		_jiraProjectLocalService = jiraProjectLocalService;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalService.java
index 2676391b1da..c27d3412363 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -72,11 +72,11 @@ public interface SVNRepositoryLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -153,7 +153,7 @@ public interface SVNRepositoryLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getSVNRepositoriesCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceClp.java
index b00c7249da7..f30afc0caea 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -137,7 +137,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		_methodParameterTypes22 = new String[] { "java.lang.String" };
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -160,7 +160,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -183,7 +183,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -206,7 +206,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -236,7 +236,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -266,7 +266,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository addSVNRepository(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		Object returnObj = null;
@@ -291,7 +291,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository createSVNRepository(
 		long svnRepositoryId) {
 		Object returnObj = null;
@@ -315,7 +315,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository deleteSVNRepository(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		Object returnObj = null;
@@ -340,7 +340,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository deleteSVNRepository(
 		long svnRepositoryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -369,7 +369,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository fetchSVNRepository(
 		long svnRepositoryId) {
 		Object returnObj = null;
@@ -393,7 +393,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository getSVNRepository(
 		java.lang.String url)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -423,7 +423,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository getSVNRepository(
 		long svnRepositoryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -452,7 +452,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository updateSVNRepository(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		Object returnObj = null;
@@ -477,7 +477,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (com.liferay.socialcoding.model.SVNRepository)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getSVNRepositoriesCount() {
 		Object returnObj = null;
 
@@ -500,14 +500,14 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -530,7 +530,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -555,7 +555,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -587,7 +587,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -622,7 +622,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRepository> getSVNRepositories(
 		int start, int end) {
 		Object returnObj = null;
@@ -646,7 +646,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.SVNRepository>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -671,7 +671,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -701,7 +701,7 @@ public class SVNRepositoryLocalServiceClp implements SVNRepositoryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void updateSVNRepository(java.lang.String url)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceUtil.java
index 28bf52c20d4..744b56fb192 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceWrapper.java
index a7fc6488eca..6b8f067b602 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRepositoryLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -34,17 +34,17 @@ public class SVNRepositoryLocalServiceWrapper
 		_svnRepositoryLocalService = svnRepositoryLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _svnRepositoryLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _svnRepositoryLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _svnRepositoryLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -52,14 +52,14 @@ public class SVNRepositoryLocalServiceWrapper
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _svnRepositoryLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -72,7 +72,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param svnRepository the s v n repository
 	* @return the s v n repository that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository addSVNRepository(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		return _svnRepositoryLocalService.addSVNRepository(svnRepository);
@@ -84,7 +84,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param svnRepositoryId the primary key for the new s v n repository
 	* @return the new s v n repository
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository createSVNRepository(
 		long svnRepositoryId) {
 		return _svnRepositoryLocalService.createSVNRepository(svnRepositoryId);
@@ -96,7 +96,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param svnRepository the s v n repository
 	* @return the s v n repository that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository deleteSVNRepository(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		return _svnRepositoryLocalService.deleteSVNRepository(svnRepository);
@@ -109,20 +109,20 @@ public class SVNRepositoryLocalServiceWrapper
 	* @return the s v n repository that was removed
 	* @throws PortalException if a s v n repository with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository deleteSVNRepository(
 		long svnRepositoryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _svnRepositoryLocalService.deleteSVNRepository(svnRepositoryId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository fetchSVNRepository(
 		long svnRepositoryId) {
 		return _svnRepositoryLocalService.fetchSVNRepository(svnRepositoryId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository getSVNRepository(
 		java.lang.String url)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -136,7 +136,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @return the s v n repository
 	* @throws PortalException if a s v n repository with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository getSVNRepository(
 		long svnRepositoryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -149,7 +149,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param svnRepository the s v n repository
 	* @return the s v n repository that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRepository updateSVNRepository(
 		com.liferay.socialcoding.model.SVNRepository svnRepository) {
 		return _svnRepositoryLocalService.updateSVNRepository(svnRepository);
@@ -160,12 +160,12 @@ public class SVNRepositoryLocalServiceWrapper
 	*
 	* @return the number of s v n repositories
 	*/
-	@Override
+
 	public int getSVNRepositoriesCount() {
 		return _svnRepositoryLocalService.getSVNRepositoriesCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -178,7 +178,7 @@ public class SVNRepositoryLocalServiceWrapper
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _svnRepositoryLocalService.getOSGiServiceIdentifier();
 	}
@@ -189,7 +189,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _svnRepositoryLocalService.dynamicQuery(dynamicQuery);
@@ -207,7 +207,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -227,7 +227,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -247,7 +247,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param end the upper bound of the range of s v n repositories (not inclusive)
 	* @return the range of s v n repositories
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRepository> getSVNRepositories(
 		int start, int end) {
 		return _svnRepositoryLocalService.getSVNRepositories(start, end);
@@ -259,7 +259,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _svnRepositoryLocalService.dynamicQueryCount(dynamicQuery);
@@ -272,7 +272,7 @@ public class SVNRepositoryLocalServiceWrapper
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -280,18 +280,18 @@ public class SVNRepositoryLocalServiceWrapper
 			projection);
 	}
 
-	@Override
+
 	public void updateSVNRepository(java.lang.String url)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_svnRepositoryLocalService.updateSVNRepository(url);
 	}
 
-	@Override
+
 	public SVNRepositoryLocalService getWrappedService() {
 		return _svnRepositoryLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		SVNRepositoryLocalService svnRepositoryLocalService) {
 		_svnRepositoryLocalService = svnRepositoryLocalService;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalService.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalService.java
index c048dc80d62..8299e771947 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalService.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -73,11 +73,11 @@ public interface SVNRevisionLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -172,7 +172,7 @@ public interface SVNRevisionLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getSVNRevisionsCount(long svnRepositoryId);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceClp.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceClp.java
index 1246c011f9a..be6eed5a3cc 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceClp.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -170,7 +170,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -193,7 +193,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -216,7 +216,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -239,7 +239,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -269,7 +269,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -299,7 +299,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision addSVNRevision(
 		com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		Object returnObj = null;
@@ -324,7 +324,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision addSVNRevision(
 		java.lang.String svnUserId, java.util.Date createDate,
 		long svnRepositoryId, long revisionNumber, java.lang.String comments)
@@ -365,7 +365,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision createSVNRevision(
 		long svnRevisionId) {
 		Object returnObj = null;
@@ -389,7 +389,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision deleteSVNRevision(
 		com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		Object returnObj = null;
@@ -414,7 +414,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision deleteSVNRevision(
 		long svnRevisionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -443,7 +443,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision fetchSVNRevision(
 		long svnRevisionId) {
 		Object returnObj = null;
@@ -467,7 +467,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision getFirstSVNRevision(
 		java.lang.String svnUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -497,7 +497,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision getLastSVNRevision(
 		java.lang.String svnUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -527,7 +527,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision getSVNRevision(
 		long svnRevisionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -556,7 +556,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision updateSVNRevision(
 		com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		Object returnObj = null;
@@ -581,7 +581,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (com.liferay.socialcoding.model.SVNRevision)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount() {
 		Object returnObj = null;
 
@@ -604,7 +604,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount(java.lang.String svnUserId) {
 		Object returnObj = null;
 
@@ -628,7 +628,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount(java.lang.String svnUserId,
 		long svnRepositoryId) {
 		Object returnObj = null;
@@ -657,7 +657,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount(long svnRepositoryId) {
 		Object returnObj = null;
 
@@ -680,14 +680,14 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -710,7 +710,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -735,7 +735,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -767,7 +767,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -802,7 +802,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		int start, int end) {
 		Object returnObj = null;
@@ -826,7 +826,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.SVNRevision>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		java.lang.String svnUserId, int start, int end) {
 		Object returnObj = null;
@@ -857,7 +857,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.SVNRevision>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		java.lang.String svnUserId, long svnRepositoryId, int start, int end) {
 		Object returnObj = null;
@@ -890,7 +890,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.SVNRevision>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		long svnRepositoryId, int start, int end) {
 		Object returnObj = null;
@@ -915,7 +915,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return (java.util.List<com.liferay.socialcoding.model.SVNRevision>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -940,7 +940,7 @@ public class SVNRevisionLocalServiceClp implements SVNRevisionLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceUtil.java
index 552b57cccf8..7e72b99aa17 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceWrapper.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceWrapper.java
index d367380a74d..4529b90be14 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceWrapper.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/SVNRevisionLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service;
@@ -33,17 +33,17 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 		_svnRevisionLocalService = svnRevisionLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _svnRevisionLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _svnRevisionLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _svnRevisionLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _svnRevisionLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,13 +71,13 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param svnRevision the s v n revision
 	* @return the s v n revision that was added
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision addSVNRevision(
 		com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		return _svnRevisionLocalService.addSVNRevision(svnRevision);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision addSVNRevision(
 		java.lang.String svnUserId, java.util.Date createDate,
 		long svnRepositoryId, long revisionNumber, java.lang.String comments)
@@ -92,7 +92,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param svnRevisionId the primary key for the new s v n revision
 	* @return the new s v n revision
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision createSVNRevision(
 		long svnRevisionId) {
 		return _svnRevisionLocalService.createSVNRevision(svnRevisionId);
@@ -104,7 +104,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param svnRevision the s v n revision
 	* @return the s v n revision that was removed
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision deleteSVNRevision(
 		com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		return _svnRevisionLocalService.deleteSVNRevision(svnRevision);
@@ -117,27 +117,27 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @return the s v n revision that was removed
 	* @throws PortalException if a s v n revision with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision deleteSVNRevision(
 		long svnRevisionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _svnRevisionLocalService.deleteSVNRevision(svnRevisionId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision fetchSVNRevision(
 		long svnRevisionId) {
 		return _svnRevisionLocalService.fetchSVNRevision(svnRevisionId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision getFirstSVNRevision(
 		java.lang.String svnUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _svnRevisionLocalService.getFirstSVNRevision(svnUserId);
 	}
 
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision getLastSVNRevision(
 		java.lang.String svnUserId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -151,7 +151,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @return the s v n revision
 	* @throws PortalException if a s v n revision with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision getSVNRevision(
 		long svnRevisionId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -164,7 +164,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param svnRevision the s v n revision
 	* @return the s v n revision that was updated
 	*/
-	@Override
+
 	public com.liferay.socialcoding.model.SVNRevision updateSVNRevision(
 		com.liferay.socialcoding.model.SVNRevision svnRevision) {
 		return _svnRevisionLocalService.updateSVNRevision(svnRevision);
@@ -175,29 +175,29 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	*
 	* @return the number of s v n revisions
 	*/
-	@Override
+
 	public int getSVNRevisionsCount() {
 		return _svnRevisionLocalService.getSVNRevisionsCount();
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount(java.lang.String svnUserId) {
 		return _svnRevisionLocalService.getSVNRevisionsCount(svnUserId);
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount(java.lang.String svnUserId,
 		long svnRepositoryId) {
 		return _svnRevisionLocalService.getSVNRevisionsCount(svnUserId,
 			svnRepositoryId);
 	}
 
-	@Override
+
 	public int getSVNRevisionsCount(long svnRepositoryId) {
 		return _svnRevisionLocalService.getSVNRevisionsCount(svnRepositoryId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -210,7 +210,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _svnRevisionLocalService.getOSGiServiceIdentifier();
 	}
@@ -221,7 +221,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _svnRevisionLocalService.dynamicQuery(dynamicQuery);
@@ -239,7 +239,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -259,7 +259,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -279,26 +279,26 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param end the upper bound of the range of s v n revisions (not inclusive)
 	* @return the range of s v n revisions
 	*/
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		int start, int end) {
 		return _svnRevisionLocalService.getSVNRevisions(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		java.lang.String svnUserId, int start, int end) {
 		return _svnRevisionLocalService.getSVNRevisions(svnUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		java.lang.String svnUserId, long svnRepositoryId, int start, int end) {
 		return _svnRevisionLocalService.getSVNRevisions(svnUserId,
 			svnRepositoryId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.socialcoding.model.SVNRevision> getSVNRevisions(
 		long svnRepositoryId, int start, int end) {
 		return _svnRevisionLocalService.getSVNRevisions(svnRepositoryId, start,
@@ -311,7 +311,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _svnRevisionLocalService.dynamicQueryCount(dynamicQuery);
@@ -324,7 +324,7 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -332,12 +332,12 @@ public class SVNRevisionLocalServiceWrapper implements SVNRevisionLocalService,
 			projection);
 	}
 
-	@Override
+
 	public SVNRevisionLocalService getWrappedService() {
 		return _svnRevisionLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		SVNRevisionLocalService svnRevisionLocalService) {
 		_svnRevisionLocalService = svnRevisionLocalService;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/messaging/ClpMessageListener.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/messaging/ClpMessageListener.java
index aec2bd8cf79..9dc7a7c441e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/messaging/ClpMessageListener.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.messaging;
@@ -37,7 +37,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinder.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinder.java
index a35b88b645e..27bbefd1739 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinder.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinderUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinderUtil.java
index 29f1dadfd02..54106d7096a 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinderUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionPersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionPersistence.java
index 5dd7ae92add..c19a850a349 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionPersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -490,7 +490,7 @@ public interface JIRAActionPersistence extends BasePersistence<JIRAAction> {
 	*/
 	public JIRAAction fetchByPrimaryKey(long jiraActionId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, JIRAAction> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -558,6 +558,6 @@ public interface JIRAActionPersistence extends BasePersistence<JIRAAction> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionUtil.java
index 386c2a401a9..2461dced30d 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAActionUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinder.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinder.java
index 4a14b360321..e0ed1bd9e53 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinder.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinderUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinderUtil.java
index da3df24ae4a..fde4db2b114 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinderUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupPersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupPersistence.java
index a2f27f2db65..0c86ea9f50e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupPersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -359,7 +359,7 @@ public interface JIRAChangeGroupPersistence extends BasePersistence<JIRAChangeGr
 	*/
 	public JIRAChangeGroup fetchByPrimaryKey(long jiraChangeGroupId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, JIRAChangeGroup> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -427,6 +427,6 @@ public interface JIRAChangeGroupPersistence extends BasePersistence<JIRAChangeGr
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupUtil.java
index 01a3a9b421f..938ede6c6b0 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeGroupUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemPersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemPersistence.java
index 46e10c844b0..ce5b40be687 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemPersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -229,7 +229,7 @@ public interface JIRAChangeItemPersistence extends BasePersistence<JIRAChangeIte
 	*/
 	public JIRAChangeItem fetchByPrimaryKey(long jiraChangeItemId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, JIRAChangeItem> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -297,6 +297,6 @@ public interface JIRAChangeItemPersistence extends BasePersistence<JIRAChangeIte
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemUtil.java
index 497a1c00eb4..5e2a8f52e10 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAChangeItemUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinder.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinder.java
index 187641b81d1..9e39c83e871 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinder.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinderUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinderUtil.java
index f054b4c6428..11a77a1be42 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinderUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssuePersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssuePersistence.java
index f9b8ff795e8..9fe568232c8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssuePersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssuePersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -1598,7 +1598,7 @@ public interface JIRAIssuePersistence extends BasePersistence<JIRAIssue> {
 	*/
 	public JIRAIssue fetchByPrimaryKey(long jiraIssueId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, JIRAIssue> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -1666,6 +1666,6 @@ public interface JIRAIssuePersistence extends BasePersistence<JIRAIssue> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueUtil.java
index 1c4ef441d82..387728eb52a 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAIssueUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectPersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectPersistence.java
index 54bc6bb237b..84fd38581d4 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectPersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -138,7 +138,7 @@ public interface JIRAProjectPersistence extends BasePersistence<JIRAProject> {
 	*/
 	public JIRAProject fetchByPrimaryKey(long jiraProjectId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, JIRAProject> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -206,6 +206,6 @@ public interface JIRAProjectPersistence extends BasePersistence<JIRAProject> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectUtil.java
index 1392f180414..f70b0ae3e1b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/JIRAProjectUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryPersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryPersistence.java
index c52690d9960..d59b23430ee 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryPersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -138,7 +138,7 @@ public interface SVNRepositoryPersistence extends BasePersistence<SVNRepository>
 	*/
 	public SVNRepository fetchByPrimaryKey(long svnRepositoryId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, SVNRepository> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryUtil.java
index e8617e19f3b..6b07cede04f 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRepositoryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionPersistence.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionPersistence.java
index f26c3fada57..4b3990dd0c9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionPersistence.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
@@ -508,7 +508,7 @@ public interface SVNRevisionPersistence extends BasePersistence<SVNRevision> {
 	*/
 	public SVNRevision fetchByPrimaryKey(long svnRevisionId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, SVNRevision> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionUtil.java
index 7988748c7a7..5388a82b0f3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/service/com/liferay/socialcoding/service/persistence/SVNRevisionUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/events/StartupAction.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/events/StartupAction.java
index 504d8651745..8fd5b7d5cc6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/events/StartupAction.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/events/StartupAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.hook.events;
@@ -31,7 +31,7 @@ import com.liferay.portal.kernel.util.PortalUtil;
  */
 public class StartupAction extends SimpleAction {
 
-	@Override
+
 	public void run(String[] ids) throws ActionException {
 		try {
 			doRun(GetterUtil.getLong(ids[0]));
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/UpgradeProcess_1_0_0.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/UpgradeProcess_1_0_0.java
index a6ab3d9e7f4..989f10d5a28 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/UpgradeProcess_1_0_0.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/UpgradeProcess_1_0_0.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.hook.upgrade;
@@ -22,12 +22,12 @@ import com.liferay.socialcoding.hook.upgrade.v1_0_0.UpgradeNamespace;
  */
 public class UpgradeProcess_1_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 100;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		upgrade(UpgradeNamespace.class);
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/UpgradeNamespace.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/UpgradeNamespace.java
index 86c46864b68..4d508a477b6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/UpgradeNamespace.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/UpgradeNamespace.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.hook.upgrade.v1_0_0;
@@ -29,7 +29,7 @@ import com.liferay.socialcoding.hook.upgrade.v1_0_0.util.SVNRevisionTable;
  */
 public class UpgradeNamespace extends UpgradeProcess {
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		renameTable(
 			StringUtil.replaceFirst(
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRepositoryTable.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRepositoryTable.java
index b5a8a74c62b..ee095a7d790 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRepositoryTable.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRepositoryTable.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.hook.upgrade.v1_0_0.util;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRevisionTable.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRevisionTable.java
index 88538cd8c4d..68478d4c878 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRevisionTable.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/hook/upgrade/v1_0_0/util/SVNRevisionTable.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.hook.upgrade.v1_0_0.util;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/messaging/SynchronizeJIRAMessageListener.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/messaging/SynchronizeJIRAMessageListener.java
index f112b1f90b5..5d72056a405 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/messaging/SynchronizeJIRAMessageListener.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/messaging/SynchronizeJIRAMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.jira.messaging;
@@ -24,7 +24,7 @@ import com.liferay.socialcoding.service.JIRAIssueLocalServiceUtil;
  */
 public class SynchronizeJIRAMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		JIRAIssueLocalServiceUtil.updateJIRAIssues(JIRAConstants.PROJECT_LEP);
 		JIRAIssueLocalServiceUtil.updateJIRAIssues(JIRAConstants.PROJECT_LPS);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/portlet/JIRAPortlet.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/portlet/JIRAPortlet.java
index 688a7b9a6f4..9c0e0f8fd72 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/portlet/JIRAPortlet.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/portlet/JIRAPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.jira.portlet;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityInterpreter.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityInterpreter.java
index ebc9a2d176e..36d11f9980a 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityInterpreter.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityInterpreter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.jira.social;
@@ -41,12 +41,12 @@ import com.liferay.socialcoding.util.PortletPropsValues;
  */
 public class JIRAActivityInterpreter extends BaseSocialActivityInterpreter {
 
-	@Override
+
 	public String[] getClassNames() {
 		return _CLASS_NAMES;
 	}
 
-	@Override
+
 	protected String getBody(
 			SocialActivity activity, ServiceContext serviceContext)
 		throws Exception {
@@ -84,7 +84,7 @@ public class JIRAActivityInterpreter extends BaseSocialActivityInterpreter {
 		return wrapLink(link, text);
 	}
 
-	@Override
+
 	protected String getLink(
 			SocialActivity activity, ServiceContext serviceContext)
 		throws Exception {
@@ -116,12 +116,12 @@ public class JIRAActivityInterpreter extends BaseSocialActivityInterpreter {
 		return sb.toString();
 	}
 
-	@Override
+
 	protected ResourceBundleLoader getResourceBundleLoader() {
 		return _resourceBundleLoader;
 	}
 
-	@Override
+
 	protected Object[] getTitleArguments(
 			String groupName, SocialActivity activity, String link,
 			String title, ServiceContext serviceContext)
@@ -136,7 +136,7 @@ public class JIRAActivityInterpreter extends BaseSocialActivityInterpreter {
 		return new Object[] {creatorUserName, jiraIssue.getKey()};
 	}
 
-	@Override
+
 	protected String getTitlePattern(
 		String groupName, SocialActivity activity) {
 
@@ -155,7 +155,7 @@ public class JIRAActivityInterpreter extends BaseSocialActivityInterpreter {
 		return StringPool.BLANK;
 	}
 
-	@Override
+
 	protected boolean hasPermissions(
 		PermissionChecker permissionChecker, SocialActivity activity,
 		String actionId, ServiceContext serviceContext) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityKeys.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityKeys.java
index 4446ec28798..308240a5d85 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityKeys.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/social/JIRAActivityKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.jira.social;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAConstants.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAConstants.java
index 6eafb3082ca..c05eb38de98 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAConstants.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.jira.util;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAUtil.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAUtil.java
index d494d5369ea..87a971f46ad 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAUtil.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/jira/util/JIRAUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.jira.util;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionBaseImpl.java
index 9dbb0415613..f90eda572cf 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class JIRAActionBaseImpl extends JIRAActionModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a j i r a action model instance should use the {@link JIRAAction} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAActionLocalServiceUtil.addJIRAAction(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionCacheModel.java
index e56baa7cac3..e33e56ffcb8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class JIRAActionCacheModel implements CacheModel<JIRAAction>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class JIRAActionCacheModel implements CacheModel<JIRAAction>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, jiraActionId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(17);
 
@@ -89,7 +89,7 @@ public class JIRAActionCacheModel implements CacheModel<JIRAAction>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public JIRAAction toEntityModel() {
 		JIRAActionImpl jiraActionImpl = new JIRAActionImpl();
 
@@ -144,7 +144,7 @@ public class JIRAActionCacheModel implements CacheModel<JIRAAction>,
 		return jiraActionImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		jiraActionId = objectInput.readLong();
 		jiraUserId = objectInput.readUTF();
@@ -157,7 +157,7 @@ public class JIRAActionCacheModel implements CacheModel<JIRAAction>,
 		jiraGroupName = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(jiraActionId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionImpl.java
index 0bcab8a16b2..83fb235b7e3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionModelImpl.java
index bc68477fb2a..c3dd0c3480c 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAActionModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -111,37 +111,37 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 	public JIRAActionModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraActionId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraActionId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraActionId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAAction.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAAction.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -160,7 +160,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraActionId = (Long)attributes.get("jiraActionId");
 
@@ -211,17 +211,17 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public long getJiraActionId() {
 		return _jiraActionId;
 	}
 
-	@Override
+
 	public void setJiraActionId(long jiraActionId) {
 		_jiraActionId = jiraActionId;
 	}
 
-	@Override
+
 	public String getJiraUserId() {
 		if (_jiraUserId == null) {
 			return StringPool.BLANK;
@@ -231,7 +231,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public void setJiraUserId(String jiraUserId) {
 		_columnBitmask |= JIRAUSERID_COLUMN_BITMASK;
 
@@ -246,17 +246,17 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return GetterUtil.getString(_originalJiraUserId);
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -265,7 +265,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -274,12 +274,12 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		_modifiedDate = modifiedDate;
 	}
 
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_columnBitmask |= JIRAISSUEID_COLUMN_BITMASK;
 
@@ -296,7 +296,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return _originalJiraIssueId;
 	}
 
-	@Override
+
 	public String getType() {
 		if (_type == null) {
 			return StringPool.BLANK;
@@ -306,7 +306,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public void setType(String type) {
 		_columnBitmask |= TYPE_COLUMN_BITMASK;
 
@@ -321,7 +321,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return GetterUtil.getString(_originalType);
 	}
 
-	@Override
+
 	public String getBody() {
 		if (_body == null) {
 			return StringPool.BLANK;
@@ -331,12 +331,12 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public void setBody(String body) {
 		_body = body;
 	}
 
-	@Override
+
 	public String getJiraGroupName() {
 		if (_jiraGroupName == null) {
 			return StringPool.BLANK;
@@ -346,7 +346,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public void setJiraGroupName(String jiraGroupName) {
 		_jiraGroupName = jiraGroupName;
 	}
@@ -355,20 +355,20 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			JIRAAction.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public JIRAAction toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (JIRAAction)ProxyUtil.newProxyInstance(_classLoader,
@@ -378,7 +378,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAActionImpl jiraActionImpl = new JIRAActionImpl();
 
@@ -396,7 +396,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return jiraActionImpl;
 	}
 
-	@Override
+
 	public int compareTo(JIRAAction jiraAction) {
 		int value = 0;
 
@@ -412,7 +412,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -434,22 +434,22 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		JIRAActionModelImpl jiraActionModelImpl = this;
 
@@ -466,7 +466,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		jiraActionModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<JIRAAction> toCacheModel() {
 		JIRAActionCacheModel jiraActionCacheModel = new JIRAActionCacheModel();
 
@@ -527,7 +527,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return jiraActionCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(17);
 
@@ -552,7 +552,7 @@ public class JIRAActionModelImpl extends BaseModelImpl<JIRAAction>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(28);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupBaseImpl.java
index 48b2d90febb..c917dfea818 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class JIRAChangeGroupBaseImpl extends JIRAChangeGroupModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a j i r a change group model instance should use the {@link JIRAChangeGroup} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAChangeGroupLocalServiceUtil.addJIRAChangeGroup(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupCacheModel.java
index 1e2639d0827..61eb016a447 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class JIRAChangeGroupCacheModel implements CacheModel<JIRAChangeGroup>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class JIRAChangeGroupCacheModel implements CacheModel<JIRAChangeGroup>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, jiraChangeGroupId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(9);
 
@@ -81,7 +81,7 @@ public class JIRAChangeGroupCacheModel implements CacheModel<JIRAChangeGroup>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public JIRAChangeGroup toEntityModel() {
 		JIRAChangeGroupImpl jiraChangeGroupImpl = new JIRAChangeGroupImpl();
 
@@ -108,7 +108,7 @@ public class JIRAChangeGroupCacheModel implements CacheModel<JIRAChangeGroup>,
 		return jiraChangeGroupImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		jiraChangeGroupId = objectInput.readLong();
 		jiraUserId = objectInput.readUTF();
@@ -117,7 +117,7 @@ public class JIRAChangeGroupCacheModel implements CacheModel<JIRAChangeGroup>,
 		jiraIssueId = objectInput.readLong();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(jiraChangeGroupId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupImpl.java
index 2120628f51c..d74983e35ac 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupModelImpl.java
index 4e1dcb3c273..12774114fc3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeGroupModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -102,37 +102,37 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 	public JIRAChangeGroupModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraChangeGroupId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAChangeGroup.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAChangeGroup.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -147,7 +147,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraChangeGroupId = (Long)attributes.get("jiraChangeGroupId");
 
@@ -174,17 +174,17 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public long getJiraChangeGroupId() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setJiraChangeGroupId(long jiraChangeGroupId) {
 		_jiraChangeGroupId = jiraChangeGroupId;
 	}
 
-	@Override
+
 	public String getJiraUserId() {
 		if (_jiraUserId == null) {
 			return StringPool.BLANK;
@@ -194,7 +194,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public void setJiraUserId(String jiraUserId) {
 		_columnBitmask |= JIRAUSERID_COLUMN_BITMASK;
 
@@ -209,24 +209,24 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return GetterUtil.getString(_originalJiraUserId);
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_columnBitmask = -1L;
 
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_columnBitmask |= JIRAISSUEID_COLUMN_BITMASK;
 
@@ -247,20 +247,20 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			JIRAChangeGroup.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public JIRAChangeGroup toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (JIRAChangeGroup)ProxyUtil.newProxyInstance(_classLoader,
@@ -270,7 +270,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAChangeGroupImpl jiraChangeGroupImpl = new JIRAChangeGroupImpl();
 
@@ -284,7 +284,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return jiraChangeGroupImpl;
 	}
 
-	@Override
+
 	public int compareTo(JIRAChangeGroup jiraChangeGroup) {
 		int value = 0;
 
@@ -300,7 +300,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -322,22 +322,22 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		JIRAChangeGroupModelImpl jiraChangeGroupModelImpl = this;
 
@@ -350,7 +350,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		jiraChangeGroupModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<JIRAChangeGroup> toCacheModel() {
 		JIRAChangeGroupCacheModel jiraChangeGroupCacheModel = new JIRAChangeGroupCacheModel();
 
@@ -378,7 +378,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return jiraChangeGroupCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(9);
 
@@ -395,7 +395,7 @@ public class JIRAChangeGroupModelImpl extends BaseModelImpl<JIRAChangeGroup>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(16);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemBaseImpl.java
index 860f174f2ad..21577580fe6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class JIRAChangeItemBaseImpl extends JIRAChangeItemModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a j i r a change item model instance should use the {@link JIRAChangeItem} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAChangeItemLocalServiceUtil.addJIRAChangeItem(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemCacheModel.java
index ae266e42be3..addac13aebb 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -38,7 +38,7 @@ import java.io.ObjectOutput;
 @ProviderType
 public class JIRAChangeItemCacheModel implements CacheModel<JIRAChangeItem>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -57,12 +57,12 @@ public class JIRAChangeItemCacheModel implements CacheModel<JIRAChangeItem>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, jiraChangeItemId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(15);
 
@@ -85,7 +85,7 @@ public class JIRAChangeItemCacheModel implements CacheModel<JIRAChangeItem>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public JIRAChangeItem toEntityModel() {
 		JIRAChangeItemImpl jiraChangeItemImpl = new JIRAChangeItemImpl();
 
@@ -132,7 +132,7 @@ public class JIRAChangeItemCacheModel implements CacheModel<JIRAChangeItem>,
 		return jiraChangeItemImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		jiraChangeItemId = objectInput.readLong();
 
@@ -144,7 +144,7 @@ public class JIRAChangeItemCacheModel implements CacheModel<JIRAChangeItem>,
 		newString = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(jiraChangeItemId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemImpl.java
index 6080ba3d156..02192bbe58d 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemModelImpl.java
index 5b9946d2554..345a068fd0c 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAChangeItemModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -105,37 +105,37 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 	public JIRAChangeItemModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraChangeItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraChangeItemId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraChangeItemId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAChangeItem.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAChangeItem.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -153,7 +153,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraChangeItemId = (Long)attributes.get("jiraChangeItemId");
 
@@ -198,22 +198,22 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public long getJiraChangeItemId() {
 		return _jiraChangeItemId;
 	}
 
-	@Override
+
 	public void setJiraChangeItemId(long jiraChangeItemId) {
 		_jiraChangeItemId = jiraChangeItemId;
 	}
 
-	@Override
+
 	public long getJiraChangeGroupId() {
 		return _jiraChangeGroupId;
 	}
 
-	@Override
+
 	public void setJiraChangeGroupId(long jiraChangeGroupId) {
 		_columnBitmask |= JIRACHANGEGROUPID_COLUMN_BITMASK;
 
@@ -230,7 +230,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return _originalJiraChangeGroupId;
 	}
 
-	@Override
+
 	public String getField() {
 		if (_field == null) {
 			return StringPool.BLANK;
@@ -240,12 +240,12 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public void setField(String field) {
 		_field = field;
 	}
 
-	@Override
+
 	public String getOldValue() {
 		if (_oldValue == null) {
 			return StringPool.BLANK;
@@ -255,12 +255,12 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public void setOldValue(String oldValue) {
 		_oldValue = oldValue;
 	}
 
-	@Override
+
 	public String getOldString() {
 		if (_oldString == null) {
 			return StringPool.BLANK;
@@ -270,12 +270,12 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public void setOldString(String oldString) {
 		_oldString = oldString;
 	}
 
-	@Override
+
 	public String getNewValue() {
 		if (_newValue == null) {
 			return StringPool.BLANK;
@@ -285,12 +285,12 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public void setNewValue(String newValue) {
 		_newValue = newValue;
 	}
 
-	@Override
+
 	public String getNewString() {
 		if (_newString == null) {
 			return StringPool.BLANK;
@@ -300,7 +300,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public void setNewString(String newString) {
 		_newString = newString;
 	}
@@ -309,20 +309,20 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			JIRAChangeItem.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public JIRAChangeItem toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (JIRAChangeItem)ProxyUtil.newProxyInstance(_classLoader,
@@ -332,7 +332,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAChangeItemImpl jiraChangeItemImpl = new JIRAChangeItemImpl();
 
@@ -349,7 +349,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return jiraChangeItemImpl;
 	}
 
-	@Override
+
 	public int compareTo(JIRAChangeItem jiraChangeItem) {
 		long primaryKey = jiraChangeItem.getPrimaryKey();
 
@@ -364,7 +364,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -386,22 +386,22 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		JIRAChangeItemModelImpl jiraChangeItemModelImpl = this;
 
@@ -412,7 +412,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		jiraChangeItemModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<JIRAChangeItem> toCacheModel() {
 		JIRAChangeItemCacheModel jiraChangeItemCacheModel = new JIRAChangeItemCacheModel();
 
@@ -463,7 +463,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return jiraChangeItemCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(15);
 
@@ -486,7 +486,7 @@ public class JIRAChangeItemModelImpl extends BaseModelImpl<JIRAChangeItem>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(25);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueBaseImpl.java
index c99d0cd6f90..c869f489ac1 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class JIRAIssueBaseImpl extends JIRAIssueModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a j i r a issue model instance should use the {@link JIRAIssue} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAIssueLocalServiceUtil.addJIRAIssue(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueCacheModel.java
index 3e9c957f53f..61828d2dddc 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class JIRAIssueCacheModel implements CacheModel<JIRAIssue>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class JIRAIssueCacheModel implements CacheModel<JIRAIssue>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, jiraIssueId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(23);
 
@@ -95,7 +95,7 @@ public class JIRAIssueCacheModel implements CacheModel<JIRAIssue>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public JIRAIssue toEntityModel() {
 		JIRAIssueImpl jiraIssueImpl = new JIRAIssueImpl();
 
@@ -165,7 +165,7 @@ public class JIRAIssueCacheModel implements CacheModel<JIRAIssue>,
 		return jiraIssueImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		jiraIssueId = objectInput.readLong();
 		createDate = objectInput.readLong();
@@ -182,7 +182,7 @@ public class JIRAIssueCacheModel implements CacheModel<JIRAIssue>,
 		status = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(jiraIssueId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueImpl.java
index 5ab60b4b893..5d43ba82631 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueModelImpl.java
index c698afc43b3..0b598e1efd3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAIssueModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -118,37 +118,37 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 	public JIRAIssueModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraIssueId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAIssue.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAIssue.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -170,7 +170,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraIssueId = (Long)attributes.get("jiraIssueId");
 
@@ -239,27 +239,27 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public long getJiraIssueId() {
 		return _jiraIssueId;
 	}
 
-	@Override
+
 	public void setJiraIssueId(long jiraIssueId) {
 		_jiraIssueId = jiraIssueId;
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -268,7 +268,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -285,12 +285,12 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return _originalModifiedDate;
 	}
 
-	@Override
+
 	public long getProjectId() {
 		return _projectId;
 	}
 
-	@Override
+
 	public void setProjectId(long projectId) {
 		_columnBitmask |= PROJECTID_COLUMN_BITMASK;
 
@@ -307,17 +307,17 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return _originalProjectId;
 	}
 
-	@Override
+
 	public long getIssueNumber() {
 		return _issueNumber;
 	}
 
-	@Override
+
 	public void setIssueNumber(long issueNumber) {
 		_issueNumber = issueNumber;
 	}
 
-	@Override
+
 	public String getSummary() {
 		if (_summary == null) {
 			return StringPool.BLANK;
@@ -327,12 +327,12 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public void setSummary(String summary) {
 		_summary = summary;
 	}
 
-	@Override
+
 	public String getDescription() {
 		if (_description == null) {
 			return StringPool.BLANK;
@@ -342,12 +342,12 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public void setDescription(String description) {
 		_description = description;
 	}
 
-	@Override
+
 	public String getReporterJiraUserId() {
 		if (_reporterJiraUserId == null) {
 			return StringPool.BLANK;
@@ -357,7 +357,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public void setReporterJiraUserId(String reporterJiraUserId) {
 		_columnBitmask |= REPORTERJIRAUSERID_COLUMN_BITMASK;
 
@@ -372,7 +372,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return GetterUtil.getString(_originalReporterJiraUserId);
 	}
 
-	@Override
+
 	public String getAssigneeJiraUserId() {
 		if (_assigneeJiraUserId == null) {
 			return StringPool.BLANK;
@@ -382,7 +382,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public void setAssigneeJiraUserId(String assigneeJiraUserId) {
 		_columnBitmask |= ASSIGNEEJIRAUSERID_COLUMN_BITMASK;
 
@@ -397,7 +397,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return GetterUtil.getString(_originalAssigneeJiraUserId);
 	}
 
-	@Override
+
 	public String getResolution() {
 		if (_resolution == null) {
 			return StringPool.BLANK;
@@ -407,12 +407,12 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public void setResolution(String resolution) {
 		_resolution = resolution;
 	}
 
-	@Override
+
 	public String getStatus() {
 		if (_status == null) {
 			return StringPool.BLANK;
@@ -422,7 +422,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public void setStatus(String status) {
 		_columnBitmask |= STATUS_COLUMN_BITMASK;
 
@@ -441,20 +441,20 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			JIRAIssue.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public JIRAIssue toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (JIRAIssue)ProxyUtil.newProxyInstance(_classLoader,
@@ -464,7 +464,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAIssueImpl jiraIssueImpl = new JIRAIssueImpl();
 
@@ -485,7 +485,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return jiraIssueImpl;
 	}
 
-	@Override
+
 	public int compareTo(JIRAIssue jiraIssue) {
 		int value = 0;
 
@@ -501,7 +501,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -523,22 +523,22 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		JIRAIssueModelImpl jiraIssueModelImpl = this;
 
@@ -559,7 +559,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		jiraIssueModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<JIRAIssue> toCacheModel() {
 		JIRAIssueCacheModel jiraIssueCacheModel = new JIRAIssueCacheModel();
 
@@ -638,7 +638,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return jiraIssueCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(23);
 
@@ -669,7 +669,7 @@ public class JIRAIssueModelImpl extends BaseModelImpl<JIRAIssue>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(37);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectBaseImpl.java
index c6d2edeed66..e17a4b102b7 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class JIRAProjectBaseImpl extends JIRAProjectModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a j i r a project model instance should use the {@link JIRAProject} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			JIRAProjectLocalServiceUtil.addJIRAProject(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectCacheModel.java
index c2581cfa65e..a2eaf50e9a1 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -38,7 +38,7 @@ import java.io.ObjectOutput;
 @ProviderType
 public class JIRAProjectCacheModel implements CacheModel<JIRAProject>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -57,12 +57,12 @@ public class JIRAProjectCacheModel implements CacheModel<JIRAProject>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, jiraProjectId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -77,7 +77,7 @@ public class JIRAProjectCacheModel implements CacheModel<JIRAProject>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public JIRAProject toEntityModel() {
 		JIRAProjectImpl jiraProjectImpl = new JIRAProjectImpl();
 
@@ -102,14 +102,14 @@ public class JIRAProjectCacheModel implements CacheModel<JIRAProject>,
 		return jiraProjectImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		jiraProjectId = objectInput.readLong();
 		key = objectInput.readUTF();
 		name = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(jiraProjectId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectImpl.java
index 7abaace28db..1609bfdf9b5 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectModelImpl.java
index b36cd60843a..c513948eccd 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/JIRAProjectModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -97,37 +97,37 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 	public JIRAProjectModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _jiraProjectId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setJiraProjectId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _jiraProjectId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return JIRAProject.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return JIRAProject.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -141,7 +141,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long jiraProjectId = (Long)attributes.get("jiraProjectId");
 
@@ -162,17 +162,17 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public long getJiraProjectId() {
 		return _jiraProjectId;
 	}
 
-	@Override
+
 	public void setJiraProjectId(long jiraProjectId) {
 		_jiraProjectId = jiraProjectId;
 	}
 
-	@Override
+
 	public String getKey() {
 		if (_key == null) {
 			return StringPool.BLANK;
@@ -182,7 +182,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public void setKey(String key) {
 		_columnBitmask |= KEY_COLUMN_BITMASK;
 
@@ -197,7 +197,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return GetterUtil.getString(_originalKey);
 	}
 
-	@Override
+
 	public String getName() {
 		if (_name == null) {
 			return StringPool.BLANK;
@@ -207,7 +207,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public void setName(String name) {
 		_name = name;
 	}
@@ -216,20 +216,20 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			JIRAProject.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public JIRAProject toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (JIRAProject)ProxyUtil.newProxyInstance(_classLoader,
@@ -239,7 +239,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		JIRAProjectImpl jiraProjectImpl = new JIRAProjectImpl();
 
@@ -252,7 +252,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return jiraProjectImpl;
 	}
 
-	@Override
+
 	public int compareTo(JIRAProject jiraProject) {
 		long primaryKey = jiraProject.getPrimaryKey();
 
@@ -267,7 +267,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -289,22 +289,22 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		JIRAProjectModelImpl jiraProjectModelImpl = this;
 
@@ -313,7 +313,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		jiraProjectModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<JIRAProject> toCacheModel() {
 		JIRAProjectCacheModel jiraProjectCacheModel = new JIRAProjectCacheModel();
 
@@ -338,7 +338,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return jiraProjectCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -353,7 +353,7 @@ public class JIRAProjectModelImpl extends BaseModelImpl<JIRAProject>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(13);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryBaseImpl.java
index 36fdfb0471c..5ea761322aa 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class SVNRepositoryBaseImpl extends SVNRepositoryModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a s v n repository model instance should use the {@link SVNRepository} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SVNRepositoryLocalServiceUtil.addSVNRepository(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryCacheModel.java
index f3f8e591200..000fd558d74 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -38,7 +38,7 @@ import java.io.ObjectOutput;
 @ProviderType
 public class SVNRepositoryCacheModel implements CacheModel<SVNRepository>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -57,12 +57,12 @@ public class SVNRepositoryCacheModel implements CacheModel<SVNRepository>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, svnRepositoryId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -77,7 +77,7 @@ public class SVNRepositoryCacheModel implements CacheModel<SVNRepository>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public SVNRepository toEntityModel() {
 		SVNRepositoryImpl svnRepositoryImpl = new SVNRepositoryImpl();
 
@@ -97,7 +97,7 @@ public class SVNRepositoryCacheModel implements CacheModel<SVNRepository>,
 		return svnRepositoryImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		svnRepositoryId = objectInput.readLong();
 		url = objectInput.readUTF();
@@ -105,7 +105,7 @@ public class SVNRepositoryCacheModel implements CacheModel<SVNRepository>,
 		revisionNumber = objectInput.readLong();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(svnRepositoryId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryImpl.java
index d4fe3a197e3..f273eb5877b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryModelImpl.java
index 73cc1ebaeee..2bdb4500f31 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRepositoryModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -96,37 +96,37 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 	public SVNRepositoryModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSvnRepositoryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SVNRepository.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SVNRepository.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -140,7 +140,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long svnRepositoryId = (Long)attributes.get("svnRepositoryId");
 
@@ -161,17 +161,17 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public long getSvnRepositoryId() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setSvnRepositoryId(long svnRepositoryId) {
 		_svnRepositoryId = svnRepositoryId;
 	}
 
-	@Override
+
 	public String getUrl() {
 		if (_url == null) {
 			return StringPool.BLANK;
@@ -181,7 +181,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public void setUrl(String url) {
 		_columnBitmask = -1L;
 
@@ -196,12 +196,12 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return GetterUtil.getString(_originalUrl);
 	}
 
-	@Override
+
 	public long getRevisionNumber() {
 		return _revisionNumber;
 	}
 
-	@Override
+
 	public void setRevisionNumber(long revisionNumber) {
 		_revisionNumber = revisionNumber;
 	}
@@ -210,20 +210,20 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			SVNRepository.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public SVNRepository toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (SVNRepository)ProxyUtil.newProxyInstance(_classLoader,
@@ -233,7 +233,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		SVNRepositoryImpl svnRepositoryImpl = new SVNRepositoryImpl();
 
@@ -246,7 +246,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return svnRepositoryImpl;
 	}
 
-	@Override
+
 	public int compareTo(SVNRepository svnRepository) {
 		int value = 0;
 
@@ -259,7 +259,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -281,22 +281,22 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		SVNRepositoryModelImpl svnRepositoryModelImpl = this;
 
@@ -305,7 +305,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		svnRepositoryModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<SVNRepository> toCacheModel() {
 		SVNRepositoryCacheModel svnRepositoryCacheModel = new SVNRepositoryCacheModel();
 
@@ -324,7 +324,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return svnRepositoryCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -339,7 +339,7 @@ public class SVNRepositoryModelImpl extends BaseModelImpl<SVNRepository>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(13);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionBaseImpl.java
index f325a190fb1..789ce244982 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -39,7 +39,7 @@ public abstract class SVNRevisionBaseImpl extends SVNRevisionModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a s v n revision model instance should use the {@link SVNRevision} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			SVNRevisionLocalServiceUtil.addSVNRevision(this);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionCacheModel.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionCacheModel.java
index 2572cd23491..47e57dcfd3f 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionCacheModel.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class SVNRevisionCacheModel implements CacheModel<SVNRevision>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class SVNRevisionCacheModel implements CacheModel<SVNRevision>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, svnRevisionId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(13);
 
@@ -85,7 +85,7 @@ public class SVNRevisionCacheModel implements CacheModel<SVNRevision>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public SVNRevision toEntityModel() {
 		SVNRevisionImpl svnRevisionImpl = new SVNRevisionImpl();
 
@@ -120,7 +120,7 @@ public class SVNRevisionCacheModel implements CacheModel<SVNRevision>,
 		return svnRevisionImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		svnRevisionId = objectInput.readLong();
 		svnUserId = objectInput.readUTF();
@@ -132,7 +132,7 @@ public class SVNRevisionCacheModel implements CacheModel<SVNRevision>,
 		comments = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(svnRevisionId);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionImpl.java
index b936214613c..2b98a3733b3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionModelImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionModelImpl.java
index dee0fc7b0a2..bff9f784be3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionModelImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/model/impl/SVNRevisionModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.model.impl;
@@ -105,37 +105,37 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 	public SVNRevisionModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _svnRevisionId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setSvnRevisionId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _svnRevisionId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return SVNRevision.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return SVNRevision.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -152,7 +152,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long svnRevisionId = (Long)attributes.get("svnRevisionId");
 
@@ -191,17 +191,17 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public long getSvnRevisionId() {
 		return _svnRevisionId;
 	}
 
-	@Override
+
 	public void setSvnRevisionId(long svnRevisionId) {
 		_svnRevisionId = svnRevisionId;
 	}
 
-	@Override
+
 	public String getSvnUserId() {
 		if (_svnUserId == null) {
 			return StringPool.BLANK;
@@ -211,7 +211,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public void setSvnUserId(String svnUserId) {
 		_columnBitmask |= SVNUSERID_COLUMN_BITMASK;
 
@@ -226,22 +226,22 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return GetterUtil.getString(_originalSvnUserId);
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public long getSvnRepositoryId() {
 		return _svnRepositoryId;
 	}
 
-	@Override
+
 	public void setSvnRepositoryId(long svnRepositoryId) {
 		_columnBitmask |= SVNREPOSITORYID_COLUMN_BITMASK;
 
@@ -258,19 +258,19 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return _originalSvnRepositoryId;
 	}
 
-	@Override
+
 	public long getRevisionNumber() {
 		return _revisionNumber;
 	}
 
-	@Override
+
 	public void setRevisionNumber(long revisionNumber) {
 		_columnBitmask = -1L;
 
 		_revisionNumber = revisionNumber;
 	}
 
-	@Override
+
 	public String getComments() {
 		if (_comments == null) {
 			return StringPool.BLANK;
@@ -280,7 +280,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public void setComments(String comments) {
 		_comments = comments;
 	}
@@ -289,20 +289,20 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			SVNRevision.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public SVNRevision toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (SVNRevision)ProxyUtil.newProxyInstance(_classLoader,
@@ -312,7 +312,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		SVNRevisionImpl svnRevisionImpl = new SVNRevisionImpl();
 
@@ -328,7 +328,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return svnRevisionImpl;
 	}
 
-	@Override
+
 	public int compareTo(SVNRevision svnRevision) {
 		int value = 0;
 
@@ -351,7 +351,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -373,22 +373,22 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		SVNRevisionModelImpl svnRevisionModelImpl = this;
 
@@ -401,7 +401,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		svnRevisionModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<SVNRevision> toCacheModel() {
 		SVNRevisionCacheModel svnRevisionCacheModel = new SVNRevisionCacheModel();
 
@@ -439,7 +439,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return svnRevisionCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(13);
 
@@ -460,7 +460,7 @@ public class SVNRevisionModelImpl extends BaseModelImpl<SVNRevision>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(22);
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceBaseImpl.java
index 35dacbea9e5..9941597a77c 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -88,7 +88,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @return the j i r a action that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAAction addJIRAAction(JIRAAction jiraAction) {
 		jiraAction.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param jiraActionId the primary key for the new j i r a action
 	 * @return the new j i r a action
 	 */
-	@Override
+
 	public JIRAAction createJIRAAction(long jiraActionId) {
 		return jiraActionPersistence.create(jiraActionId);
 	}
@@ -114,7 +114,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @throws PortalException if a j i r a action with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAAction deleteJIRAAction(long jiraActionId)
 		throws PortalException {
 		return jiraActionPersistence.remove(jiraActionId);
@@ -127,12 +127,12 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @return the j i r a action that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAAction deleteJIRAAction(JIRAAction jiraAction) {
 		return jiraActionPersistence.remove(jiraAction);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -146,7 +146,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return jiraActionPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -163,7 +163,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return jiraActionPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -183,7 +183,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return jiraActionPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -196,7 +196,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return jiraActionPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -208,14 +208,14 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return jiraActionPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public JIRAAction fetchJIRAAction(long jiraActionId) {
 		return jiraActionPersistence.fetchByPrimaryKey(jiraActionId);
 	}
@@ -227,13 +227,13 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @return the j i r a action
 	 * @throws PortalException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction getJIRAAction(long jiraActionId)
 		throws PortalException {
 		return jiraActionPersistence.findByPrimaryKey(jiraActionId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -246,7 +246,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -272,13 +272,13 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return jiraActionLocalService.deleteJIRAAction((JIRAAction)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return jiraActionPersistence.findByPrimaryKey(primaryKeyObj);
@@ -295,7 +295,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @param end the upper bound of the range of j i r a actions (not inclusive)
 	 * @return the range of j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> getJIRAActions(int start, int end) {
 		return jiraActionPersistence.findAll(start, end);
 	}
@@ -305,7 +305,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 *
 	 * @return the number of j i r a actions
 	 */
-	@Override
+
 	public int getJIRAActionsCount() {
 		return jiraActionPersistence.countAll();
 	}
@@ -317,7 +317,7 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 * @return the j i r a action that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAAction updateJIRAAction(JIRAAction jiraAction) {
 		return jiraActionPersistence.update(jiraAction);
 	}
@@ -775,12 +775,12 @@ public abstract class JIRAActionLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return JIRAActionLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceClpInvoker.java
index 7fe0c73dd82..1e9834ffd64 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAActionLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceBaseImpl.java
index 8710d782f2a..d12534163c8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -88,7 +88,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @return the j i r a change group that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAChangeGroup addJIRAChangeGroup(JIRAChangeGroup jiraChangeGroup) {
 		jiraChangeGroup.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param jiraChangeGroupId the primary key for the new j i r a change group
 	 * @return the new j i r a change group
 	 */
-	@Override
+
 	public JIRAChangeGroup createJIRAChangeGroup(long jiraChangeGroupId) {
 		return jiraChangeGroupPersistence.create(jiraChangeGroupId);
 	}
@@ -114,7 +114,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @throws PortalException if a j i r a change group with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAChangeGroup deleteJIRAChangeGroup(long jiraChangeGroupId)
 		throws PortalException {
 		return jiraChangeGroupPersistence.remove(jiraChangeGroupId);
@@ -127,13 +127,13 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @return the j i r a change group that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAChangeGroup deleteJIRAChangeGroup(
 		JIRAChangeGroup jiraChangeGroup) {
 		return jiraChangeGroupPersistence.remove(jiraChangeGroup);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -147,7 +147,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return jiraChangeGroupPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -164,7 +164,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return jiraChangeGroupPersistence.findWithDynamicQuery(dynamicQuery,
@@ -184,7 +184,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return jiraChangeGroupPersistence.findWithDynamicQuery(dynamicQuery,
@@ -197,7 +197,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return jiraChangeGroupPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -209,14 +209,14 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return jiraChangeGroupPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public JIRAChangeGroup fetchJIRAChangeGroup(long jiraChangeGroupId) {
 		return jiraChangeGroupPersistence.fetchByPrimaryKey(jiraChangeGroupId);
 	}
@@ -228,13 +228,13 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @return the j i r a change group
 	 * @throws PortalException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup getJIRAChangeGroup(long jiraChangeGroupId)
 		throws PortalException {
 		return jiraChangeGroupPersistence.findByPrimaryKey(jiraChangeGroupId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -247,7 +247,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -273,13 +273,13 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return jiraChangeGroupLocalService.deleteJIRAChangeGroup((JIRAChangeGroup)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return jiraChangeGroupPersistence.findByPrimaryKey(primaryKeyObj);
@@ -296,7 +296,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @param end the upper bound of the range of j i r a change groups (not inclusive)
 	 * @return the range of j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> getJIRAChangeGroups(int start, int end) {
 		return jiraChangeGroupPersistence.findAll(start, end);
 	}
@@ -306,7 +306,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 *
 	 * @return the number of j i r a change groups
 	 */
-	@Override
+
 	public int getJIRAChangeGroupsCount() {
 		return jiraChangeGroupPersistence.countAll();
 	}
@@ -318,7 +318,7 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 * @return the j i r a change group that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAChangeGroup updateJIRAChangeGroup(
 		JIRAChangeGroup jiraChangeGroup) {
 		return jiraChangeGroupPersistence.update(jiraChangeGroup);
@@ -777,12 +777,12 @@ public abstract class JIRAChangeGroupLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return JIRAChangeGroupLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceClpInvoker.java
index 22b88ef5ff0..4cf1e44b600 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeGroupLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceBaseImpl.java
index ca7d56188d0..9c6908c607e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -88,7 +88,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @return the j i r a change item that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAChangeItem addJIRAChangeItem(JIRAChangeItem jiraChangeItem) {
 		jiraChangeItem.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param jiraChangeItemId the primary key for the new j i r a change item
 	 * @return the new j i r a change item
 	 */
-	@Override
+
 	public JIRAChangeItem createJIRAChangeItem(long jiraChangeItemId) {
 		return jiraChangeItemPersistence.create(jiraChangeItemId);
 	}
@@ -114,7 +114,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @throws PortalException if a j i r a change item with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAChangeItem deleteJIRAChangeItem(long jiraChangeItemId)
 		throws PortalException {
 		return jiraChangeItemPersistence.remove(jiraChangeItemId);
@@ -127,12 +127,12 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @return the j i r a change item that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAChangeItem deleteJIRAChangeItem(JIRAChangeItem jiraChangeItem) {
 		return jiraChangeItemPersistence.remove(jiraChangeItem);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -146,7 +146,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return jiraChangeItemPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -163,7 +163,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return jiraChangeItemPersistence.findWithDynamicQuery(dynamicQuery,
@@ -183,7 +183,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return jiraChangeItemPersistence.findWithDynamicQuery(dynamicQuery,
@@ -196,7 +196,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return jiraChangeItemPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -208,14 +208,14 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return jiraChangeItemPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public JIRAChangeItem fetchJIRAChangeItem(long jiraChangeItemId) {
 		return jiraChangeItemPersistence.fetchByPrimaryKey(jiraChangeItemId);
 	}
@@ -227,13 +227,13 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @return the j i r a change item
 	 * @throws PortalException if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem getJIRAChangeItem(long jiraChangeItemId)
 		throws PortalException {
 		return jiraChangeItemPersistence.findByPrimaryKey(jiraChangeItemId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -246,7 +246,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -272,13 +272,13 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return jiraChangeItemLocalService.deleteJIRAChangeItem((JIRAChangeItem)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return jiraChangeItemPersistence.findByPrimaryKey(primaryKeyObj);
@@ -295,7 +295,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @param end the upper bound of the range of j i r a change items (not inclusive)
 	 * @return the range of j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> getJIRAChangeItems(int start, int end) {
 		return jiraChangeItemPersistence.findAll(start, end);
 	}
@@ -305,7 +305,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 *
 	 * @return the number of j i r a change items
 	 */
-	@Override
+
 	public int getJIRAChangeItemsCount() {
 		return jiraChangeItemPersistence.countAll();
 	}
@@ -317,7 +317,7 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 * @return the j i r a change item that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAChangeItem updateJIRAChangeItem(JIRAChangeItem jiraChangeItem) {
 		return jiraChangeItemPersistence.update(jiraChangeItem);
 	}
@@ -775,12 +775,12 @@ public abstract class JIRAChangeItemLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return JIRAChangeItemLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceClpInvoker.java
index 2558cf91275..f7cf7ad5577 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAChangeItemLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceBaseImpl.java
index d235e4f0e3c..1c0898ad4da 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -87,7 +87,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the j i r a issue that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAIssue addJIRAIssue(JIRAIssue jiraIssue) {
 		jiraIssue.setNew(true);
 
@@ -100,7 +100,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param jiraIssueId the primary key for the new j i r a issue
 	 * @return the new j i r a issue
 	 */
-	@Override
+
 	public JIRAIssue createJIRAIssue(long jiraIssueId) {
 		return jiraIssuePersistence.create(jiraIssueId);
 	}
@@ -113,7 +113,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a j i r a issue with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAIssue deleteJIRAIssue(long jiraIssueId)
 		throws PortalException {
 		return jiraIssuePersistence.remove(jiraIssueId);
@@ -126,12 +126,12 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the j i r a issue that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAIssue deleteJIRAIssue(JIRAIssue jiraIssue) {
 		return jiraIssuePersistence.remove(jiraIssue);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -145,7 +145,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return jiraIssuePersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -162,7 +162,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return jiraIssuePersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -182,7 +182,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return jiraIssuePersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -195,7 +195,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return jiraIssuePersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -207,14 +207,14 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return jiraIssuePersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public JIRAIssue fetchJIRAIssue(long jiraIssueId) {
 		return jiraIssuePersistence.fetchByPrimaryKey(jiraIssueId);
 	}
@@ -226,12 +226,12 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the j i r a issue
 	 * @throws PortalException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue getJIRAIssue(long jiraIssueId) throws PortalException {
 		return jiraIssuePersistence.findByPrimaryKey(jiraIssueId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -244,7 +244,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -269,13 +269,13 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return jiraIssueLocalService.deleteJIRAIssue((JIRAIssue)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return jiraIssuePersistence.findByPrimaryKey(primaryKeyObj);
@@ -292,7 +292,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> getJIRAIssues(int start, int end) {
 		return jiraIssuePersistence.findAll(start, end);
 	}
@@ -302,7 +302,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of j i r a issues
 	 */
-	@Override
+
 	public int getJIRAIssuesCount() {
 		return jiraIssuePersistence.countAll();
 	}
@@ -314,7 +314,7 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the j i r a issue that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAIssue updateJIRAIssue(JIRAIssue jiraIssue) {
 		return jiraIssuePersistence.update(jiraIssue);
 	}
@@ -772,12 +772,12 @@ public abstract class JIRAIssueLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return JIRAIssueLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceClpInvoker.java
index 7384a5f56f5..0e12beac8d8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAIssueLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceBaseImpl.java
index 76cd812c3ff..82e796ff6f2 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -88,7 +88,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @return the j i r a project that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAProject addJIRAProject(JIRAProject jiraProject) {
 		jiraProject.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param jiraProjectId the primary key for the new j i r a project
 	 * @return the new j i r a project
 	 */
-	@Override
+
 	public JIRAProject createJIRAProject(long jiraProjectId) {
 		return jiraProjectPersistence.create(jiraProjectId);
 	}
@@ -114,7 +114,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @throws PortalException if a j i r a project with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAProject deleteJIRAProject(long jiraProjectId)
 		throws PortalException {
 		return jiraProjectPersistence.remove(jiraProjectId);
@@ -127,12 +127,12 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @return the j i r a project that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public JIRAProject deleteJIRAProject(JIRAProject jiraProject) {
 		return jiraProjectPersistence.remove(jiraProject);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -146,7 +146,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return jiraProjectPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -163,7 +163,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return jiraProjectPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -183,7 +183,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return jiraProjectPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -196,7 +196,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return jiraProjectPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -208,14 +208,14 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return jiraProjectPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public JIRAProject fetchJIRAProject(long jiraProjectId) {
 		return jiraProjectPersistence.fetchByPrimaryKey(jiraProjectId);
 	}
@@ -227,13 +227,13 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @return the j i r a project
 	 * @throws PortalException if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject getJIRAProject(long jiraProjectId)
 		throws PortalException {
 		return jiraProjectPersistence.findByPrimaryKey(jiraProjectId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -246,7 +246,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -272,13 +272,13 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return jiraProjectLocalService.deleteJIRAProject((JIRAProject)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return jiraProjectPersistence.findByPrimaryKey(primaryKeyObj);
@@ -295,7 +295,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @param end the upper bound of the range of j i r a projects (not inclusive)
 	 * @return the range of j i r a projects
 	 */
-	@Override
+
 	public List<JIRAProject> getJIRAProjects(int start, int end) {
 		return jiraProjectPersistence.findAll(start, end);
 	}
@@ -305,7 +305,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 *
 	 * @return the number of j i r a projects
 	 */
-	@Override
+
 	public int getJIRAProjectsCount() {
 		return jiraProjectPersistence.countAll();
 	}
@@ -317,7 +317,7 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 * @return the j i r a project that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public JIRAProject updateJIRAProject(JIRAProject jiraProject) {
 		return jiraProjectPersistence.update(jiraProject);
 	}
@@ -775,12 +775,12 @@ public abstract class JIRAProjectLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return JIRAProjectLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceClpInvoker.java
index 359d4082d22..a7b1ffb394c 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/JIRAProjectLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceBaseImpl.java
index 2604b8e5f87..b0d5251809b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -88,7 +88,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @return the s v n repository that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SVNRepository addSVNRepository(SVNRepository svnRepository) {
 		svnRepository.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param svnRepositoryId the primary key for the new s v n repository
 	 * @return the new s v n repository
 	 */
-	@Override
+
 	public SVNRepository createSVNRepository(long svnRepositoryId) {
 		return svnRepositoryPersistence.create(svnRepositoryId);
 	}
@@ -114,7 +114,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @throws PortalException if a s v n repository with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SVNRepository deleteSVNRepository(long svnRepositoryId)
 		throws PortalException {
 		return svnRepositoryPersistence.remove(svnRepositoryId);
@@ -127,12 +127,12 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @return the s v n repository that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SVNRepository deleteSVNRepository(SVNRepository svnRepository) {
 		return svnRepositoryPersistence.remove(svnRepository);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -146,7 +146,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return svnRepositoryPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -163,7 +163,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return svnRepositoryPersistence.findWithDynamicQuery(dynamicQuery,
@@ -183,7 +183,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return svnRepositoryPersistence.findWithDynamicQuery(dynamicQuery,
@@ -196,7 +196,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return svnRepositoryPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -208,14 +208,14 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return svnRepositoryPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public SVNRepository fetchSVNRepository(long svnRepositoryId) {
 		return svnRepositoryPersistence.fetchByPrimaryKey(svnRepositoryId);
 	}
@@ -227,13 +227,13 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @return the s v n repository
 	 * @throws PortalException if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository getSVNRepository(long svnRepositoryId)
 		throws PortalException {
 		return svnRepositoryPersistence.findByPrimaryKey(svnRepositoryId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -246,7 +246,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -272,13 +272,13 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return svnRepositoryLocalService.deleteSVNRepository((SVNRepository)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return svnRepositoryPersistence.findByPrimaryKey(primaryKeyObj);
@@ -295,7 +295,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of s v n repositories (not inclusive)
 	 * @return the range of s v n repositories
 	 */
-	@Override
+
 	public List<SVNRepository> getSVNRepositories(int start, int end) {
 		return svnRepositoryPersistence.findAll(start, end);
 	}
@@ -305,7 +305,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 *
 	 * @return the number of s v n repositories
 	 */
-	@Override
+
 	public int getSVNRepositoriesCount() {
 		return svnRepositoryPersistence.countAll();
 	}
@@ -317,7 +317,7 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 * @return the s v n repository that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SVNRepository updateSVNRepository(SVNRepository svnRepository) {
 		return svnRepositoryPersistence.update(svnRepository);
 	}
@@ -775,12 +775,12 @@ public abstract class SVNRepositoryLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return SVNRepositoryLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceClpInvoker.java
index 59218f55b94..3a36e67eb18 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRepositoryLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceBaseImpl.java
index b0091875b94..449fa539a28 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
@@ -88,7 +88,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @return the s v n revision that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SVNRevision addSVNRevision(SVNRevision svnRevision) {
 		svnRevision.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param svnRevisionId the primary key for the new s v n revision
 	 * @return the new s v n revision
 	 */
-	@Override
+
 	public SVNRevision createSVNRevision(long svnRevisionId) {
 		return svnRevisionPersistence.create(svnRevisionId);
 	}
@@ -114,7 +114,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @throws PortalException if a s v n revision with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SVNRevision deleteSVNRevision(long svnRevisionId)
 		throws PortalException {
 		return svnRevisionPersistence.remove(svnRevisionId);
@@ -127,12 +127,12 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @return the s v n revision that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public SVNRevision deleteSVNRevision(SVNRevision svnRevision) {
 		return svnRevisionPersistence.remove(svnRevision);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -146,7 +146,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return svnRevisionPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -163,7 +163,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return svnRevisionPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -183,7 +183,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return svnRevisionPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -196,7 +196,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return svnRevisionPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -208,14 +208,14 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return svnRevisionPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public SVNRevision fetchSVNRevision(long svnRevisionId) {
 		return svnRevisionPersistence.fetchByPrimaryKey(svnRevisionId);
 	}
@@ -227,13 +227,13 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @return the s v n revision
 	 * @throws PortalException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision getSVNRevision(long svnRevisionId)
 		throws PortalException {
 		return svnRevisionPersistence.findByPrimaryKey(svnRevisionId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -246,7 +246,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -272,13 +272,13 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return svnRevisionLocalService.deleteSVNRevision((SVNRevision)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return svnRevisionPersistence.findByPrimaryKey(primaryKeyObj);
@@ -295,7 +295,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @param end the upper bound of the range of s v n revisions (not inclusive)
 	 * @return the range of s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> getSVNRevisions(int start, int end) {
 		return svnRevisionPersistence.findAll(start, end);
 	}
@@ -305,7 +305,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 *
 	 * @return the number of s v n revisions
 	 */
-	@Override
+
 	public int getSVNRevisionsCount() {
 		return svnRevisionPersistence.countAll();
 	}
@@ -317,7 +317,7 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 * @return the s v n revision that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public SVNRevision updateSVNRevision(SVNRevision svnRevision) {
 		return svnRevisionPersistence.update(svnRevision);
 	}
@@ -775,12 +775,12 @@ public abstract class SVNRevisionLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return SVNRevisionLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceClpInvoker.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceClpInvoker.java
index b67d2e98c27..576f59fb943 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceClpInvoker.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/base/SVNRevisionLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.base;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAActionLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAActionLocalServiceImpl.java
index 512dec663e8..0047408aff8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAActionLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAActionLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
@@ -23,7 +23,7 @@ import com.liferay.socialcoding.service.base.JIRAActionLocalServiceBaseImpl;
  */
 public class JIRAActionLocalServiceImpl extends JIRAActionLocalServiceBaseImpl {
 
-	@Override
+
 	public JIRAAction getJIRAAction(long jiraActionId) throws PortalException {
 		return jiraActionPersistence.findByPrimaryKey(jiraActionId);
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeGroupLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeGroupLocalServiceImpl.java
index 50745d5380e..b453b9db48b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeGroupLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeGroupLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
@@ -24,7 +24,7 @@ import com.liferay.socialcoding.service.base.JIRAChangeGroupLocalServiceBaseImpl
 public class JIRAChangeGroupLocalServiceImpl
 	extends JIRAChangeGroupLocalServiceBaseImpl {
 
-	@Override
+
 	public JIRAChangeGroup getJIRAChangeGroup(long jiraChangeGroupId)
 		throws PortalException {
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeItemLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeItemLocalServiceImpl.java
index 9558e47c8c4..5a915720657 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeItemLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAChangeItemLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
@@ -26,7 +26,7 @@ import java.util.List;
 public class JIRAChangeItemLocalServiceImpl
 	extends JIRAChangeItemLocalServiceBaseImpl {
 
-	@Override
+
 	public JIRAChangeItem getJIRAChangeItem(long jiraChangeItemId)
 		throws PortalException {
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAIssueLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAIssueLocalServiceImpl.java
index cbd33cfd1c2..cdf42447ec7 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAIssueLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAIssueLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
@@ -122,7 +122,7 @@ public class JIRAIssueLocalServiceImpl extends JIRAIssueLocalServiceBaseImpl {
 		}
 	}
 
-	@Override
+
 	public JIRAIssue getJIRAIssue(long jiraIssueId) throws PortalException {
 		return jiraIssuePersistence.findByPrimaryKey(jiraIssueId);
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAProjectLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAProjectLocalServiceImpl.java
index acf79636a63..1fa89a33e6a 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAProjectLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/JIRAProjectLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRepositoryLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRepositoryLocalServiceImpl.java
index 37d21cad964..1e1d63af8f4 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRepositoryLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRepositoryLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
@@ -37,7 +37,7 @@ import org.tmatesoft.svn.core.wc.SVNWCUtil;
 public class SVNRepositoryLocalServiceImpl
 	extends SVNRepositoryLocalServiceBaseImpl {
 
-	@Override
+
 	public SVNRepository getSVNRepository(long svnRepositoryId)
 		throws PortalException {
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRevisionLocalServiceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRevisionLocalServiceImpl.java
index 677d12686b5..b621ce96384 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRevisionLocalServiceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/impl/SVNRevisionLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.impl;
@@ -115,7 +115,7 @@ public class SVNRevisionLocalServiceImpl
 		}
 	}
 
-	@Override
+
 	public SVNRevision getSVNRevision(long svnRevisionId)
 		throws PortalException {
 
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderBaseImpl.java
index 723d6d7a371..67d1b5d8dd8 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -27,7 +27,7 @@ import java.util.Set;
  * @generated
  */
 public class JIRAActionFinderBaseImpl extends BasePersistenceImpl<JIRAAction> {
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return getJIRAActionPersistence().getBadColumnNames();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderImpl.java
index 279b9207bcb..0ede7a41711 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionFinderImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionPersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionPersistenceImpl.java
index 478b40cb706..a9afd85b67e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionPersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAActionPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -116,7 +116,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param jiraUserId the jira user ID
 	 * @return the matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraUserId(String jiraUserId) {
 		return findByJiraUserId(jiraUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -134,7 +134,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param end the upper bound of the range of j i r a actions (not inclusive)
 	 * @return the range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraUserId(String jiraUserId, int start,
 		int end) {
 		return findByJiraUserId(jiraUserId, start, end, null);
@@ -153,7 +153,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraUserId(String jiraUserId, int start,
 		int end, OrderByComparator<JIRAAction> orderByComparator) {
 		return findByJiraUserId(jiraUserId, start, end, orderByComparator, true);
@@ -173,7 +173,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraUserId(String jiraUserId, int start,
 		int end, OrderByComparator<JIRAAction> orderByComparator,
 		boolean retrieveFromCache) {
@@ -298,7 +298,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the first matching j i r a action
 	 * @throws NoSuchJIRAActionException if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction findByJiraUserId_First(String jiraUserId,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -328,7 +328,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a action, or <code>null</code> if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByJiraUserId_First(String jiraUserId,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		List<JIRAAction> list = findByJiraUserId(jiraUserId, 0, 1,
@@ -349,7 +349,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the last matching j i r a action
 	 * @throws NoSuchJIRAActionException if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction findByJiraUserId_Last(String jiraUserId,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -379,7 +379,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a action, or <code>null</code> if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByJiraUserId_Last(String jiraUserId,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		int count = countByJiraUserId(jiraUserId);
@@ -407,7 +407,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the previous, current, and next j i r a action
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction[] findByJiraUserId_PrevAndNext(long jiraActionId,
 		String jiraUserId, OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -563,7 +563,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @param jiraUserId the jira user ID
 	 */
-	@Override
+
 	public void removeByJiraUserId(String jiraUserId) {
 		for (JIRAAction jiraAction : findByJiraUserId(jiraUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -577,7 +577,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param jiraUserId the jira user ID
 	 * @return the number of matching j i r a actions
 	 */
-	@Override
+
 	public int countByJiraUserId(String jiraUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_JIRAUSERID;
 
@@ -667,7 +667,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param jiraIssueId the jira issue ID
 	 * @return the matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraIssueId(long jiraIssueId) {
 		return findByJiraIssueId(jiraIssueId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -685,7 +685,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param end the upper bound of the range of j i r a actions (not inclusive)
 	 * @return the range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraIssueId(long jiraIssueId, int start,
 		int end) {
 		return findByJiraIssueId(jiraIssueId, start, end, null);
@@ -704,7 +704,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraIssueId(long jiraIssueId, int start,
 		int end, OrderByComparator<JIRAAction> orderByComparator) {
 		return findByJiraIssueId(jiraIssueId, start, end, orderByComparator,
@@ -725,7 +725,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByJiraIssueId(long jiraIssueId, int start,
 		int end, OrderByComparator<JIRAAction> orderByComparator,
 		boolean retrieveFromCache) {
@@ -836,7 +836,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the first matching j i r a action
 	 * @throws NoSuchJIRAActionException if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction findByJiraIssueId_First(long jiraIssueId,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -866,7 +866,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a action, or <code>null</code> if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByJiraIssueId_First(long jiraIssueId,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		List<JIRAAction> list = findByJiraIssueId(jiraIssueId, 0, 1,
@@ -887,7 +887,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the last matching j i r a action
 	 * @throws NoSuchJIRAActionException if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction findByJiraIssueId_Last(long jiraIssueId,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -917,7 +917,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a action, or <code>null</code> if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByJiraIssueId_Last(long jiraIssueId,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		int count = countByJiraIssueId(jiraIssueId);
@@ -945,7 +945,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the previous, current, and next j i r a action
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction[] findByJiraIssueId_PrevAndNext(long jiraActionId,
 		long jiraIssueId, OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -1087,7 +1087,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @param jiraIssueId the jira issue ID
 	 */
-	@Override
+
 	public void removeByJiraIssueId(long jiraIssueId) {
 		for (JIRAAction jiraAction : findByJiraIssueId(jiraIssueId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1101,7 +1101,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param jiraIssueId the jira issue ID
 	 * @return the number of matching j i r a actions
 	 */
-	@Override
+
 	public int countByJiraIssueId(long jiraIssueId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_JIRAISSUEID;
 
@@ -1173,7 +1173,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param type the type
 	 * @return the matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByType(String type) {
 		return findByType(type, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1190,7 +1190,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param end the upper bound of the range of j i r a actions (not inclusive)
 	 * @return the range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByType(String type, int start, int end) {
 		return findByType(type, start, end, null);
 	}
@@ -1208,7 +1208,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByType(String type, int start, int end,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		return findByType(type, start, end, orderByComparator, true);
@@ -1228,7 +1228,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findByType(String type, int start, int end,
 		OrderByComparator<JIRAAction> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1353,7 +1353,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the first matching j i r a action
 	 * @throws NoSuchJIRAActionException if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction findByType_First(String type,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -1382,7 +1382,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a action, or <code>null</code> if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByType_First(String type,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		List<JIRAAction> list = findByType(type, 0, 1, orderByComparator);
@@ -1402,7 +1402,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the last matching j i r a action
 	 * @throws NoSuchJIRAActionException if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction findByType_Last(String type,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -1431,7 +1431,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a action, or <code>null</code> if a matching j i r a action could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByType_Last(String type,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		int count = countByType(type);
@@ -1459,7 +1459,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the previous, current, and next j i r a action
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction[] findByType_PrevAndNext(long jiraActionId, String type,
 		OrderByComparator<JIRAAction> orderByComparator)
 		throws NoSuchJIRAActionException {
@@ -1615,7 +1615,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @param type the type
 	 */
-	@Override
+
 	public void removeByType(String type) {
 		for (JIRAAction jiraAction : findByType(type, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1629,7 +1629,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param type the type
 	 * @return the number of matching j i r a actions
 	 */
-	@Override
+
 	public int countByType(String type) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_TYPE;
 
@@ -1701,7 +1701,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @param jiraAction the j i r a action
 	 */
-	@Override
+
 	public void cacheResult(JIRAAction jiraAction) {
 		entityCache.putResult(JIRAActionModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAActionImpl.class, jiraAction.getPrimaryKey(), jiraAction);
@@ -1714,7 +1714,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @param jiraActions the j i r a actions
 	 */
-	@Override
+
 	public void cacheResult(List<JIRAAction> jiraActions) {
 		for (JIRAAction jiraAction : jiraActions) {
 			if (entityCache.getResult(
@@ -1735,7 +1735,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(JIRAActionImpl.class);
 
@@ -1751,7 +1751,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(JIRAAction jiraAction) {
 		entityCache.removeResult(JIRAActionModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAActionImpl.class, jiraAction.getPrimaryKey());
@@ -1760,7 +1760,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<JIRAAction> jiraActions) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -1777,7 +1777,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param jiraActionId the primary key for the new j i r a action
 	 * @return the new j i r a action
 	 */
-	@Override
+
 	public JIRAAction create(long jiraActionId) {
 		JIRAAction jiraAction = new JIRAActionImpl();
 
@@ -1794,7 +1794,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the j i r a action that was removed
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction remove(long jiraActionId)
 		throws NoSuchJIRAActionException {
 		return remove((Serializable)jiraActionId);
@@ -1807,7 +1807,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the j i r a action that was removed
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction remove(Serializable primaryKey)
 		throws NoSuchJIRAActionException {
 		Session session = null;
@@ -1840,7 +1840,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 		}
 	}
 
-	@Override
+
 	protected JIRAAction removeImpl(JIRAAction jiraAction) {
 		jiraAction = toUnwrappedModel(jiraAction);
 
@@ -1872,7 +1872,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 		return jiraAction;
 	}
 
-	@Override
+
 	public JIRAAction updateImpl(JIRAAction jiraAction) {
 		jiraAction = toUnwrappedModel(jiraAction);
 
@@ -2019,7 +2019,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the j i r a action
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchJIRAActionException {
 		JIRAAction jiraAction = fetchByPrimaryKey(primaryKey);
@@ -2043,7 +2043,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @return the j i r a action
 	 * @throws NoSuchJIRAActionException if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction findByPrimaryKey(long jiraActionId)
 		throws NoSuchJIRAActionException {
 		return findByPrimaryKey((Serializable)jiraActionId);
@@ -2055,7 +2055,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param primaryKey the primary key of the j i r a action
 	 * @return the j i r a action, or <code>null</code> if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByPrimaryKey(Serializable primaryKey) {
 		JIRAAction jiraAction = (JIRAAction)entityCache.getResult(JIRAActionModelImpl.ENTITY_CACHE_ENABLED,
 				JIRAActionImpl.class, primaryKey);
@@ -2101,12 +2101,12 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param jiraActionId the primary key of the j i r a action
 	 * @return the j i r a action, or <code>null</code> if a j i r a action with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAAction fetchByPrimaryKey(long jiraActionId) {
 		return fetchByPrimaryKey((Serializable)jiraActionId);
 	}
 
-	@Override
+
 	public Map<Serializable, JIRAAction> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -2203,7 +2203,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @return the j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -2219,7 +2219,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param end the upper bound of the range of j i r a actions (not inclusive)
 	 * @return the range of j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -2236,7 +2236,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findAll(int start, int end,
 		OrderByComparator<JIRAAction> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -2255,7 +2255,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of j i r a actions
 	 */
-	@Override
+
 	public List<JIRAAction> findAll(int start, int end,
 		OrderByComparator<JIRAAction> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2345,7 +2345,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 * Removes all the j i r a actions from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (JIRAAction jiraAction : findAll()) {
 			remove(jiraAction);
@@ -2357,7 +2357,7 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 	 *
 	 * @return the number of j i r a actions
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -2389,12 +2389,12 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return JIRAActionModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -2428,19 +2428,19 @@ public class JIRAActionPersistenceImpl extends BasePersistenceImpl<JIRAAction>
 				"jiraIssueId", "type", "body", "jiraGroupName"
 			});
 	private static final JIRAAction _nullJIRAAction = new JIRAActionImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<JIRAAction> toCacheModel() {
 				return _nullJIRAActionCacheModel;
 			}
 		};
 
 	private static final CacheModel<JIRAAction> _nullJIRAActionCacheModel = new CacheModel<JIRAAction>() {
-			@Override
+
 			public JIRAAction toEntityModel() {
 				return _nullJIRAAction;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderBaseImpl.java
index 82af563474b..4304a4ae91d 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -27,7 +27,7 @@ import java.util.Set;
  * @generated
  */
 public class JIRAChangeGroupFinderBaseImpl extends BasePersistenceImpl<JIRAChangeGroup> {
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return getJIRAChangeGroupPersistence().getBadColumnNames();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderImpl.java
index 3bc08e76a47..05a306b4d92 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupFinderImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupPersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupPersistenceImpl.java
index f157c39d840..73070c1b4d1 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupPersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeGroupPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -117,7 +117,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param jiraUserId the jira user ID
 	 * @return the matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraUserId(String jiraUserId) {
 		return findByJiraUserId(jiraUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -135,7 +135,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param end the upper bound of the range of j i r a change groups (not inclusive)
 	 * @return the range of matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraUserId(String jiraUserId, int start,
 		int end) {
 		return findByJiraUserId(jiraUserId, start, end, null);
@@ -154,7 +154,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraUserId(String jiraUserId, int start,
 		int end, OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		return findByJiraUserId(jiraUserId, start, end, orderByComparator, true);
@@ -174,7 +174,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraUserId(String jiraUserId, int start,
 		int end, OrderByComparator<JIRAChangeGroup> orderByComparator,
 		boolean retrieveFromCache) {
@@ -300,7 +300,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the first matching j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup findByJiraUserId_First(String jiraUserId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator)
 		throws NoSuchJIRAChangeGroupException {
@@ -330,7 +330,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a change group, or <code>null</code> if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup fetchByJiraUserId_First(String jiraUserId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		List<JIRAChangeGroup> list = findByJiraUserId(jiraUserId, 0, 1,
@@ -351,7 +351,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the last matching j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup findByJiraUserId_Last(String jiraUserId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator)
 		throws NoSuchJIRAChangeGroupException {
@@ -381,7 +381,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a change group, or <code>null</code> if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup fetchByJiraUserId_Last(String jiraUserId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		int count = countByJiraUserId(jiraUserId);
@@ -409,7 +409,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the previous, current, and next j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup[] findByJiraUserId_PrevAndNext(
 		long jiraChangeGroupId, String jiraUserId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator)
@@ -566,7 +566,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 *
 	 * @param jiraUserId the jira user ID
 	 */
-	@Override
+
 	public void removeByJiraUserId(String jiraUserId) {
 		for (JIRAChangeGroup jiraChangeGroup : findByJiraUserId(jiraUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -580,7 +580,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param jiraUserId the jira user ID
 	 * @return the number of matching j i r a change groups
 	 */
-	@Override
+
 	public int countByJiraUserId(String jiraUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_JIRAUSERID;
 
@@ -672,7 +672,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param jiraIssueId the jira issue ID
 	 * @return the matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraIssueId(long jiraIssueId) {
 		return findByJiraIssueId(jiraIssueId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -690,7 +690,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param end the upper bound of the range of j i r a change groups (not inclusive)
 	 * @return the range of matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraIssueId(long jiraIssueId, int start,
 		int end) {
 		return findByJiraIssueId(jiraIssueId, start, end, null);
@@ -709,7 +709,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraIssueId(long jiraIssueId, int start,
 		int end, OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		return findByJiraIssueId(jiraIssueId, start, end, orderByComparator,
@@ -730,7 +730,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findByJiraIssueId(long jiraIssueId, int start,
 		int end, OrderByComparator<JIRAChangeGroup> orderByComparator,
 		boolean retrieveFromCache) {
@@ -841,7 +841,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the first matching j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup findByJiraIssueId_First(long jiraIssueId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator)
 		throws NoSuchJIRAChangeGroupException {
@@ -871,7 +871,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a change group, or <code>null</code> if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup fetchByJiraIssueId_First(long jiraIssueId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		List<JIRAChangeGroup> list = findByJiraIssueId(jiraIssueId, 0, 1,
@@ -892,7 +892,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the last matching j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup findByJiraIssueId_Last(long jiraIssueId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator)
 		throws NoSuchJIRAChangeGroupException {
@@ -922,7 +922,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a change group, or <code>null</code> if a matching j i r a change group could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup fetchByJiraIssueId_Last(long jiraIssueId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		int count = countByJiraIssueId(jiraIssueId);
@@ -950,7 +950,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the previous, current, and next j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup[] findByJiraIssueId_PrevAndNext(
 		long jiraChangeGroupId, long jiraIssueId,
 		OrderByComparator<JIRAChangeGroup> orderByComparator)
@@ -1093,7 +1093,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 *
 	 * @param jiraIssueId the jira issue ID
 	 */
-	@Override
+
 	public void removeByJiraIssueId(long jiraIssueId) {
 		for (JIRAChangeGroup jiraChangeGroup : findByJiraIssueId(jiraIssueId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1107,7 +1107,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param jiraIssueId the jira issue ID
 	 * @return the number of matching j i r a change groups
 	 */
-	@Override
+
 	public int countByJiraIssueId(long jiraIssueId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_JIRAISSUEID;
 
@@ -1163,7 +1163,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 *
 	 * @param jiraChangeGroup the j i r a change group
 	 */
-	@Override
+
 	public void cacheResult(JIRAChangeGroup jiraChangeGroup) {
 		entityCache.putResult(JIRAChangeGroupModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAChangeGroupImpl.class, jiraChangeGroup.getPrimaryKey(),
@@ -1177,7 +1177,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 *
 	 * @param jiraChangeGroups the j i r a change groups
 	 */
-	@Override
+
 	public void cacheResult(List<JIRAChangeGroup> jiraChangeGroups) {
 		for (JIRAChangeGroup jiraChangeGroup : jiraChangeGroups) {
 			if (entityCache.getResult(
@@ -1199,7 +1199,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(JIRAChangeGroupImpl.class);
 
@@ -1215,7 +1215,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(JIRAChangeGroup jiraChangeGroup) {
 		entityCache.removeResult(JIRAChangeGroupModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAChangeGroupImpl.class, jiraChangeGroup.getPrimaryKey());
@@ -1224,7 +1224,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<JIRAChangeGroup> jiraChangeGroups) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -1241,7 +1241,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param jiraChangeGroupId the primary key for the new j i r a change group
 	 * @return the new j i r a change group
 	 */
-	@Override
+
 	public JIRAChangeGroup create(long jiraChangeGroupId) {
 		JIRAChangeGroup jiraChangeGroup = new JIRAChangeGroupImpl();
 
@@ -1258,7 +1258,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the j i r a change group that was removed
 	 * @throws NoSuchJIRAChangeGroupException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup remove(long jiraChangeGroupId)
 		throws NoSuchJIRAChangeGroupException {
 		return remove((Serializable)jiraChangeGroupId);
@@ -1271,7 +1271,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the j i r a change group that was removed
 	 * @throws NoSuchJIRAChangeGroupException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup remove(Serializable primaryKey)
 		throws NoSuchJIRAChangeGroupException {
 		Session session = null;
@@ -1304,7 +1304,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 		}
 	}
 
-	@Override
+
 	protected JIRAChangeGroup removeImpl(JIRAChangeGroup jiraChangeGroup) {
 		jiraChangeGroup = toUnwrappedModel(jiraChangeGroup);
 
@@ -1336,7 +1336,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 		return jiraChangeGroup;
 	}
 
-	@Override
+
 	public JIRAChangeGroup updateImpl(JIRAChangeGroup jiraChangeGroup) {
 		jiraChangeGroup = toUnwrappedModel(jiraChangeGroup);
 
@@ -1441,7 +1441,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchJIRAChangeGroupException {
 		JIRAChangeGroup jiraChangeGroup = fetchByPrimaryKey(primaryKey);
@@ -1465,7 +1465,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @return the j i r a change group
 	 * @throws NoSuchJIRAChangeGroupException if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup findByPrimaryKey(long jiraChangeGroupId)
 		throws NoSuchJIRAChangeGroupException {
 		return findByPrimaryKey((Serializable)jiraChangeGroupId);
@@ -1477,7 +1477,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param primaryKey the primary key of the j i r a change group
 	 * @return the j i r a change group, or <code>null</code> if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup fetchByPrimaryKey(Serializable primaryKey) {
 		JIRAChangeGroup jiraChangeGroup = (JIRAChangeGroup)entityCache.getResult(JIRAChangeGroupModelImpl.ENTITY_CACHE_ENABLED,
 				JIRAChangeGroupImpl.class, primaryKey);
@@ -1524,12 +1524,12 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param jiraChangeGroupId the primary key of the j i r a change group
 	 * @return the j i r a change group, or <code>null</code> if a j i r a change group with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeGroup fetchByPrimaryKey(long jiraChangeGroupId) {
 		return fetchByPrimaryKey((Serializable)jiraChangeGroupId);
 	}
 
-	@Override
+
 	public Map<Serializable, JIRAChangeGroup> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1626,7 +1626,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 *
 	 * @return the j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1642,7 +1642,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param end the upper bound of the range of j i r a change groups (not inclusive)
 	 * @return the range of j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1659,7 +1659,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findAll(int start, int end,
 		OrderByComparator<JIRAChangeGroup> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1678,7 +1678,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of j i r a change groups
 	 */
-	@Override
+
 	public List<JIRAChangeGroup> findAll(int start, int end,
 		OrderByComparator<JIRAChangeGroup> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1768,7 +1768,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 * Removes all the j i r a change groups from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (JIRAChangeGroup jiraChangeGroup : findAll()) {
 			remove(jiraChangeGroup);
@@ -1780,7 +1780,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 	 *
 	 * @return the number of j i r a change groups
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1812,12 +1812,12 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return JIRAChangeGroupModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1850,12 +1850,12 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 				"jiraChangeGroupId", "jiraUserId", "createDate", "jiraIssueId"
 			});
 	private static final JIRAChangeGroup _nullJIRAChangeGroup = new JIRAChangeGroupImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<JIRAChangeGroup> toCacheModel() {
 				return _nullJIRAChangeGroupCacheModel;
 			}
@@ -1863,7 +1863,7 @@ public class JIRAChangeGroupPersistenceImpl extends BasePersistenceImpl<JIRAChan
 
 	private static final CacheModel<JIRAChangeGroup> _nullJIRAChangeGroupCacheModel =
 		new CacheModel<JIRAChangeGroup>() {
-			@Override
+
 			public JIRAChangeGroup toEntityModel() {
 				return _nullJIRAChangeGroup;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeItemPersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeItemPersistenceImpl.java
index bb01a54aa80..b785a482ad9 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeItemPersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAChangeItemPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -115,7 +115,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param jiraChangeGroupId the jira change group ID
 	 * @return the matching j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findByJiraChangeGroupId(long jiraChangeGroupId) {
 		return findByJiraChangeGroupId(jiraChangeGroupId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -133,7 +133,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param end the upper bound of the range of j i r a change items (not inclusive)
 	 * @return the range of matching j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findByJiraChangeGroupId(
 		long jiraChangeGroupId, int start, int end) {
 		return findByJiraChangeGroupId(jiraChangeGroupId, start, end, null);
@@ -152,7 +152,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findByJiraChangeGroupId(
 		long jiraChangeGroupId, int start, int end,
 		OrderByComparator<JIRAChangeItem> orderByComparator) {
@@ -174,7 +174,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findByJiraChangeGroupId(
 		long jiraChangeGroupId, int start, int end,
 		OrderByComparator<JIRAChangeItem> orderByComparator,
@@ -290,7 +290,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the first matching j i r a change item
 	 * @throws NoSuchJIRAChangeItemException if a matching j i r a change item could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem findByJiraChangeGroupId_First(
 		long jiraChangeGroupId,
 		OrderByComparator<JIRAChangeItem> orderByComparator)
@@ -321,7 +321,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a change item, or <code>null</code> if a matching j i r a change item could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem fetchByJiraChangeGroupId_First(
 		long jiraChangeGroupId,
 		OrderByComparator<JIRAChangeItem> orderByComparator) {
@@ -343,7 +343,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the last matching j i r a change item
 	 * @throws NoSuchJIRAChangeItemException if a matching j i r a change item could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem findByJiraChangeGroupId_Last(long jiraChangeGroupId,
 		OrderByComparator<JIRAChangeItem> orderByComparator)
 		throws NoSuchJIRAChangeItemException {
@@ -373,7 +373,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a change item, or <code>null</code> if a matching j i r a change item could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem fetchByJiraChangeGroupId_Last(
 		long jiraChangeGroupId,
 		OrderByComparator<JIRAChangeItem> orderByComparator) {
@@ -402,7 +402,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the previous, current, and next j i r a change item
 	 * @throws NoSuchJIRAChangeItemException if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem[] findByJiraChangeGroupId_PrevAndNext(
 		long jiraChangeItemId, long jiraChangeGroupId,
 		OrderByComparator<JIRAChangeItem> orderByComparator)
@@ -545,7 +545,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 *
 	 * @param jiraChangeGroupId the jira change group ID
 	 */
-	@Override
+
 	public void removeByJiraChangeGroupId(long jiraChangeGroupId) {
 		for (JIRAChangeItem jiraChangeItem : findByJiraChangeGroupId(
 				jiraChangeGroupId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -559,7 +559,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param jiraChangeGroupId the jira change group ID
 	 * @return the number of matching j i r a change items
 	 */
-	@Override
+
 	public int countByJiraChangeGroupId(long jiraChangeGroupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_JIRACHANGEGROUPID;
 
@@ -616,7 +616,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 *
 	 * @param jiraChangeItem the j i r a change item
 	 */
-	@Override
+
 	public void cacheResult(JIRAChangeItem jiraChangeItem) {
 		entityCache.putResult(JIRAChangeItemModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAChangeItemImpl.class, jiraChangeItem.getPrimaryKey(),
@@ -630,7 +630,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 *
 	 * @param jiraChangeItems the j i r a change items
 	 */
-	@Override
+
 	public void cacheResult(List<JIRAChangeItem> jiraChangeItems) {
 		for (JIRAChangeItem jiraChangeItem : jiraChangeItems) {
 			if (entityCache.getResult(
@@ -651,7 +651,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(JIRAChangeItemImpl.class);
 
@@ -667,7 +667,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(JIRAChangeItem jiraChangeItem) {
 		entityCache.removeResult(JIRAChangeItemModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAChangeItemImpl.class, jiraChangeItem.getPrimaryKey());
@@ -676,7 +676,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<JIRAChangeItem> jiraChangeItems) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -693,7 +693,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param jiraChangeItemId the primary key for the new j i r a change item
 	 * @return the new j i r a change item
 	 */
-	@Override
+
 	public JIRAChangeItem create(long jiraChangeItemId) {
 		JIRAChangeItem jiraChangeItem = new JIRAChangeItemImpl();
 
@@ -710,7 +710,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the j i r a change item that was removed
 	 * @throws NoSuchJIRAChangeItemException if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem remove(long jiraChangeItemId)
 		throws NoSuchJIRAChangeItemException {
 		return remove((Serializable)jiraChangeItemId);
@@ -723,7 +723,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the j i r a change item that was removed
 	 * @throws NoSuchJIRAChangeItemException if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem remove(Serializable primaryKey)
 		throws NoSuchJIRAChangeItemException {
 		Session session = null;
@@ -756,7 +756,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 		}
 	}
 
-	@Override
+
 	protected JIRAChangeItem removeImpl(JIRAChangeItem jiraChangeItem) {
 		jiraChangeItem = toUnwrappedModel(jiraChangeItem);
 
@@ -788,7 +788,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 		return jiraChangeItem;
 	}
 
-	@Override
+
 	public JIRAChangeItem updateImpl(JIRAChangeItem jiraChangeItem) {
 		jiraChangeItem = toUnwrappedModel(jiraChangeItem);
 
@@ -883,7 +883,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the j i r a change item
 	 * @throws NoSuchJIRAChangeItemException if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchJIRAChangeItemException {
 		JIRAChangeItem jiraChangeItem = fetchByPrimaryKey(primaryKey);
@@ -907,7 +907,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @return the j i r a change item
 	 * @throws NoSuchJIRAChangeItemException if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem findByPrimaryKey(long jiraChangeItemId)
 		throws NoSuchJIRAChangeItemException {
 		return findByPrimaryKey((Serializable)jiraChangeItemId);
@@ -919,7 +919,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param primaryKey the primary key of the j i r a change item
 	 * @return the j i r a change item, or <code>null</code> if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem fetchByPrimaryKey(Serializable primaryKey) {
 		JIRAChangeItem jiraChangeItem = (JIRAChangeItem)entityCache.getResult(JIRAChangeItemModelImpl.ENTITY_CACHE_ENABLED,
 				JIRAChangeItemImpl.class, primaryKey);
@@ -966,12 +966,12 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param jiraChangeItemId the primary key of the j i r a change item
 	 * @return the j i r a change item, or <code>null</code> if a j i r a change item with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAChangeItem fetchByPrimaryKey(long jiraChangeItemId) {
 		return fetchByPrimaryKey((Serializable)jiraChangeItemId);
 	}
 
-	@Override
+
 	public Map<Serializable, JIRAChangeItem> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1068,7 +1068,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 *
 	 * @return the j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1084,7 +1084,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param end the upper bound of the range of j i r a change items (not inclusive)
 	 * @return the range of j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1101,7 +1101,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findAll(int start, int end,
 		OrderByComparator<JIRAChangeItem> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1120,7 +1120,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of j i r a change items
 	 */
-	@Override
+
 	public List<JIRAChangeItem> findAll(int start, int end,
 		OrderByComparator<JIRAChangeItem> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1210,7 +1210,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 * Removes all the j i r a change items from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (JIRAChangeItem jiraChangeItem : findAll()) {
 			remove(jiraChangeItem);
@@ -1222,7 +1222,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 	 *
 	 * @return the number of j i r a change items
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1254,12 +1254,12 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return JIRAChangeItemModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1292,12 +1292,12 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 				"jiraChangeItemId", "jiraChangeGroupId"
 			});
 	private static final JIRAChangeItem _nullJIRAChangeItem = new JIRAChangeItemImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<JIRAChangeItem> toCacheModel() {
 				return _nullJIRAChangeItemCacheModel;
 			}
@@ -1305,7 +1305,7 @@ public class JIRAChangeItemPersistenceImpl extends BasePersistenceImpl<JIRAChang
 
 	private static final CacheModel<JIRAChangeItem> _nullJIRAChangeItemCacheModel =
 		new CacheModel<JIRAChangeItem>() {
-			@Override
+
 			public JIRAChangeItem toEntityModel() {
 				return _nullJIRAChangeItem;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderBaseImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderBaseImpl.java
index ca71d5cf863..ed00347260b 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderBaseImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -27,7 +27,7 @@ import java.util.Set;
  * @generated
  */
 public class JIRAIssueFinderBaseImpl extends BasePersistenceImpl<JIRAIssue> {
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return getJIRAIssuePersistence().getBadColumnNames();
 	}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderImpl.java
index 894a282a0a6..538269ce982 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssueFinderImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssuePersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssuePersistenceImpl.java
index 1cf3c091576..6e9e40e67de 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssuePersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAIssuePersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -118,7 +118,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByProjectId(long projectId) {
 		return findByProjectId(projectId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -136,7 +136,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByProjectId(long projectId, int start, int end) {
 		return findByProjectId(projectId, start, end, null);
 	}
@@ -154,7 +154,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByProjectId(long projectId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		return findByProjectId(projectId, start, end, orderByComparator, true);
@@ -174,7 +174,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByProjectId(long projectId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
 		boolean retrieveFromCache) {
@@ -285,7 +285,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByProjectId_First(long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -315,7 +315,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByProjectId_First(long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		List<JIRAIssue> list = findByProjectId(projectId, 0, 1,
@@ -336,7 +336,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByProjectId_Last(long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -365,7 +365,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByProjectId_Last(long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		int count = countByProjectId(projectId);
@@ -393,7 +393,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByProjectId_PrevAndNext(long jiraIssueId,
 		long projectId, OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -535,7 +535,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @param projectId the project ID
 	 */
-	@Override
+
 	public void removeByProjectId(long projectId) {
 		for (JIRAIssue jiraIssue : findByProjectId(projectId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -549,7 +549,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByProjectId(long projectId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_PROJECTID;
 
@@ -624,7 +624,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByReporterJiraUserId(String reporterJiraUserId) {
 		return findByReporterJiraUserId(reporterJiraUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -642,7 +642,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByReporterJiraUserId(String reporterJiraUserId,
 		int start, int end) {
 		return findByReporterJiraUserId(reporterJiraUserId, start, end, null);
@@ -661,7 +661,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByReporterJiraUserId(String reporterJiraUserId,
 		int start, int end, OrderByComparator<JIRAIssue> orderByComparator) {
 		return findByReporterJiraUserId(reporterJiraUserId, start, end,
@@ -682,7 +682,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByReporterJiraUserId(String reporterJiraUserId,
 		int start, int end, OrderByComparator<JIRAIssue> orderByComparator,
 		boolean retrieveFromCache) {
@@ -812,7 +812,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByReporterJiraUserId_First(String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -842,7 +842,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByReporterJiraUserId_First(
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -864,7 +864,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByReporterJiraUserId_Last(String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -894,7 +894,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByReporterJiraUserId_Last(String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		int count = countByReporterJiraUserId(reporterJiraUserId);
@@ -922,7 +922,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByReporterJiraUserId_PrevAndNext(long jiraIssueId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -1079,7 +1079,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @param reporterJiraUserId the reporter jira user ID
 	 */
-	@Override
+
 	public void removeByReporterJiraUserId(String reporterJiraUserId) {
 		for (JIRAIssue jiraIssue : findByReporterJiraUserId(
 				reporterJiraUserId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1093,7 +1093,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByReporterJiraUserId(String reporterJiraUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_REPORTERJIRAUSERID;
 
@@ -1187,7 +1187,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByAssigneeJiraUserId(String assigneeJiraUserId) {
 		return findByAssigneeJiraUserId(assigneeJiraUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1205,7 +1205,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByAssigneeJiraUserId(String assigneeJiraUserId,
 		int start, int end) {
 		return findByAssigneeJiraUserId(assigneeJiraUserId, start, end, null);
@@ -1224,7 +1224,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByAssigneeJiraUserId(String assigneeJiraUserId,
 		int start, int end, OrderByComparator<JIRAIssue> orderByComparator) {
 		return findByAssigneeJiraUserId(assigneeJiraUserId, start, end,
@@ -1245,7 +1245,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByAssigneeJiraUserId(String assigneeJiraUserId,
 		int start, int end, OrderByComparator<JIRAIssue> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1375,7 +1375,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByAssigneeJiraUserId_First(String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -1405,7 +1405,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByAssigneeJiraUserId_First(
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -1427,7 +1427,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByAssigneeJiraUserId_Last(String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -1457,7 +1457,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByAssigneeJiraUserId_Last(String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		int count = countByAssigneeJiraUserId(assigneeJiraUserId);
@@ -1485,7 +1485,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByAssigneeJiraUserId_PrevAndNext(long jiraIssueId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -1642,7 +1642,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 */
-	@Override
+
 	public void removeByAssigneeJiraUserId(String assigneeJiraUserId) {
 		for (JIRAIssue jiraIssue : findByAssigneeJiraUserId(
 				assigneeJiraUserId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1656,7 +1656,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByAssigneeJiraUserId(String assigneeJiraUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_ASSIGNEEJIRAUSERID;
 
@@ -1742,7 +1742,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P(Date modifiedDate, long projectId) {
 		return findByMD_P(modifiedDate, projectId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1761,7 +1761,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P(Date modifiedDate, long projectId,
 		int start, int end) {
 		return findByMD_P(modifiedDate, projectId, start, end, null);
@@ -1781,7 +1781,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P(Date modifiedDate, long projectId,
 		int start, int end, OrderByComparator<JIRAIssue> orderByComparator) {
 		return findByMD_P(modifiedDate, projectId, start, end,
@@ -1803,7 +1803,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P(Date modifiedDate, long projectId,
 		int start, int end, OrderByComparator<JIRAIssue> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1928,7 +1928,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByMD_P_First(Date modifiedDate, long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -1962,7 +1962,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByMD_P_First(Date modifiedDate, long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		List<JIRAIssue> list = findByMD_P(modifiedDate, projectId, 0, 1,
@@ -1984,7 +1984,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByMD_P_Last(Date modifiedDate, long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator)
 		throws NoSuchJIRAIssueException {
@@ -2018,7 +2018,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByMD_P_Last(Date modifiedDate, long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		int count = countByMD_P(modifiedDate, projectId);
@@ -2047,7 +2047,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByMD_P_PrevAndNext(long jiraIssueId,
 		Date modifiedDate, long projectId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -2206,7 +2206,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param modifiedDate the modified date
 	 * @param projectId the project ID
 	 */
-	@Override
+
 	public void removeByMD_P(Date modifiedDate, long projectId) {
 		for (JIRAIssue jiraIssue : findByMD_P(modifiedDate, projectId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -2221,7 +2221,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByMD_P(Date modifiedDate, long projectId) {
 		FinderPath finderPath = FINDER_PATH_WITH_PAGINATION_COUNT_BY_MD_P;
 
@@ -2313,7 +2313,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI(long projectId,
 		String reporterJiraUserId) {
 		return findByP_RJUI(projectId, reporterJiraUserId, QueryUtil.ALL_POS,
@@ -2333,7 +2333,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI(long projectId,
 		String reporterJiraUserId, int start, int end) {
 		return findByP_RJUI(projectId, reporterJiraUserId, start, end, null);
@@ -2353,7 +2353,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI(long projectId,
 		String reporterJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -2376,7 +2376,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI(long projectId,
 		String reporterJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
@@ -2513,7 +2513,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_RJUI_First(long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -2548,7 +2548,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_RJUI_First(long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -2571,7 +2571,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_RJUI_Last(long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -2606,7 +2606,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_RJUI_Last(long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -2636,7 +2636,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByP_RJUI_PrevAndNext(long jiraIssueId,
 		long projectId, String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -2798,7 +2798,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @param reporterJiraUserId the reporter jira user ID
 	 */
-	@Override
+
 	public void removeByP_RJUI(long projectId, String reporterJiraUserId) {
 		for (JIRAIssue jiraIssue : findByP_RJUI(projectId, reporterJiraUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -2813,7 +2813,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByP_RJUI(long projectId, String reporterJiraUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_P_RJUI;
 
@@ -2909,7 +2909,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI(long projectId,
 		String assigneeJiraUserId) {
 		return findByP_AJUI(projectId, assigneeJiraUserId, QueryUtil.ALL_POS,
@@ -2929,7 +2929,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI(long projectId,
 		String assigneeJiraUserId, int start, int end) {
 		return findByP_AJUI(projectId, assigneeJiraUserId, start, end, null);
@@ -2949,7 +2949,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI(long projectId,
 		String assigneeJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -2972,7 +2972,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI(long projectId,
 		String assigneeJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
@@ -3109,7 +3109,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_AJUI_First(long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -3144,7 +3144,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_AJUI_First(long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -3167,7 +3167,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_AJUI_Last(long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -3202,7 +3202,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_AJUI_Last(long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -3232,7 +3232,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByP_AJUI_PrevAndNext(long jiraIssueId,
 		long projectId, String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -3394,7 +3394,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 */
-	@Override
+
 	public void removeByP_AJUI(long projectId, String assigneeJiraUserId) {
 		for (JIRAIssue jiraIssue : findByP_AJUI(projectId, assigneeJiraUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -3409,7 +3409,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByP_AJUI(long projectId, String assigneeJiraUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_P_AJUI;
 
@@ -3504,7 +3504,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_RJUI(Date modifiedDate, long projectId,
 		String reporterJiraUserId) {
 		return findByMD_P_RJUI(modifiedDate, projectId, reporterJiraUserId,
@@ -3525,7 +3525,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_RJUI(Date modifiedDate, long projectId,
 		String reporterJiraUserId, int start, int end) {
 		return findByMD_P_RJUI(modifiedDate, projectId, reporterJiraUserId,
@@ -3547,7 +3547,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_RJUI(Date modifiedDate, long projectId,
 		String reporterJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -3571,7 +3571,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_RJUI(Date modifiedDate, long projectId,
 		String reporterJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
@@ -3718,7 +3718,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByMD_P_RJUI_First(Date modifiedDate, long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -3757,7 +3757,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByMD_P_RJUI_First(Date modifiedDate, long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -3781,7 +3781,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByMD_P_RJUI_Last(Date modifiedDate, long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -3820,7 +3820,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByMD_P_RJUI_Last(Date modifiedDate, long projectId,
 		String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -3851,7 +3851,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByMD_P_RJUI_PrevAndNext(long jiraIssueId,
 		Date modifiedDate, long projectId, String reporterJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -4032,7 +4032,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @param reporterJiraUserId the reporter jira user ID
 	 */
-	@Override
+
 	public void removeByMD_P_RJUI(Date modifiedDate, long projectId,
 		String reporterJiraUserId) {
 		for (JIRAIssue jiraIssue : findByMD_P_RJUI(modifiedDate, projectId,
@@ -4049,7 +4049,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByMD_P_RJUI(Date modifiedDate, long projectId,
 		String reporterJiraUserId) {
 		FinderPath finderPath = FINDER_PATH_WITH_PAGINATION_COUNT_BY_MD_P_RJUI;
@@ -4164,7 +4164,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_AJUI(Date modifiedDate, long projectId,
 		String assigneeJiraUserId) {
 		return findByMD_P_AJUI(modifiedDate, projectId, assigneeJiraUserId,
@@ -4185,7 +4185,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_AJUI(Date modifiedDate, long projectId,
 		String assigneeJiraUserId, int start, int end) {
 		return findByMD_P_AJUI(modifiedDate, projectId, assigneeJiraUserId,
@@ -4207,7 +4207,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_AJUI(Date modifiedDate, long projectId,
 		String assigneeJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -4231,7 +4231,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByMD_P_AJUI(Date modifiedDate, long projectId,
 		String assigneeJiraUserId, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
@@ -4378,7 +4378,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByMD_P_AJUI_First(Date modifiedDate, long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -4417,7 +4417,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByMD_P_AJUI_First(Date modifiedDate, long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -4441,7 +4441,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByMD_P_AJUI_Last(Date modifiedDate, long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -4480,7 +4480,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByMD_P_AJUI_Last(Date modifiedDate, long projectId,
 		String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -4511,7 +4511,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByMD_P_AJUI_PrevAndNext(long jiraIssueId,
 		Date modifiedDate, long projectId, String assigneeJiraUserId,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -4692,7 +4692,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param projectId the project ID
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 */
-	@Override
+
 	public void removeByMD_P_AJUI(Date modifiedDate, long projectId,
 		String assigneeJiraUserId) {
 		for (JIRAIssue jiraIssue : findByMD_P_AJUI(modifiedDate, projectId,
@@ -4709,7 +4709,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByMD_P_AJUI(Date modifiedDate, long projectId,
 		String assigneeJiraUserId) {
 		FinderPath finderPath = FINDER_PATH_WITH_PAGINATION_COUNT_BY_MD_P_AJUI;
@@ -4834,7 +4834,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param status the status
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI_S(long projectId,
 		String reporterJiraUserId, String status) {
 		return findByP_RJUI_S(projectId, reporterJiraUserId, status,
@@ -4855,7 +4855,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI_S(long projectId,
 		String reporterJiraUserId, String status, int start, int end) {
 		return findByP_RJUI_S(projectId, reporterJiraUserId, status, start,
@@ -4877,7 +4877,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI_S(long projectId,
 		String reporterJiraUserId, String status, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -4901,7 +4901,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_RJUI_S(long projectId,
 		String reporterJiraUserId, String status, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
@@ -5058,7 +5058,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_RJUI_S_First(long projectId,
 		String reporterJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -5097,7 +5097,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_RJUI_S_First(long projectId,
 		String reporterJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -5121,7 +5121,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_RJUI_S_Last(long projectId,
 		String reporterJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -5160,7 +5160,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_RJUI_S_Last(long projectId,
 		String reporterJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -5191,7 +5191,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByP_RJUI_S_PrevAndNext(long jiraIssueId,
 		long projectId, String reporterJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -5373,7 +5373,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param reporterJiraUserId the reporter jira user ID
 	 * @param status the status
 	 */
-	@Override
+
 	public void removeByP_RJUI_S(long projectId, String reporterJiraUserId,
 		String status) {
 		for (JIRAIssue jiraIssue : findByP_RJUI_S(projectId,
@@ -5391,7 +5391,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param status the status
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByP_RJUI_S(long projectId, String reporterJiraUserId,
 		String status) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_P_RJUI_S;
@@ -5518,7 +5518,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param status the status
 	 * @return the matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI_S(long projectId,
 		String assigneeJiraUserId, String status) {
 		return findByP_AJUI_S(projectId, assigneeJiraUserId, status,
@@ -5539,7 +5539,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI_S(long projectId,
 		String assigneeJiraUserId, String status, int start, int end) {
 		return findByP_AJUI_S(projectId, assigneeJiraUserId, status, start,
@@ -5561,7 +5561,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI_S(long projectId,
 		String assigneeJiraUserId, String status, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -5585,7 +5585,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findByP_AJUI_S(long projectId,
 		String assigneeJiraUserId, String status, int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
@@ -5742,7 +5742,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the first matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_AJUI_S_First(long projectId,
 		String assigneeJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -5781,7 +5781,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_AJUI_S_First(long projectId,
 		String assigneeJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -5805,7 +5805,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the last matching j i r a issue
 	 * @throws NoSuchJIRAIssueException if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByP_AJUI_S_Last(long projectId,
 		String assigneeJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -5844,7 +5844,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching j i r a issue, or <code>null</code> if a matching j i r a issue could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByP_AJUI_S_Last(long projectId,
 		String assigneeJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator) {
@@ -5875,7 +5875,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the previous, current, and next j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue[] findByP_AJUI_S_PrevAndNext(long jiraIssueId,
 		long projectId, String assigneeJiraUserId, String status,
 		OrderByComparator<JIRAIssue> orderByComparator)
@@ -6057,7 +6057,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param assigneeJiraUserId the assignee jira user ID
 	 * @param status the status
 	 */
-	@Override
+
 	public void removeByP_AJUI_S(long projectId, String assigneeJiraUserId,
 		String status) {
 		for (JIRAIssue jiraIssue : findByP_AJUI_S(projectId,
@@ -6075,7 +6075,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param status the status
 	 * @return the number of matching j i r a issues
 	 */
-	@Override
+
 	public int countByP_AJUI_S(long projectId, String assigneeJiraUserId,
 		String status) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_P_AJUI_S;
@@ -6174,7 +6174,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @param jiraIssue the j i r a issue
 	 */
-	@Override
+
 	public void cacheResult(JIRAIssue jiraIssue) {
 		entityCache.putResult(JIRAIssueModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAIssueImpl.class, jiraIssue.getPrimaryKey(), jiraIssue);
@@ -6187,7 +6187,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @param jiraIssues the j i r a issues
 	 */
-	@Override
+
 	public void cacheResult(List<JIRAIssue> jiraIssues) {
 		for (JIRAIssue jiraIssue : jiraIssues) {
 			if (entityCache.getResult(JIRAIssueModelImpl.ENTITY_CACHE_ENABLED,
@@ -6207,7 +6207,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(JIRAIssueImpl.class);
 
@@ -6223,7 +6223,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(JIRAIssue jiraIssue) {
 		entityCache.removeResult(JIRAIssueModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAIssueImpl.class, jiraIssue.getPrimaryKey());
@@ -6232,7 +6232,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<JIRAIssue> jiraIssues) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -6249,7 +6249,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param jiraIssueId the primary key for the new j i r a issue
 	 * @return the new j i r a issue
 	 */
-	@Override
+
 	public JIRAIssue create(long jiraIssueId) {
 		JIRAIssue jiraIssue = new JIRAIssueImpl();
 
@@ -6266,7 +6266,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the j i r a issue that was removed
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue remove(long jiraIssueId) throws NoSuchJIRAIssueException {
 		return remove((Serializable)jiraIssueId);
 	}
@@ -6278,7 +6278,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the j i r a issue that was removed
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue remove(Serializable primaryKey)
 		throws NoSuchJIRAIssueException {
 		Session session = null;
@@ -6311,7 +6311,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 		}
 	}
 
-	@Override
+
 	protected JIRAIssue removeImpl(JIRAIssue jiraIssue) {
 		jiraIssue = toUnwrappedModel(jiraIssue);
 
@@ -6343,7 +6343,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 		return jiraIssue;
 	}
 
-	@Override
+
 	public JIRAIssue updateImpl(JIRAIssue jiraIssue) {
 		jiraIssue = toUnwrappedModel(jiraIssue);
 
@@ -6585,7 +6585,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchJIRAIssueException {
 		JIRAIssue jiraIssue = fetchByPrimaryKey(primaryKey);
@@ -6609,7 +6609,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @return the j i r a issue
 	 * @throws NoSuchJIRAIssueException if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue findByPrimaryKey(long jiraIssueId)
 		throws NoSuchJIRAIssueException {
 		return findByPrimaryKey((Serializable)jiraIssueId);
@@ -6621,7 +6621,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param primaryKey the primary key of the j i r a issue
 	 * @return the j i r a issue, or <code>null</code> if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByPrimaryKey(Serializable primaryKey) {
 		JIRAIssue jiraIssue = (JIRAIssue)entityCache.getResult(JIRAIssueModelImpl.ENTITY_CACHE_ENABLED,
 				JIRAIssueImpl.class, primaryKey);
@@ -6667,12 +6667,12 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param jiraIssueId the primary key of the j i r a issue
 	 * @return the j i r a issue, or <code>null</code> if a j i r a issue with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAIssue fetchByPrimaryKey(long jiraIssueId) {
 		return fetchByPrimaryKey((Serializable)jiraIssueId);
 	}
 
-	@Override
+
 	public Map<Serializable, JIRAIssue> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -6769,7 +6769,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @return the j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -6785,7 +6785,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param end the upper bound of the range of j i r a issues (not inclusive)
 	 * @return the range of j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -6802,7 +6802,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findAll(int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -6821,7 +6821,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of j i r a issues
 	 */
-	@Override
+
 	public List<JIRAIssue> findAll(int start, int end,
 		OrderByComparator<JIRAIssue> orderByComparator,
 		boolean retrieveFromCache) {
@@ -6911,7 +6911,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 * Removes all the j i r a issues from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (JIRAIssue jiraIssue : findAll()) {
 			remove(jiraIssue);
@@ -6923,7 +6923,7 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 	 *
 	 * @return the number of j i r a issues
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -6955,12 +6955,12 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return JIRAIssueModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -6995,19 +6995,19 @@ public class JIRAIssuePersistenceImpl extends BasePersistenceImpl<JIRAIssue>
 				"status"
 			});
 	private static final JIRAIssue _nullJIRAIssue = new JIRAIssueImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<JIRAIssue> toCacheModel() {
 				return _nullJIRAIssueCacheModel;
 			}
 		};
 
 	private static final CacheModel<JIRAIssue> _nullJIRAIssueCacheModel = new CacheModel<JIRAIssue>() {
-			@Override
+
 			public JIRAIssue toEntityModel() {
 				return _nullJIRAIssue;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAProjectPersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAProjectPersistenceImpl.java
index 912d75527d4..4c959270928 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAProjectPersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/JIRAProjectPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -103,7 +103,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @return the matching j i r a project
 	 * @throws NoSuchJIRAProjectException if a matching j i r a project could not be found
 	 */
-	@Override
+
 	public JIRAProject findByKey(String key) throws NoSuchJIRAProjectException {
 		JIRAProject jiraProject = fetchByKey(key);
 
@@ -133,7 +133,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param key the key
 	 * @return the matching j i r a project, or <code>null</code> if a matching j i r a project could not be found
 	 */
-	@Override
+
 	public JIRAProject fetchByKey(String key) {
 		return fetchByKey(key, true);
 	}
@@ -145,7 +145,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching j i r a project, or <code>null</code> if a matching j i r a project could not be found
 	 */
-	@Override
+
 	public JIRAProject fetchByKey(String key, boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { key };
 
@@ -249,7 +249,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param key the key
 	 * @return the j i r a project that was removed
 	 */
-	@Override
+
 	public JIRAProject removeByKey(String key)
 		throws NoSuchJIRAProjectException {
 		JIRAProject jiraProject = findByKey(key);
@@ -263,7 +263,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param key the key
 	 * @return the number of matching j i r a projects
 	 */
-	@Override
+
 	public int countByKey(String key) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_KEY;
 
@@ -335,7 +335,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 *
 	 * @param jiraProject the j i r a project
 	 */
-	@Override
+
 	public void cacheResult(JIRAProject jiraProject) {
 		entityCache.putResult(JIRAProjectModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAProjectImpl.class, jiraProject.getPrimaryKey(), jiraProject);
@@ -351,7 +351,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 *
 	 * @param jiraProjects the j i r a projects
 	 */
-	@Override
+
 	public void cacheResult(List<JIRAProject> jiraProjects) {
 		for (JIRAProject jiraProject : jiraProjects) {
 			if (entityCache.getResult(
@@ -372,7 +372,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(JIRAProjectImpl.class);
 
@@ -388,7 +388,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(JIRAProject jiraProject) {
 		entityCache.removeResult(JIRAProjectModelImpl.ENTITY_CACHE_ENABLED,
 			JIRAProjectImpl.class, jiraProject.getPrimaryKey());
@@ -399,7 +399,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 		clearUniqueFindersCache((JIRAProjectModelImpl)jiraProject);
 	}
 
-	@Override
+
 	public void clearCache(List<JIRAProject> jiraProjects) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -457,7 +457,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param jiraProjectId the primary key for the new j i r a project
 	 * @return the new j i r a project
 	 */
-	@Override
+
 	public JIRAProject create(long jiraProjectId) {
 		JIRAProject jiraProject = new JIRAProjectImpl();
 
@@ -474,7 +474,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @return the j i r a project that was removed
 	 * @throws NoSuchJIRAProjectException if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject remove(long jiraProjectId)
 		throws NoSuchJIRAProjectException {
 		return remove((Serializable)jiraProjectId);
@@ -487,7 +487,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @return the j i r a project that was removed
 	 * @throws NoSuchJIRAProjectException if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject remove(Serializable primaryKey)
 		throws NoSuchJIRAProjectException {
 		Session session = null;
@@ -520,7 +520,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 		}
 	}
 
-	@Override
+
 	protected JIRAProject removeImpl(JIRAProject jiraProject) {
 		jiraProject = toUnwrappedModel(jiraProject);
 
@@ -552,7 +552,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 		return jiraProject;
 	}
 
-	@Override
+
 	public JIRAProject updateImpl(JIRAProject jiraProject) {
 		jiraProject = toUnwrappedModel(jiraProject);
 
@@ -623,7 +623,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @return the j i r a project
 	 * @throws NoSuchJIRAProjectException if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchJIRAProjectException {
 		JIRAProject jiraProject = fetchByPrimaryKey(primaryKey);
@@ -647,7 +647,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @return the j i r a project
 	 * @throws NoSuchJIRAProjectException if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject findByPrimaryKey(long jiraProjectId)
 		throws NoSuchJIRAProjectException {
 		return findByPrimaryKey((Serializable)jiraProjectId);
@@ -659,7 +659,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param primaryKey the primary key of the j i r a project
 	 * @return the j i r a project, or <code>null</code> if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject fetchByPrimaryKey(Serializable primaryKey) {
 		JIRAProject jiraProject = (JIRAProject)entityCache.getResult(JIRAProjectModelImpl.ENTITY_CACHE_ENABLED,
 				JIRAProjectImpl.class, primaryKey);
@@ -705,12 +705,12 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param jiraProjectId the primary key of the j i r a project
 	 * @return the j i r a project, or <code>null</code> if a j i r a project with the primary key could not be found
 	 */
-	@Override
+
 	public JIRAProject fetchByPrimaryKey(long jiraProjectId) {
 		return fetchByPrimaryKey((Serializable)jiraProjectId);
 	}
 
-	@Override
+
 	public Map<Serializable, JIRAProject> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -807,7 +807,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 *
 	 * @return the j i r a projects
 	 */
-	@Override
+
 	public List<JIRAProject> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -823,7 +823,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param end the upper bound of the range of j i r a projects (not inclusive)
 	 * @return the range of j i r a projects
 	 */
-	@Override
+
 	public List<JIRAProject> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -840,7 +840,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of j i r a projects
 	 */
-	@Override
+
 	public List<JIRAProject> findAll(int start, int end,
 		OrderByComparator<JIRAProject> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -859,7 +859,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of j i r a projects
 	 */
-	@Override
+
 	public List<JIRAProject> findAll(int start, int end,
 		OrderByComparator<JIRAProject> orderByComparator,
 		boolean retrieveFromCache) {
@@ -949,7 +949,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 * Removes all the j i r a projects from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (JIRAProject jiraProject : findAll()) {
 			remove(jiraProject);
@@ -961,7 +961,7 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 	 *
 	 * @return the number of j i r a projects
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -993,12 +993,12 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return JIRAProjectModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1031,19 +1031,19 @@ public class JIRAProjectPersistenceImpl extends BasePersistenceImpl<JIRAProject>
 				"jiraProjectId", "key", "name"
 			});
 	private static final JIRAProject _nullJIRAProject = new JIRAProjectImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<JIRAProject> toCacheModel() {
 				return _nullJIRAProjectCacheModel;
 			}
 		};
 
 	private static final CacheModel<JIRAProject> _nullJIRAProjectCacheModel = new CacheModel<JIRAProject>() {
-			@Override
+
 			public JIRAProject toEntityModel() {
 				return _nullJIRAProject;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRepositoryPersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRepositoryPersistenceImpl.java
index c03d2a0b831..dab6e4d8ad6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRepositoryPersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRepositoryPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -104,7 +104,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @return the matching s v n repository
 	 * @throws NoSuchSVNRepositoryException if a matching s v n repository could not be found
 	 */
-	@Override
+
 	public SVNRepository findByUrl(String url)
 		throws NoSuchSVNRepositoryException {
 		SVNRepository svnRepository = fetchByUrl(url);
@@ -135,7 +135,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param url the url
 	 * @return the matching s v n repository, or <code>null</code> if a matching s v n repository could not be found
 	 */
-	@Override
+
 	public SVNRepository fetchByUrl(String url) {
 		return fetchByUrl(url, true);
 	}
@@ -147,7 +147,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching s v n repository, or <code>null</code> if a matching s v n repository could not be found
 	 */
-	@Override
+
 	public SVNRepository fetchByUrl(String url, boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { url };
 
@@ -251,7 +251,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param url the url
 	 * @return the s v n repository that was removed
 	 */
-	@Override
+
 	public SVNRepository removeByUrl(String url)
 		throws NoSuchSVNRepositoryException {
 		SVNRepository svnRepository = findByUrl(url);
@@ -265,7 +265,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param url the url
 	 * @return the number of matching s v n repositories
 	 */
-	@Override
+
 	public int countByUrl(String url) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_URL;
 
@@ -337,7 +337,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 *
 	 * @param svnRepository the s v n repository
 	 */
-	@Override
+
 	public void cacheResult(SVNRepository svnRepository) {
 		entityCache.putResult(SVNRepositoryModelImpl.ENTITY_CACHE_ENABLED,
 			SVNRepositoryImpl.class, svnRepository.getPrimaryKey(),
@@ -354,7 +354,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 *
 	 * @param svnRepositories the s v n repositories
 	 */
-	@Override
+
 	public void cacheResult(List<SVNRepository> svnRepositories) {
 		for (SVNRepository svnRepository : svnRepositories) {
 			if (entityCache.getResult(
@@ -375,7 +375,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(SVNRepositoryImpl.class);
 
@@ -391,7 +391,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(SVNRepository svnRepository) {
 		entityCache.removeResult(SVNRepositoryModelImpl.ENTITY_CACHE_ENABLED,
 			SVNRepositoryImpl.class, svnRepository.getPrimaryKey());
@@ -402,7 +402,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 		clearUniqueFindersCache((SVNRepositoryModelImpl)svnRepository);
 	}
 
-	@Override
+
 	public void clearCache(List<SVNRepository> svnRepositories) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -460,7 +460,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param svnRepositoryId the primary key for the new s v n repository
 	 * @return the new s v n repository
 	 */
-	@Override
+
 	public SVNRepository create(long svnRepositoryId) {
 		SVNRepository svnRepository = new SVNRepositoryImpl();
 
@@ -477,7 +477,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @return the s v n repository that was removed
 	 * @throws NoSuchSVNRepositoryException if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository remove(long svnRepositoryId)
 		throws NoSuchSVNRepositoryException {
 		return remove((Serializable)svnRepositoryId);
@@ -490,7 +490,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @return the s v n repository that was removed
 	 * @throws NoSuchSVNRepositoryException if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository remove(Serializable primaryKey)
 		throws NoSuchSVNRepositoryException {
 		Session session = null;
@@ -523,7 +523,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 		}
 	}
 
-	@Override
+
 	protected SVNRepository removeImpl(SVNRepository svnRepository) {
 		svnRepository = toUnwrappedModel(svnRepository);
 
@@ -555,7 +555,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 		return svnRepository;
 	}
 
-	@Override
+
 	public SVNRepository updateImpl(SVNRepository svnRepository) {
 		svnRepository = toUnwrappedModel(svnRepository);
 
@@ -626,7 +626,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @return the s v n repository
 	 * @throws NoSuchSVNRepositoryException if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchSVNRepositoryException {
 		SVNRepository svnRepository = fetchByPrimaryKey(primaryKey);
@@ -650,7 +650,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @return the s v n repository
 	 * @throws NoSuchSVNRepositoryException if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository findByPrimaryKey(long svnRepositoryId)
 		throws NoSuchSVNRepositoryException {
 		return findByPrimaryKey((Serializable)svnRepositoryId);
@@ -662,7 +662,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param primaryKey the primary key of the s v n repository
 	 * @return the s v n repository, or <code>null</code> if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository fetchByPrimaryKey(Serializable primaryKey) {
 		SVNRepository svnRepository = (SVNRepository)entityCache.getResult(SVNRepositoryModelImpl.ENTITY_CACHE_ENABLED,
 				SVNRepositoryImpl.class, primaryKey);
@@ -708,12 +708,12 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param svnRepositoryId the primary key of the s v n repository
 	 * @return the s v n repository, or <code>null</code> if a s v n repository with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRepository fetchByPrimaryKey(long svnRepositoryId) {
 		return fetchByPrimaryKey((Serializable)svnRepositoryId);
 	}
 
-	@Override
+
 	public Map<Serializable, SVNRepository> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -810,7 +810,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 *
 	 * @return the s v n repositories
 	 */
-	@Override
+
 	public List<SVNRepository> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -826,7 +826,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param end the upper bound of the range of s v n repositories (not inclusive)
 	 * @return the range of s v n repositories
 	 */
-	@Override
+
 	public List<SVNRepository> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -843,7 +843,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of s v n repositories
 	 */
-	@Override
+
 	public List<SVNRepository> findAll(int start, int end,
 		OrderByComparator<SVNRepository> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -862,7 +862,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of s v n repositories
 	 */
-	@Override
+
 	public List<SVNRepository> findAll(int start, int end,
 		OrderByComparator<SVNRepository> orderByComparator,
 		boolean retrieveFromCache) {
@@ -952,7 +952,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 * Removes all the s v n repositories from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (SVNRepository svnRepository : findAll()) {
 			remove(svnRepository);
@@ -964,7 +964,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	 *
 	 * @return the number of s v n repositories
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -996,7 +996,7 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return SVNRepositoryModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1026,19 +1026,19 @@ public class SVNRepositoryPersistenceImpl extends BasePersistenceImpl<SVNReposit
 	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No SVNRepository exists with the key {";
 	private static final Log _log = LogFactoryUtil.getLog(SVNRepositoryPersistenceImpl.class);
 	private static final SVNRepository _nullSVNRepository = new SVNRepositoryImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<SVNRepository> toCacheModel() {
 				return _nullSVNRepositoryCacheModel;
 			}
 		};
 
 	private static final CacheModel<SVNRepository> _nullSVNRepositoryCacheModel = new CacheModel<SVNRepository>() {
-			@Override
+
 			public SVNRepository toEntityModel() {
 				return _nullSVNRepository;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRevisionPersistenceImpl.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRevisionPersistenceImpl.java
index baebaf94e14..e195c42416e 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRevisionPersistenceImpl.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/service/persistence/impl/SVNRevisionPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.service.persistence.impl;
@@ -112,7 +112,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnUserId the svn user ID
 	 * @return the matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNUserId(String svnUserId) {
 		return findBySVNUserId(svnUserId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -130,7 +130,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param end the upper bound of the range of s v n revisions (not inclusive)
 	 * @return the range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNUserId(String svnUserId, int start,
 		int end) {
 		return findBySVNUserId(svnUserId, start, end, null);
@@ -149,7 +149,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNUserId(String svnUserId, int start,
 		int end, OrderByComparator<SVNRevision> orderByComparator) {
 		return findBySVNUserId(svnUserId, start, end, orderByComparator, true);
@@ -169,7 +169,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNUserId(String svnUserId, int start,
 		int end, OrderByComparator<SVNRevision> orderByComparator,
 		boolean retrieveFromCache) {
@@ -294,7 +294,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the first matching s v n revision
 	 * @throws NoSuchSVNRevisionException if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision findBySVNUserId_First(String svnUserId,
 		OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -324,7 +324,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching s v n revision, or <code>null</code> if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchBySVNUserId_First(String svnUserId,
 		OrderByComparator<SVNRevision> orderByComparator) {
 		List<SVNRevision> list = findBySVNUserId(svnUserId, 0, 1,
@@ -345,7 +345,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the last matching s v n revision
 	 * @throws NoSuchSVNRevisionException if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision findBySVNUserId_Last(String svnUserId,
 		OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -375,7 +375,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching s v n revision, or <code>null</code> if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchBySVNUserId_Last(String svnUserId,
 		OrderByComparator<SVNRevision> orderByComparator) {
 		int count = countBySVNUserId(svnUserId);
@@ -403,7 +403,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the previous, current, and next s v n revision
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision[] findBySVNUserId_PrevAndNext(long svnRevisionId,
 		String svnUserId, OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -559,7 +559,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 *
 	 * @param svnUserId the svn user ID
 	 */
-	@Override
+
 	public void removeBySVNUserId(String svnUserId) {
 		for (SVNRevision svnRevision : findBySVNUserId(svnUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -573,7 +573,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnUserId the svn user ID
 	 * @return the number of matching s v n revisions
 	 */
-	@Override
+
 	public int countBySVNUserId(String svnUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_SVNUSERID;
 
@@ -663,7 +663,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnRepositoryId the svn repository ID
 	 * @return the matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNRepositoryId(long svnRepositoryId) {
 		return findBySVNRepositoryId(svnRepositoryId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -681,7 +681,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param end the upper bound of the range of s v n revisions (not inclusive)
 	 * @return the range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNRepositoryId(long svnRepositoryId,
 		int start, int end) {
 		return findBySVNRepositoryId(svnRepositoryId, start, end, null);
@@ -700,7 +700,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNRepositoryId(long svnRepositoryId,
 		int start, int end, OrderByComparator<SVNRevision> orderByComparator) {
 		return findBySVNRepositoryId(svnRepositoryId, start, end,
@@ -721,7 +721,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNRepositoryId(long svnRepositoryId,
 		int start, int end, OrderByComparator<SVNRevision> orderByComparator,
 		boolean retrieveFromCache) {
@@ -836,7 +836,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the first matching s v n revision
 	 * @throws NoSuchSVNRevisionException if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision findBySVNRepositoryId_First(long svnRepositoryId,
 		OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -866,7 +866,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching s v n revision, or <code>null</code> if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchBySVNRepositoryId_First(long svnRepositoryId,
 		OrderByComparator<SVNRevision> orderByComparator) {
 		List<SVNRevision> list = findBySVNRepositoryId(svnRepositoryId, 0, 1,
@@ -887,7 +887,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the last matching s v n revision
 	 * @throws NoSuchSVNRevisionException if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision findBySVNRepositoryId_Last(long svnRepositoryId,
 		OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -917,7 +917,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching s v n revision, or <code>null</code> if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchBySVNRepositoryId_Last(long svnRepositoryId,
 		OrderByComparator<SVNRevision> orderByComparator) {
 		int count = countBySVNRepositoryId(svnRepositoryId);
@@ -945,7 +945,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the previous, current, and next s v n revision
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision[] findBySVNRepositoryId_PrevAndNext(long svnRevisionId,
 		long svnRepositoryId, OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -1087,7 +1087,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 *
 	 * @param svnRepositoryId the svn repository ID
 	 */
-	@Override
+
 	public void removeBySVNRepositoryId(long svnRepositoryId) {
 		for (SVNRevision svnRevision : findBySVNRepositoryId(svnRepositoryId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1101,7 +1101,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnRepositoryId the svn repository ID
 	 * @return the number of matching s v n revisions
 	 */
-	@Override
+
 	public int countBySVNRepositoryId(long svnRepositoryId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_SVNREPOSITORYID;
 
@@ -1178,7 +1178,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnRepositoryId the svn repository ID
 	 * @return the matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNU_SVNR(String svnUserId,
 		long svnRepositoryId) {
 		return findBySVNU_SVNR(svnUserId, svnRepositoryId, QueryUtil.ALL_POS,
@@ -1198,7 +1198,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param end the upper bound of the range of s v n revisions (not inclusive)
 	 * @return the range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNU_SVNR(String svnUserId,
 		long svnRepositoryId, int start, int end) {
 		return findBySVNU_SVNR(svnUserId, svnRepositoryId, start, end, null);
@@ -1218,7 +1218,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNU_SVNR(String svnUserId,
 		long svnRepositoryId, int start, int end,
 		OrderByComparator<SVNRevision> orderByComparator) {
@@ -1241,7 +1241,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findBySVNU_SVNR(String svnUserId,
 		long svnRepositoryId, int start, int end,
 		OrderByComparator<SVNRevision> orderByComparator,
@@ -1377,7 +1377,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the first matching s v n revision
 	 * @throws NoSuchSVNRevisionException if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision findBySVNU_SVNR_First(String svnUserId,
 		long svnRepositoryId, OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -1411,7 +1411,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching s v n revision, or <code>null</code> if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchBySVNU_SVNR_First(String svnUserId,
 		long svnRepositoryId, OrderByComparator<SVNRevision> orderByComparator) {
 		List<SVNRevision> list = findBySVNU_SVNR(svnUserId, svnRepositoryId, 0,
@@ -1433,7 +1433,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the last matching s v n revision
 	 * @throws NoSuchSVNRevisionException if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision findBySVNU_SVNR_Last(String svnUserId,
 		long svnRepositoryId, OrderByComparator<SVNRevision> orderByComparator)
 		throws NoSuchSVNRevisionException {
@@ -1467,7 +1467,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching s v n revision, or <code>null</code> if a matching s v n revision could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchBySVNU_SVNR_Last(String svnUserId,
 		long svnRepositoryId, OrderByComparator<SVNRevision> orderByComparator) {
 		int count = countBySVNU_SVNR(svnUserId, svnRepositoryId);
@@ -1496,7 +1496,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the previous, current, and next s v n revision
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision[] findBySVNU_SVNR_PrevAndNext(long svnRevisionId,
 		String svnUserId, long svnRepositoryId,
 		OrderByComparator<SVNRevision> orderByComparator)
@@ -1658,7 +1658,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnUserId the svn user ID
 	 * @param svnRepositoryId the svn repository ID
 	 */
-	@Override
+
 	public void removeBySVNU_SVNR(String svnUserId, long svnRepositoryId) {
 		for (SVNRevision svnRevision : findBySVNU_SVNR(svnUserId,
 				svnRepositoryId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1673,7 +1673,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnRepositoryId the svn repository ID
 	 * @return the number of matching s v n revisions
 	 */
-	@Override
+
 	public int countBySVNU_SVNR(String svnUserId, long svnRepositoryId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_SVNU_SVNR;
 
@@ -1750,7 +1750,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 *
 	 * @param svnRevision the s v n revision
 	 */
-	@Override
+
 	public void cacheResult(SVNRevision svnRevision) {
 		entityCache.putResult(SVNRevisionModelImpl.ENTITY_CACHE_ENABLED,
 			SVNRevisionImpl.class, svnRevision.getPrimaryKey(), svnRevision);
@@ -1763,7 +1763,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 *
 	 * @param svnRevisions the s v n revisions
 	 */
-	@Override
+
 	public void cacheResult(List<SVNRevision> svnRevisions) {
 		for (SVNRevision svnRevision : svnRevisions) {
 			if (entityCache.getResult(
@@ -1784,7 +1784,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(SVNRevisionImpl.class);
 
@@ -1800,7 +1800,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(SVNRevision svnRevision) {
 		entityCache.removeResult(SVNRevisionModelImpl.ENTITY_CACHE_ENABLED,
 			SVNRevisionImpl.class, svnRevision.getPrimaryKey());
@@ -1809,7 +1809,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<SVNRevision> svnRevisions) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -1826,7 +1826,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnRevisionId the primary key for the new s v n revision
 	 * @return the new s v n revision
 	 */
-	@Override
+
 	public SVNRevision create(long svnRevisionId) {
 		SVNRevision svnRevision = new SVNRevisionImpl();
 
@@ -1843,7 +1843,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the s v n revision that was removed
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision remove(long svnRevisionId)
 		throws NoSuchSVNRevisionException {
 		return remove((Serializable)svnRevisionId);
@@ -1856,7 +1856,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the s v n revision that was removed
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision remove(Serializable primaryKey)
 		throws NoSuchSVNRevisionException {
 		Session session = null;
@@ -1889,7 +1889,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 		}
 	}
 
-	@Override
+
 	protected SVNRevision removeImpl(SVNRevision svnRevision) {
 		svnRevision = toUnwrappedModel(svnRevision);
 
@@ -1921,7 +1921,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 		return svnRevision;
 	}
 
-	@Override
+
 	public SVNRevision updateImpl(SVNRevision svnRevision) {
 		svnRevision = toUnwrappedModel(svnRevision);
 
@@ -2051,7 +2051,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the s v n revision
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchSVNRevisionException {
 		SVNRevision svnRevision = fetchByPrimaryKey(primaryKey);
@@ -2075,7 +2075,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @return the s v n revision
 	 * @throws NoSuchSVNRevisionException if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision findByPrimaryKey(long svnRevisionId)
 		throws NoSuchSVNRevisionException {
 		return findByPrimaryKey((Serializable)svnRevisionId);
@@ -2087,7 +2087,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param primaryKey the primary key of the s v n revision
 	 * @return the s v n revision, or <code>null</code> if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchByPrimaryKey(Serializable primaryKey) {
 		SVNRevision svnRevision = (SVNRevision)entityCache.getResult(SVNRevisionModelImpl.ENTITY_CACHE_ENABLED,
 				SVNRevisionImpl.class, primaryKey);
@@ -2133,12 +2133,12 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param svnRevisionId the primary key of the s v n revision
 	 * @return the s v n revision, or <code>null</code> if a s v n revision with the primary key could not be found
 	 */
-	@Override
+
 	public SVNRevision fetchByPrimaryKey(long svnRevisionId) {
 		return fetchByPrimaryKey((Serializable)svnRevisionId);
 	}
 
-	@Override
+
 	public Map<Serializable, SVNRevision> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -2235,7 +2235,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 *
 	 * @return the s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -2251,7 +2251,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param end the upper bound of the range of s v n revisions (not inclusive)
 	 * @return the range of s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -2268,7 +2268,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findAll(int start, int end,
 		OrderByComparator<SVNRevision> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -2287,7 +2287,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of s v n revisions
 	 */
-	@Override
+
 	public List<SVNRevision> findAll(int start, int end,
 		OrderByComparator<SVNRevision> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2377,7 +2377,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 * Removes all the s v n revisions from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (SVNRevision svnRevision : findAll()) {
 			remove(svnRevision);
@@ -2389,7 +2389,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	 *
 	 * @return the number of s v n revisions
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -2421,7 +2421,7 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return SVNRevisionModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -2451,19 +2451,19 @@ public class SVNRevisionPersistenceImpl extends BasePersistenceImpl<SVNRevision>
 	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No SVNRevision exists with the key {";
 	private static final Log _log = LogFactoryUtil.getLog(SVNRevisionPersistenceImpl.class);
 	private static final SVNRevision _nullSVNRevision = new SVNRevisionImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<SVNRevision> toCacheModel() {
 				return _nullSVNRevisionCacheModel;
 			}
 		};
 
 	private static final CacheModel<SVNRevision> _nullSVNRevisionCacheModel = new CacheModel<SVNRevision>() {
-			@Override
+
 			public SVNRevision toEntityModel() {
 				return _nullSVNRevision;
 			}
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/messaging/SynchronizeSVNMessageListener.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/messaging/SynchronizeSVNMessageListener.java
index 695b8106300..025b5df549d 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/messaging/SynchronizeSVNMessageListener.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/messaging/SynchronizeSVNMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.svn.messaging;
@@ -24,7 +24,7 @@ import com.liferay.socialcoding.svn.util.SVNConstants;
  */
 public class SynchronizeSVNMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		for (String url : SVNConstants.SVN_URLS) {
 			SVNRepositoryLocalServiceUtil.updateSVNRepository(url);
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/portlet/SVNPortlet.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/portlet/SVNPortlet.java
index c535333c00d..6505a658dd7 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/portlet/SVNPortlet.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/portlet/SVNPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.svn.portlet;
@@ -29,7 +29,7 @@ import javax.portlet.ResourceResponse;
  */
 public class SVNPortlet extends MVCPortlet {
 
-	@Override
+
 	public void serveResource(
 			ResourceRequest resourceRequest, ResourceResponse resourceResponse)
 		throws IOException, PortletException {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityInterpreter.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityInterpreter.java
index 64ddca91caf..caff0fab3bb 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityInterpreter.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityInterpreter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.svn.social;
@@ -31,12 +31,12 @@ import com.liferay.socialcoding.service.SVNRevisionLocalServiceUtil;
  */
 public class SVNActivityInterpreter extends BaseSocialActivityInterpreter {
 
-	@Override
+
 	public String[] getClassNames() {
 		return _CLASS_NAMES;
 	}
 
-	@Override
+
 	protected String getBody(
 			SocialActivity activity, ServiceContext serviceContext)
 		throws Exception {
@@ -49,7 +49,7 @@ public class SVNActivityInterpreter extends BaseSocialActivityInterpreter {
 		return wrapLink(link, HtmlUtil.escape(svnRevision.getComments()));
 	}
 
-	@Override
+
 	protected String getLink(
 			SocialActivity activity, ServiceContext serviceContext)
 		throws Exception {
@@ -60,12 +60,12 @@ public class SVNActivityInterpreter extends BaseSocialActivityInterpreter {
 		return svnRevision.getWebRevisionNumberURL();
 	}
 
-	@Override
+
 	protected ResourceBundleLoader getResourceBundleLoader() {
 		return _resourceBundleLoader;
 	}
 
-	@Override
+
 	protected Object[] getTitleArguments(
 			String groupName, SocialActivity activity, String link,
 			String title, ServiceContext serviceContext)
@@ -91,7 +91,7 @@ public class SVNActivityInterpreter extends BaseSocialActivityInterpreter {
 		};
 	}
 
-	@Override
+
 	protected String getTitlePattern(
 		String groupName, SocialActivity activity) {
 
@@ -104,7 +104,7 @@ public class SVNActivityInterpreter extends BaseSocialActivityInterpreter {
 		return StringPool.BLANK;
 	}
 
-	@Override
+
 	protected boolean hasPermissions(
 		PermissionChecker permissionChecker, SocialActivity activity,
 		String actionId, ServiceContext serviceContext) {
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityKeys.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityKeys.java
index 89c944c8dde..6b6ba196fc3 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityKeys.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/social/SVNActivityKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.svn.social;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/util/SVNConstants.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/util/SVNConstants.java
index bde85835144..90e6003fe04 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/util/SVNConstants.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/svn/util/SVNConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.svn.util;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsKeys.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsKeys.java
index 94c506f51fd..1e8c3b44ec6 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsKeys.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.util;
diff --git a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsValues.java b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsValues.java
index cc1e4c6b50a..ad49eb6ac00 100644
--- a/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsValues.java
+++ b/portlets/social-coding-portlet/docroot/WEB-INF/src/com/liferay/socialcoding/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.socialcoding.util;
diff --git a/portlets/social-coding-portlet/docroot/init.jsp b/portlets/social-coding-portlet/docroot/init.jsp
index 301f060d2b5..3c58ee7953f 100644
--- a/portlets/social-coding-portlet/docroot/init.jsp
+++ b/portlets/social-coding-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/jira/view.jsp b/portlets/social-coding-portlet/docroot/jira/view.jsp
index 4f4f68233c2..f9d5dc22054 100644
--- a/portlets/social-coding-portlet/docroot/jira/view.jsp
+++ b/portlets/social-coding-portlet/docroot/jira/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/jira/view_jira.jspf b/portlets/social-coding-portlet/docroot/jira/view_jira.jspf
index 9a990ede0df..f1a1de34cdd 100644
--- a/portlets/social-coding-portlet/docroot/jira/view_jira.jspf
+++ b/portlets/social-coding-portlet/docroot/jira/view_jira.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/jira/view_jira_project.jspf b/portlets/social-coding-portlet/docroot/jira/view_jira_project.jspf
index 8642494f4e0..43cbf8b094f 100644
--- a/portlets/social-coding-portlet/docroot/jira/view_jira_project.jspf
+++ b/portlets/social-coding-portlet/docroot/jira/view_jira_project.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/svn/revision_action.jsp b/portlets/social-coding-portlet/docroot/svn/revision_action.jsp
index b8b5a65ebb7..058423a2d26 100644
--- a/portlets/social-coding-portlet/docroot/svn/revision_action.jsp
+++ b/portlets/social-coding-portlet/docroot/svn/revision_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/svn/view.jsp b/portlets/social-coding-portlet/docroot/svn/view.jsp
index c43fe300cca..670fff6b073 100644
--- a/portlets/social-coding-portlet/docroot/svn/view.jsp
+++ b/portlets/social-coding-portlet/docroot/svn/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/svn/view_feeds.jsp b/portlets/social-coding-portlet/docroot/svn/view_feeds.jsp
index 1f01fe86364..848c2335433 100644
--- a/portlets/social-coding-portlet/docroot/svn/view_feeds.jsp
+++ b/portlets/social-coding-portlet/docroot/svn/view_feeds.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/social-coding-portlet/docroot/svn/view_svn.jspf b/portlets/social-coding-portlet/docroot/svn/view_svn.jspf
index da80c826143..0817d13e48d 100644
--- a/portlets/social-coding-portlet/docroot/svn/view_svn.jspf
+++ b/portlets/social-coding-portlet/docroot/svn/view_svn.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/model/Stocks.java b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/model/Stocks.java
index c501eb7c30b..c2ab0bb68d8 100644
--- a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/model/Stocks.java
+++ b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/model/Stocks.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.stocks.model;
diff --git a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPortlet.java b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPortlet.java
index 7d0c1cf883d..16d7341d07e 100644
--- a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPortlet.java
+++ b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.stocks.portlet;
@@ -40,7 +40,7 @@ import javax.portlet.ValidatorException;
  */
 public class StocksPortlet extends MVCPortlet {
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPreferencesValidator.java b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPreferencesValidator.java
index cbfc284d48b..e0467d2145f 100644
--- a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPreferencesValidator.java
+++ b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/portlet/StocksPreferencesValidator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.stocks.portlet;
@@ -29,7 +29,7 @@ import javax.portlet.ValidatorException;
  */
 public class StocksPreferencesValidator implements PreferencesValidator {
 
-	@Override
+
 	public void validate(PortletPreferences preferences)
 		throws ValidatorException {
 
diff --git a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/PortletKeys.java b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/PortletKeys.java
index f4b19059e51..3c6e6b6eb16 100644
--- a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/PortletKeys.java
+++ b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/PortletKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.stocks.util;
diff --git a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksUtil.java b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksUtil.java
index fe2619acd81..7e0a765bf38 100644
--- a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksUtil.java
+++ b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.stocks.util;
diff --git a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksWebCacheItem.java b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksWebCacheItem.java
index 7cb1914718c..7ff46026790 100644
--- a/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksWebCacheItem.java
+++ b/portlets/stocks-portlet/docroot/WEB-INF/src/com/liferay/stocks/util/StocksWebCacheItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.stocks.util;
@@ -32,7 +32,7 @@ public class StocksWebCacheItem implements WebCacheItem {
 		_symbol = symbol;
 	}
 
-	@Override
+
 	public Object convert(String key) throws WebCacheException {
 		String symbol = _symbol;
 
@@ -101,7 +101,7 @@ public class StocksWebCacheItem implements WebCacheItem {
 		return stocks;
 	}
 
-	@Override
+
 	public long getRefreshTime() {
 		return _REFRESH_TIME;
 	}
diff --git a/portlets/stocks-portlet/docroot/edit.jsp b/portlets/stocks-portlet/docroot/edit.jsp
index 53ec55718d5..0cec9b51869 100644
--- a/portlets/stocks-portlet/docroot/edit.jsp
+++ b/portlets/stocks-portlet/docroot/edit.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/stocks-portlet/docroot/init.jsp b/portlets/stocks-portlet/docroot/init.jsp
index 4989468147e..26ca363d33e 100644
--- a/portlets/stocks-portlet/docroot/init.jsp
+++ b/portlets/stocks-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/stocks-portlet/docroot/view.jsp b/portlets/stocks-portlet/docroot/view.jsp
index a3ac8abef69..5072d610c49 100644
--- a/portlets/stocks-portlet/docroot/view.jsp
+++ b/portlets/stocks-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/tasks-portlet/copyright.txt b/portlets/tasks-portlet/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/portlets/tasks-portlet/copyright.txt
+++ b/portlets/tasks-portlet/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/NoSuchTasksEntryException.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/NoSuchTasksEntryException.java
index 43a3e483c90..3658211410b 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/NoSuchTasksEntryException.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/NoSuchTasksEntryException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.exception;
 
 import com.liferay.portal.kernel.exception.NoSuchModelException;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryDueDateException.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryDueDateException.java
index d83dc48ac92..dbd4672bdf2 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryDueDateException.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryDueDateException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryTitleException.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryTitleException.java
index 2579ec45776..869dc32436b 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryTitleException.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/exception/TasksEntryTitleException.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.exception;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntry.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntry.java
index f6fc8cd6ced..d634cf8175d 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntry.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model;
@@ -38,17 +38,17 @@ public interface TasksEntry extends TasksEntryModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.tasks.model.impl.TasksEntryImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<TasksEntry, Long> TASKS_ENTRY_ID_ACCESSOR = new Accessor<TasksEntry, Long>() {
-			@Override
+
 			public Long get(TasksEntry tasksEntry) {
 				return tasksEntry.getTasksEntryId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<TasksEntry> getTypeClass() {
 				return TasksEntry.class;
 			}
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryClp.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryClp.java
index 2eba15907d4..b9477278ff9 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryClp.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model;
@@ -48,37 +48,37 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 	public TasksEntryClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return TasksEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return TasksEntry.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _tasksEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setTasksEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _tasksEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -103,7 +103,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long tasksEntryId = (Long)attributes.get("tasksEntryId");
 
@@ -193,12 +193,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getTasksEntryId() {
 		return _tasksEntryId;
 	}
 
-	@Override
+
 	public void setTasksEntryId(long tasksEntryId) {
 		_tasksEntryId = tasksEntryId;
 
@@ -216,12 +216,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -239,12 +239,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -262,12 +262,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -285,7 +285,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -297,16 +297,16 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -324,12 +324,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -347,12 +347,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -370,12 +370,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public String getTitle() {
 		return _title;
 	}
 
-	@Override
+
 	public void setTitle(String title) {
 		_title = title;
 
@@ -393,12 +393,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public int getPriority() {
 		return _priority;
 	}
 
-	@Override
+
 	public void setPriority(int priority) {
 		_priority = priority;
 
@@ -416,12 +416,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public long getAssigneeUserId() {
 		return _assigneeUserId;
 	}
 
-	@Override
+
 	public void setAssigneeUserId(long assigneeUserId) {
 		_assigneeUserId = assigneeUserId;
 
@@ -439,7 +439,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public String getAssigneeUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getAssigneeUserId());
@@ -451,16 +451,16 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setAssigneeUserUuid(String assigneeUserUuid) {
 	}
 
-	@Override
+
 	public long getResolverUserId() {
 		return _resolverUserId;
 	}
 
-	@Override
+
 	public void setResolverUserId(long resolverUserId) {
 		_resolverUserId = resolverUserId;
 
@@ -478,7 +478,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public String getResolverUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getResolverUserId());
@@ -490,16 +490,16 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setResolverUserUuid(String resolverUserUuid) {
 	}
 
-	@Override
+
 	public Date getDueDate() {
 		return _dueDate;
 	}
 
-	@Override
+
 	public void setDueDate(Date dueDate) {
 		_dueDate = dueDate;
 
@@ -517,12 +517,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public Date getFinishDate() {
 		return _finishDate;
 	}
 
-	@Override
+
 	public void setFinishDate(Date finishDate) {
 		_finishDate = finishDate;
 
@@ -540,12 +540,12 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _status;
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_status = status;
 
@@ -563,7 +563,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getReporterFullName() {
 		try {
 			String methodName = "getReporterFullName";
@@ -582,7 +582,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getPriorityLabel() {
 		try {
 			String methodName = "getPriorityLabel";
@@ -601,7 +601,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getStatusLabel() {
 		try {
 			String methodName = "getStatusLabel";
@@ -620,7 +620,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public java.lang.String getAssigneeFullName() {
 		try {
 			String methodName = "getAssigneeFullName";
@@ -688,7 +688,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			TasksEntryLocalServiceUtil.addTasksEntry(this);
@@ -698,13 +698,13 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public TasksEntry toEscapedModel() {
 		return (TasksEntry)ProxyUtil.newProxyInstance(TasksEntry.class.getClassLoader(),
 			new Class[] { TasksEntry.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		TasksEntryClp clone = new TasksEntryClp();
 
@@ -726,7 +726,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(TasksEntry tasksEntry) {
 		int value = 0;
 
@@ -759,7 +759,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -785,22 +785,22 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(29);
 
@@ -837,7 +837,7 @@ public class TasksEntryClp extends BaseModelImpl<TasksEntry>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(46);
 
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryConstants.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryConstants.java
index 8ef8db21e3b..aaa9963fb05 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryConstants.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryConstants.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.model;
 
 /**
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryModel.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryModel.java
index 0b6251e9e41..564fdffbe9a 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryModel.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model;
@@ -84,7 +84,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @return the group ID of this tasks entry
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -92,7 +92,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param groupId the group ID of this tasks entry
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -100,7 +100,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @return the company ID of this tasks entry
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -108,7 +108,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param companyId the company ID of this tasks entry
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -116,7 +116,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @return the user ID of this tasks entry
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -124,7 +124,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param userId the user ID of this tasks entry
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -132,7 +132,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @return the user uuid of this tasks entry
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -140,7 +140,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param userUuid the user uuid of this tasks entry
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -149,7 +149,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 * @return the user name of this tasks entry
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -157,7 +157,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param userName the user name of this tasks entry
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -165,7 +165,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @return the create date of this tasks entry
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -173,7 +173,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param createDate the create date of this tasks entry
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -181,7 +181,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @return the modified date of this tasks entry
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -189,7 +189,7 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 *
 	 * @param modifiedDate the modified date of this tasks entry
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -319,60 +319,60 @@ public interface TasksEntryModel extends BaseModel<TasksEntry>, GroupedModel,
 	 */
 	public void setStatus(int status);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.tasks.model.TasksEntry tasksEntry);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.tasks.model.TasksEntry> toCacheModel();
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry toEscapedModel();
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntrySoap.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntrySoap.java
index 6b9d07bef24..07cddb7b1e0 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntrySoap.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntrySoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryWrapper.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryWrapper.java
index 827e2f7b720..d256618295b 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryWrapper.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/model/TasksEntryWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model;
@@ -43,17 +43,17 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 		_tasksEntry = tasksEntry;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return TasksEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return TasksEntry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -75,7 +75,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long tasksEntryId = (Long)attributes.get("tasksEntryId");
 
@@ -162,42 +162,42 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _tasksEntry.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _tasksEntry.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _tasksEntry.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _tasksEntry.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.tasks.model.TasksEntry> toCacheModel() {
 		return _tasksEntry.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry toEscapedModel() {
 		return new TasksEntryWrapper(_tasksEntry.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry toUnescapedModel() {
 		return new TasksEntryWrapper(_tasksEntry.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.tasks.model.TasksEntry tasksEntry) {
 		return _tasksEntry.compareTo(tasksEntry);
 	}
@@ -207,7 +207,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the priority of this tasks entry
 	*/
-	@Override
+
 	public int getPriority() {
 		return _tasksEntry.getPriority();
 	}
@@ -217,27 +217,27 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the status of this tasks entry
 	*/
-	@Override
+
 	public int getStatus() {
 		return _tasksEntry.getStatus();
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _tasksEntry.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _tasksEntry.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new TasksEntryWrapper((TasksEntry)_tasksEntry.clone());
 	}
 
-	@Override
+
 	public java.lang.String getAssigneeFullName() {
 		return _tasksEntry.getAssigneeFullName();
 	}
@@ -247,17 +247,17 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the assignee user uuid of this tasks entry
 	*/
-	@Override
+
 	public java.lang.String getAssigneeUserUuid() {
 		return _tasksEntry.getAssigneeUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String getPriorityLabel() {
 		return _tasksEntry.getPriorityLabel();
 	}
 
-	@Override
+
 	public java.lang.String getReporterFullName() {
 		return _tasksEntry.getReporterFullName();
 	}
@@ -267,12 +267,12 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the resolver user uuid of this tasks entry
 	*/
-	@Override
+
 	public java.lang.String getResolverUserUuid() {
 		return _tasksEntry.getResolverUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String getStatusLabel() {
 		return _tasksEntry.getStatusLabel();
 	}
@@ -282,7 +282,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the title of this tasks entry
 	*/
-	@Override
+
 	public java.lang.String getTitle() {
 		return _tasksEntry.getTitle();
 	}
@@ -292,7 +292,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the user name of this tasks entry
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _tasksEntry.getUserName();
 	}
@@ -302,17 +302,17 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the user uuid of this tasks entry
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _tasksEntry.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _tasksEntry.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _tasksEntry.toXmlString();
 	}
@@ -322,7 +322,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the create date of this tasks entry
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _tasksEntry.getCreateDate();
 	}
@@ -332,7 +332,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the due date of this tasks entry
 	*/
-	@Override
+
 	public Date getDueDate() {
 		return _tasksEntry.getDueDate();
 	}
@@ -342,7 +342,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the finish date of this tasks entry
 	*/
-	@Override
+
 	public Date getFinishDate() {
 		return _tasksEntry.getFinishDate();
 	}
@@ -352,7 +352,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the modified date of this tasks entry
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _tasksEntry.getModifiedDate();
 	}
@@ -362,7 +362,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the assignee user ID of this tasks entry
 	*/
-	@Override
+
 	public long getAssigneeUserId() {
 		return _tasksEntry.getAssigneeUserId();
 	}
@@ -372,7 +372,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the company ID of this tasks entry
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _tasksEntry.getCompanyId();
 	}
@@ -382,7 +382,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the group ID of this tasks entry
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _tasksEntry.getGroupId();
 	}
@@ -392,7 +392,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the primary key of this tasks entry
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _tasksEntry.getPrimaryKey();
 	}
@@ -402,7 +402,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the resolver user ID of this tasks entry
 	*/
-	@Override
+
 	public long getResolverUserId() {
 		return _tasksEntry.getResolverUserId();
 	}
@@ -412,7 +412,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the tasks entry ID of this tasks entry
 	*/
-	@Override
+
 	public long getTasksEntryId() {
 		return _tasksEntry.getTasksEntryId();
 	}
@@ -422,12 +422,12 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @return the user ID of this tasks entry
 	*/
-	@Override
+
 	public long getUserId() {
 		return _tasksEntry.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_tasksEntry.persist();
 	}
@@ -437,7 +437,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param assigneeUserId the assignee user ID of this tasks entry
 	*/
-	@Override
+
 	public void setAssigneeUserId(long assigneeUserId) {
 		_tasksEntry.setAssigneeUserId(assigneeUserId);
 	}
@@ -447,12 +447,12 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param assigneeUserUuid the assignee user uuid of this tasks entry
 	*/
-	@Override
+
 	public void setAssigneeUserUuid(java.lang.String assigneeUserUuid) {
 		_tasksEntry.setAssigneeUserUuid(assigneeUserUuid);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_tasksEntry.setCachedModel(cachedModel);
 	}
@@ -462,7 +462,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param companyId the company ID of this tasks entry
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_tasksEntry.setCompanyId(companyId);
 	}
@@ -472,7 +472,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param createDate the create date of this tasks entry
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_tasksEntry.setCreateDate(createDate);
 	}
@@ -482,23 +482,23 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param dueDate the due date of this tasks entry
 	*/
-	@Override
+
 	public void setDueDate(Date dueDate) {
 		_tasksEntry.setDueDate(dueDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_tasksEntry.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_tasksEntry.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_tasksEntry.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -508,7 +508,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param finishDate the finish date of this tasks entry
 	*/
-	@Override
+
 	public void setFinishDate(Date finishDate) {
 		_tasksEntry.setFinishDate(finishDate);
 	}
@@ -518,7 +518,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param groupId the group ID of this tasks entry
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_tasksEntry.setGroupId(groupId);
 	}
@@ -528,12 +528,12 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param modifiedDate the modified date of this tasks entry
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_tasksEntry.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_tasksEntry.setNew(n);
 	}
@@ -543,12 +543,12 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param primaryKey the primary key of this tasks entry
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_tasksEntry.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_tasksEntry.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -558,7 +558,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param priority the priority of this tasks entry
 	*/
-	@Override
+
 	public void setPriority(int priority) {
 		_tasksEntry.setPriority(priority);
 	}
@@ -568,7 +568,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param resolverUserId the resolver user ID of this tasks entry
 	*/
-	@Override
+
 	public void setResolverUserId(long resolverUserId) {
 		_tasksEntry.setResolverUserId(resolverUserId);
 	}
@@ -578,7 +578,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param resolverUserUuid the resolver user uuid of this tasks entry
 	*/
-	@Override
+
 	public void setResolverUserUuid(java.lang.String resolverUserUuid) {
 		_tasksEntry.setResolverUserUuid(resolverUserUuid);
 	}
@@ -588,7 +588,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param status the status of this tasks entry
 	*/
-	@Override
+
 	public void setStatus(int status) {
 		_tasksEntry.setStatus(status);
 	}
@@ -598,7 +598,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param tasksEntryId the tasks entry ID of this tasks entry
 	*/
-	@Override
+
 	public void setTasksEntryId(long tasksEntryId) {
 		_tasksEntry.setTasksEntryId(tasksEntryId);
 	}
@@ -608,7 +608,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param title the title of this tasks entry
 	*/
-	@Override
+
 	public void setTitle(java.lang.String title) {
 		_tasksEntry.setTitle(title);
 	}
@@ -618,7 +618,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param userId the user ID of this tasks entry
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_tasksEntry.setUserId(userId);
 	}
@@ -628,7 +628,7 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param userName the user name of this tasks entry
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_tasksEntry.setUserName(userName);
 	}
@@ -638,12 +638,12 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 	*
 	* @param userUuid the user uuid of this tasks entry
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_tasksEntry.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -662,22 +662,22 @@ public class TasksEntryWrapper implements TasksEntry, ModelWrapper<TasksEntry> {
 		return false;
 	}
 
-	@Override
+
 	public TasksEntry getWrappedModel() {
 		return _tasksEntry;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _tasksEntry.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _tasksEntry.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_tasksEntry.resetOriginalValues();
 	}
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/ClpSerializer.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/ClpSerializer.java
index 091fff32600..d8efd9db571 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/ClpSerializer.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalService.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalService.java
index aad30b1c75a..ee6a966b1ff 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalService.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
@@ -73,11 +73,11 @@ public interface TasksEntryLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -196,7 +196,7 @@ public interface TasksEntryLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getUserTasksEntriesCount(long userId);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceClp.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceClp.java
index f9c97d24c08..1aed6cd5619 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceClp.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
@@ -228,7 +228,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -251,7 +251,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -274,7 +274,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -297,7 +297,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -327,7 +327,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -357,7 +357,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry addTasksEntry(
 		com.liferay.tasks.model.TasksEntry tasksEntry) {
 		Object returnObj = null;
@@ -382,7 +382,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry addTasksEntry(long userId,
 		java.lang.String title, int priority, long assigneeUserId,
 		int dueDateMonth, int dueDateDay, int dueDateYear, int dueDateHour,
@@ -437,7 +437,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry createTasksEntry(
 		long tasksEntryId) {
 		Object returnObj = null;
@@ -461,7 +461,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry deleteTasksEntry(
 		com.liferay.tasks.model.TasksEntry tasksEntry)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -491,7 +491,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry deleteTasksEntry(
 		long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -520,7 +520,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry fetchTasksEntry(long tasksEntryId) {
 		Object returnObj = null;
 
@@ -543,7 +543,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry getTasksEntry(long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -571,7 +571,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntry(
 		com.liferay.tasks.model.TasksEntry tasksEntry) {
 		Object returnObj = null;
@@ -596,7 +596,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntry(
 		long tasksEntryId, java.lang.String title, int priority,
 		long assigneeUserId, long resolverUserId, int dueDateMonth,
@@ -656,7 +656,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntryStatus(
 		long tasksEntryId, long resolverUserId, int status,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -695,7 +695,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getAssigneeTasksEntriesCount(long assigneeUserId) {
 		Object returnObj = null;
 
@@ -718,7 +718,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getGroupAssigneeTasksEntriesCount(long groupId,
 		long assigneeUserId) {
 		Object returnObj = null;
@@ -743,7 +743,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getGroupResolverTasksEntriesCount(long groupId,
 		long resolverUserId) {
 		Object returnObj = null;
@@ -768,7 +768,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getGroupUserTasksEntriesCount(long groupId, long userId) {
 		Object returnObj = null;
 
@@ -791,7 +791,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getResolverTasksEntriesCount(long resolverUserId) {
 		Object returnObj = null;
 
@@ -814,7 +814,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getTasksEntriesCount() {
 		Object returnObj = null;
 
@@ -837,7 +837,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getTasksEntriesCount(long groupId) {
 		Object returnObj = null;
 
@@ -860,7 +860,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getTasksEntriesCount(long groupId, long userId, int priority,
 		long assigneeUserId, int status, long[] tagsEntryIds,
 		long[] notTagsEntryIds) {
@@ -900,7 +900,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getUserTasksEntriesCount(long userId) {
 		Object returnObj = null;
 
@@ -923,14 +923,14 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -953,7 +953,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -978,7 +978,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -1010,7 +1010,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -1045,7 +1045,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getAssigneeTasksEntries(
 		long assigneeUserId, int start, int end) {
 		Object returnObj = null;
@@ -1070,7 +1070,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getGroupAssigneeTasksEntries(
 		long groupId, long assigneeUserId, int start, int end) {
 		Object returnObj = null;
@@ -1095,7 +1095,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getGroupResolverTasksEntries(
 		long groupId, long resolverUserId, int start, int end) {
 		Object returnObj = null;
@@ -1120,7 +1120,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getGroupUserTasksEntries(
 		long groupId, long userId, int start, int end) {
 		Object returnObj = null;
@@ -1145,7 +1145,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getResolverTasksEntries(
 		long resolverUserId, int start, int end) {
 		Object returnObj = null;
@@ -1170,7 +1170,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getTasksEntries(
 		int start, int end) {
 		Object returnObj = null;
@@ -1194,7 +1194,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getTasksEntries(
 		long groupId, int start, int end) {
 		Object returnObj = null;
@@ -1219,7 +1219,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getTasksEntries(
 		long groupId, long userId, int priority, long assigneeUserId,
 		int status, long[] assetTagIds, long[] notAssetTagIds, int start,
@@ -1264,7 +1264,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getUserTasksEntries(
 		long userId, int start, int end) {
 		Object returnObj = null;
@@ -1288,7 +1288,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return (java.util.List<com.liferay.tasks.model.TasksEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -1313,7 +1313,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -1343,7 +1343,7 @@ public class TasksEntryLocalServiceClp implements TasksEntryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void updateAsset(long userId,
 		com.liferay.tasks.model.TasksEntry tasksEntry, long[] assetCategoryIds,
 		java.lang.String[] assetTagNames)
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceUtil.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceUtil.java
index 0e07f625dfa..f5ed5b78728 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceUtil.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceWrapper.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceWrapper.java
index ca22724f7b0..8f4e5a384de 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceWrapper.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
@@ -33,17 +33,17 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 		_tasksEntryLocalService = tasksEntryLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _tasksEntryLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _tasksEntryLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _tasksEntryLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -51,14 +51,14 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _tasksEntryLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -71,13 +71,13 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param tasksEntry the tasks entry
 	* @return the tasks entry that was added
 	*/
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry addTasksEntry(
 		com.liferay.tasks.model.TasksEntry tasksEntry) {
 		return _tasksEntryLocalService.addTasksEntry(tasksEntry);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry addTasksEntry(long userId,
 		java.lang.String title, int priority, long assigneeUserId,
 		int dueDateMonth, int dueDateDay, int dueDateYear, int dueDateHour,
@@ -95,7 +95,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param tasksEntryId the primary key for the new tasks entry
 	* @return the new tasks entry
 	*/
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry createTasksEntry(
 		long tasksEntryId) {
 		return _tasksEntryLocalService.createTasksEntry(tasksEntryId);
@@ -108,7 +108,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @return the tasks entry that was removed
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry deleteTasksEntry(
 		com.liferay.tasks.model.TasksEntry tasksEntry)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -122,14 +122,14 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @return the tasks entry that was removed
 	* @throws PortalException if a tasks entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry deleteTasksEntry(
 		long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _tasksEntryLocalService.deleteTasksEntry(tasksEntryId);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry fetchTasksEntry(long tasksEntryId) {
 		return _tasksEntryLocalService.fetchTasksEntry(tasksEntryId);
 	}
@@ -141,7 +141,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @return the tasks entry
 	* @throws PortalException if a tasks entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry getTasksEntry(long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _tasksEntryLocalService.getTasksEntry(tasksEntryId);
@@ -153,13 +153,13 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param tasksEntry the tasks entry
 	* @return the tasks entry that was updated
 	*/
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntry(
 		com.liferay.tasks.model.TasksEntry tasksEntry) {
 		return _tasksEntryLocalService.updateTasksEntry(tasksEntry);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntry(
 		long tasksEntryId, java.lang.String title, int priority,
 		long assigneeUserId, long resolverUserId, int dueDateMonth,
@@ -173,7 +173,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			serviceContext);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntryStatus(
 		long tasksEntryId, long resolverUserId, int status,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -182,32 +182,32 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			resolverUserId, status, serviceContext);
 	}
 
-	@Override
+
 	public int getAssigneeTasksEntriesCount(long assigneeUserId) {
 		return _tasksEntryLocalService.getAssigneeTasksEntriesCount(assigneeUserId);
 	}
 
-	@Override
+
 	public int getGroupAssigneeTasksEntriesCount(long groupId,
 		long assigneeUserId) {
 		return _tasksEntryLocalService.getGroupAssigneeTasksEntriesCount(groupId,
 			assigneeUserId);
 	}
 
-	@Override
+
 	public int getGroupResolverTasksEntriesCount(long groupId,
 		long resolverUserId) {
 		return _tasksEntryLocalService.getGroupResolverTasksEntriesCount(groupId,
 			resolverUserId);
 	}
 
-	@Override
+
 	public int getGroupUserTasksEntriesCount(long groupId, long userId) {
 		return _tasksEntryLocalService.getGroupUserTasksEntriesCount(groupId,
 			userId);
 	}
 
-	@Override
+
 	public int getResolverTasksEntriesCount(long resolverUserId) {
 		return _tasksEntryLocalService.getResolverTasksEntriesCount(resolverUserId);
 	}
@@ -217,17 +217,17 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	*
 	* @return the number of tasks entries
 	*/
-	@Override
+
 	public int getTasksEntriesCount() {
 		return _tasksEntryLocalService.getTasksEntriesCount();
 	}
 
-	@Override
+
 	public int getTasksEntriesCount(long groupId) {
 		return _tasksEntryLocalService.getTasksEntriesCount(groupId);
 	}
 
-	@Override
+
 	public int getTasksEntriesCount(long groupId, long userId, int priority,
 		long assigneeUserId, int status, long[] tagsEntryIds,
 		long[] notTagsEntryIds) {
@@ -235,12 +235,12 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			priority, assigneeUserId, status, tagsEntryIds, notTagsEntryIds);
 	}
 
-	@Override
+
 	public int getUserTasksEntriesCount(long userId) {
 		return _tasksEntryLocalService.getUserTasksEntriesCount(userId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -253,7 +253,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _tasksEntryLocalService.getOSGiServiceIdentifier();
 	}
@@ -264,7 +264,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _tasksEntryLocalService.dynamicQuery(dynamicQuery);
@@ -282,7 +282,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -302,7 +302,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -311,35 +311,35 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getAssigneeTasksEntries(
 		long assigneeUserId, int start, int end) {
 		return _tasksEntryLocalService.getAssigneeTasksEntries(assigneeUserId,
 			start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getGroupAssigneeTasksEntries(
 		long groupId, long assigneeUserId, int start, int end) {
 		return _tasksEntryLocalService.getGroupAssigneeTasksEntries(groupId,
 			assigneeUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getGroupResolverTasksEntries(
 		long groupId, long resolverUserId, int start, int end) {
 		return _tasksEntryLocalService.getGroupResolverTasksEntries(groupId,
 			resolverUserId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getGroupUserTasksEntries(
 		long groupId, long userId, int start, int end) {
 		return _tasksEntryLocalService.getGroupUserTasksEntries(groupId,
 			userId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getResolverTasksEntries(
 		long resolverUserId, int start, int end) {
 		return _tasksEntryLocalService.getResolverTasksEntries(resolverUserId,
@@ -357,19 +357,19 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param end the upper bound of the range of tasks entries (not inclusive)
 	* @return the range of tasks entries
 	*/
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getTasksEntries(
 		int start, int end) {
 		return _tasksEntryLocalService.getTasksEntries(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getTasksEntries(
 		long groupId, int start, int end) {
 		return _tasksEntryLocalService.getTasksEntries(groupId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getTasksEntries(
 		long groupId, long userId, int priority, long assigneeUserId,
 		int status, long[] assetTagIds, long[] notAssetTagIds, int start,
@@ -379,7 +379,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.tasks.model.TasksEntry> getUserTasksEntries(
 		long userId, int start, int end) {
 		return _tasksEntryLocalService.getUserTasksEntries(userId, start, end);
@@ -391,7 +391,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _tasksEntryLocalService.dynamicQueryCount(dynamicQuery);
@@ -404,7 +404,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -412,7 +412,7 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			projection);
 	}
 
-	@Override
+
 	public void updateAsset(long userId,
 		com.liferay.tasks.model.TasksEntry tasksEntry, long[] assetCategoryIds,
 		java.lang.String[] assetTagNames)
@@ -421,12 +421,12 @@ public class TasksEntryLocalServiceWrapper implements TasksEntryLocalService,
 			assetCategoryIds, assetTagNames);
 	}
 
-	@Override
+
 	public TasksEntryLocalService getWrappedService() {
 		return _tasksEntryLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(TasksEntryLocalService tasksEntryLocalService) {
 		_tasksEntryLocalService = tasksEntryLocalService;
 	}
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryService.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryService.java
index f9301895674..3db39d44be5 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryService.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
@@ -73,7 +73,7 @@ public interface TasksEntryService extends BaseService, InvokableService {
 		long resolverUserId, int status, ServiceContext serviceContext)
 		throws PortalException;
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceClp.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceClp.java
index 8a63e698794..f8941788c24 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceClp.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
@@ -63,7 +63,7 @@ public class TasksEntryServiceClp implements TasksEntryService {
 		_methodParameterTypes6 = new String[] {  };
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry addTasksEntry(
 		java.lang.String title, int priority, long assigneeUserId,
 		int dueDateMonth, int dueDateDay, int dueDateYear, int dueDateHour,
@@ -116,7 +116,7 @@ public class TasksEntryServiceClp implements TasksEntryService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry deleteTasksEntry(
 		long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -145,7 +145,7 @@ public class TasksEntryServiceClp implements TasksEntryService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry getTasksEntry(long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -173,7 +173,7 @@ public class TasksEntryServiceClp implements TasksEntryService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntry(
 		long tasksEntryId, java.lang.String title, int priority,
 		long assigneeUserId, long resolverUserId, int dueDateMonth,
@@ -233,7 +233,7 @@ public class TasksEntryServiceClp implements TasksEntryService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntryStatus(
 		long tasksEntryId, long resolverUserId, int status,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -272,14 +272,14 @@ public class TasksEntryServiceClp implements TasksEntryService {
 		return (com.liferay.tasks.model.TasksEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceUtil.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceUtil.java
index 0b84c514b13..3ea3b586735 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceUtil.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceWrapper.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceWrapper.java
index ceb124bd9aa..06563f509db 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceWrapper.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/TasksEntryServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service;
@@ -32,7 +32,7 @@ public class TasksEntryServiceWrapper implements TasksEntryService,
 		_tasksEntryService = tasksEntryService;
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry addTasksEntry(
 		java.lang.String title, int priority, long assigneeUserId,
 		int dueDateMonth, int dueDateDay, int dueDateYear, int dueDateHour,
@@ -44,20 +44,20 @@ public class TasksEntryServiceWrapper implements TasksEntryService,
 			dueDateMinute, neverDue, serviceContext);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry deleteTasksEntry(
 		long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _tasksEntryService.deleteTasksEntry(tasksEntryId);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry getTasksEntry(long tasksEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _tasksEntryService.getTasksEntry(tasksEntryId);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntry(
 		long tasksEntryId, java.lang.String title, int priority,
 		long assigneeUserId, long resolverUserId, int dueDateMonth,
@@ -71,7 +71,7 @@ public class TasksEntryServiceWrapper implements TasksEntryService,
 			serviceContext);
 	}
 
-	@Override
+
 	public com.liferay.tasks.model.TasksEntry updateTasksEntryStatus(
 		long tasksEntryId, long resolverUserId, int status,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -80,7 +80,7 @@ public class TasksEntryServiceWrapper implements TasksEntryService,
 			resolverUserId, status, serviceContext);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -92,17 +92,17 @@ public class TasksEntryServiceWrapper implements TasksEntryService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _tasksEntryService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public TasksEntryService getWrappedService() {
 		return _tasksEntryService;
 	}
 
-	@Override
+
 	public void setWrappedService(TasksEntryService tasksEntryService) {
 		_tasksEntryService = tasksEntryService;
 	}
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/messaging/ClpMessageListener.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/messaging/ClpMessageListener.java
index 6c2d79844e3..499e6b40b0f 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/messaging/ClpMessageListener.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.messaging;
@@ -32,7 +32,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksEntryPermission.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksEntryPermission.java
index 851fe2e1909..703dc028a89 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksEntryPermission.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksEntryPermission.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.service.permission;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksPermission.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksPermission.java
index 0fa373731e2..572a4dcb301 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksPermission.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/permission/TasksPermission.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.service.permission;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinder.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinder.java
index 4e897d6bb4f..d4df4fce111 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinder.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.persistence;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinderUtil.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinderUtil.java
index fb522d6ff35..b5c18e73146 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinderUtil.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryFinderUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.persistence;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryPersistence.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryPersistence.java
index f8cc8a1f8b9..cd48b00f65e 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryPersistence.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.persistence;
@@ -2495,7 +2495,7 @@ public interface TasksEntryPersistence extends BasePersistence<TasksEntry> {
 	*/
 	public TasksEntry fetchByPrimaryKey(long tasksEntryId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, TasksEntry> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryUtil.java b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryUtil.java
index 2d55066b54a..63080c3bcf5 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryUtil.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/service/com/liferay/tasks/service/persistence/TasksEntryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.persistence;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRenderer.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRenderer.java
index 3a789216fd0..63d689407c4 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRenderer.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRenderer.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.asset;
 
 import com.liferay.asset.kernel.model.BaseJSPAssetRenderer;
@@ -49,27 +50,27 @@ public class TasksEntryAssetRenderer extends BaseJSPAssetRenderer<TasksEntry> {
 		_entry = entry;
 	}
 
-	@Override
+
 	public TasksEntry getAssetObject() {
 		return _entry;
 	}
 
-	@Override
+
 	public String getClassName() {
 		return TasksEntry.class.getName();
 	}
 
-	@Override
+
 	public long getClassPK() {
 		return _entry.getTasksEntryId();
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _entry.getGroupId();
 	}
 
-	@Override
+
 	public String getJspPath(HttpServletRequest request, String template) {
 		if (template.equals(TEMPLATE_ABSTRACT) ||
 			template.equals(TEMPLATE_FULL_CONTENT)) {
@@ -81,24 +82,24 @@ public class TasksEntryAssetRenderer extends BaseJSPAssetRenderer<TasksEntry> {
 		}
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _entry.getStatus();
 	}
 
-	@Override
+
 	public String getSummary(
 		PortletRequest portletRequest, PortletResponse portletResponse) {
 
 		return _entry.getTitle();
 	}
 
-	@Override
+
 	public String getTitle(Locale locale) {
 		return _entry.getTitle();
 	}
 
-	@Override
+
 	public String getURLViewInContext(
 		LiferayPortletRequest liferayPortletRequest,
 		LiferayPortletResponse liferayPortletResponse,
@@ -128,28 +129,28 @@ public class TasksEntryAssetRenderer extends BaseJSPAssetRenderer<TasksEntry> {
 		return null;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _entry.getUserId();
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _entry.getUserName();
 	}
 
-	@Override
+
 	public String getUuid() {
 		return null;
 	}
 
-	@Override
+
 	public boolean hasViewPermission(PermissionChecker permissionChecker) {
 		return TasksEntryPermission.contains(
 			permissionChecker, _entry, ActionKeys.VIEW);
 	}
 
-	@Override
+
 	public boolean include(
 			HttpServletRequest request, HttpServletResponse response,
 			String template)
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRendererFactory.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRendererFactory.java
index 459d19f1e27..ef69ca10590 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRendererFactory.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/asset/TasksEntryAssetRendererFactory.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.asset;
 
 import com.liferay.asset.kernel.model.AssetRenderer;
@@ -35,7 +36,7 @@ public class TasksEntryAssetRendererFactory
 
 	public static final String TYPE = "tasks";
 
-	@Override
+
 	public AssetRenderer<TasksEntry> getAssetRenderer(long classPK, int type)
 		throws PortalException {
 
@@ -45,22 +46,22 @@ public class TasksEntryAssetRendererFactory
 		return new TasksEntryAssetRenderer(tasksEntry);
 	}
 
-	@Override
+
 	public String getClassName() {
 		return CLASS_NAME;
 	}
 
-	@Override
+
 	public String getIconCssClass() {
 		return "icon-tasks";
 	}
 
-	@Override
+
 	public String getType() {
 		return TYPE;
 	}
 
-	@Override
+
 	public boolean hasPermission(
 			PermissionChecker permissionChecker, long classPK, String actionId)
 		throws Exception {
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryBaseImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryBaseImpl.java
index c6f34497dd4..65ec0dafe35 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryBaseImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model.impl;
@@ -39,7 +39,7 @@ public abstract class TasksEntryBaseImpl extends TasksEntryModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a tasks entry model instance should use the {@link TasksEntry} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			TasksEntryLocalServiceUtil.addTasksEntry(this);
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryCacheModel.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryCacheModel.java
index c4e281e4804..e0455251e22 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryCacheModel.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class TasksEntryCacheModel implements CacheModel<TasksEntry>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class TasksEntryCacheModel implements CacheModel<TasksEntry>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, tasksEntryId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(29);
 
@@ -101,7 +101,7 @@ public class TasksEntryCacheModel implements CacheModel<TasksEntry>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public TasksEntry toEntityModel() {
 		TasksEntryImpl tasksEntryImpl = new TasksEntryImpl();
 
@@ -163,7 +163,7 @@ public class TasksEntryCacheModel implements CacheModel<TasksEntry>,
 		return tasksEntryImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		tasksEntryId = objectInput.readLong();
 
@@ -188,7 +188,7 @@ public class TasksEntryCacheModel implements CacheModel<TasksEntry>,
 		status = objectInput.readInt();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(tasksEntryId);
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryImpl.java
index 41291cc9c1d..dbbd80ef295 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.model.impl;
 
 import com.liferay.portal.kernel.model.User;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryModelImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryModelImpl.java
index 8b7ae321834..f40a56bd0db 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryModelImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/model/impl/TasksEntryModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.model.impl;
@@ -187,37 +187,37 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	public TasksEntryModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _tasksEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setTasksEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _tasksEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return TasksEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return TasksEntry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -242,7 +242,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long tasksEntryId = (Long)attributes.get("tasksEntryId");
 
@@ -330,23 +330,23 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getTasksEntryId() {
 		return _tasksEntryId;
 	}
 
-	@Override
+
 	public void setTasksEntryId(long tasksEntryId) {
 		_tasksEntryId = tasksEntryId;
 	}
 
 	@JSON
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_columnBitmask |= GROUPID_COLUMN_BITMASK;
 
@@ -364,23 +364,23 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 	}
 
 	@JSON
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_columnBitmask |= USERID_COLUMN_BITMASK;
 
@@ -393,7 +393,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -405,7 +405,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
@@ -414,7 +414,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -424,18 +424,18 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
 	@JSON
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_columnBitmask = -1L;
 
@@ -443,7 +443,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -452,7 +452,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -460,7 +460,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public String getTitle() {
 		if (_title == null) {
 			return StringPool.BLANK;
@@ -470,18 +470,18 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setTitle(String title) {
 		_title = title;
 	}
 
 	@JSON
-	@Override
+
 	public int getPriority() {
 		return _priority;
 	}
 
-	@Override
+
 	public void setPriority(int priority) {
 		_columnBitmask = -1L;
 
@@ -489,12 +489,12 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getAssigneeUserId() {
 		return _assigneeUserId;
 	}
 
-	@Override
+
 	public void setAssigneeUserId(long assigneeUserId) {
 		_columnBitmask |= ASSIGNEEUSERID_COLUMN_BITMASK;
 
@@ -507,7 +507,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		_assigneeUserId = assigneeUserId;
 	}
 
-	@Override
+
 	public String getAssigneeUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getAssigneeUserId());
@@ -519,7 +519,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setAssigneeUserUuid(String assigneeUserUuid) {
 	}
 
@@ -528,12 +528,12 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public long getResolverUserId() {
 		return _resolverUserId;
 	}
 
-	@Override
+
 	public void setResolverUserId(long resolverUserId) {
 		_columnBitmask |= RESOLVERUSERID_COLUMN_BITMASK;
 
@@ -546,7 +546,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		_resolverUserId = resolverUserId;
 	}
 
-	@Override
+
 	public String getResolverUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getResolverUserId());
@@ -558,7 +558,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public void setResolverUserUuid(String resolverUserUuid) {
 	}
 
@@ -567,12 +567,12 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public Date getDueDate() {
 		return _dueDate;
 	}
 
-	@Override
+
 	public void setDueDate(Date dueDate) {
 		_columnBitmask = -1L;
 
@@ -580,23 +580,23 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 	}
 
 	@JSON
-	@Override
+
 	public Date getFinishDate() {
 		return _finishDate;
 	}
 
-	@Override
+
 	public void setFinishDate(Date finishDate) {
 		_finishDate = finishDate;
 	}
 
 	@JSON
-	@Override
+
 	public int getStatus() {
 		return _status;
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_columnBitmask |= STATUS_COLUMN_BITMASK;
 
@@ -617,20 +617,20 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			TasksEntry.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public TasksEntry toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (TasksEntry)ProxyUtil.newProxyInstance(_classLoader,
@@ -640,7 +640,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		TasksEntryImpl tasksEntryImpl = new TasksEntryImpl();
 
@@ -664,7 +664,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return tasksEntryImpl;
 	}
 
-	@Override
+
 	public int compareTo(TasksEntry tasksEntry) {
 		int value = 0;
 
@@ -697,7 +697,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -719,22 +719,22 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		TasksEntryModelImpl tasksEntryModelImpl = this;
 
@@ -763,7 +763,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		tasksEntryModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<TasksEntry> toCacheModel() {
 		TasksEntryCacheModel tasksEntryCacheModel = new TasksEntryCacheModel();
 
@@ -838,7 +838,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return tasksEntryCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(29);
 
@@ -875,7 +875,7 @@ public class TasksEntryModelImpl extends BaseModelImpl<TasksEntry>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(46);
 
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/notifications/TasksUserNotificationHandler.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/notifications/TasksUserNotificationHandler.java
index 48126db42d1..984c1fe8d27 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/notifications/TasksUserNotificationHandler.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/notifications/TasksUserNotificationHandler.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.notifications;
 
 import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil;
@@ -43,7 +44,7 @@ public class TasksUserNotificationHandler extends BaseUserNotificationHandler {
 		setPortletId(PortletKeys.TASKS);
 	}
 
-	@Override
+
 	protected String getBody(
 			UserNotificationEvent userNotificationEvent,
 			ServiceContext serviceContext)
@@ -79,7 +80,7 @@ public class TasksUserNotificationHandler extends BaseUserNotificationHandler {
 			});
 	}
 
-	@Override
+
 	protected String getLink(
 			UserNotificationEvent userNotificationEvent,
 			ServiceContext serviceContext)
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/portlet/TasksPortlet.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/portlet/TasksPortlet.java
index c55bca10060..1cd68a07321 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/portlet/TasksPortlet.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/portlet/TasksPortlet.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.portlet;
 
 import com.liferay.asset.kernel.exception.AssetTagException;
@@ -82,7 +83,7 @@ public class TasksPortlet extends MVCPortlet {
 		}
 	}
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceBaseImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceBaseImpl.java
index 8eb029ffa0a..5865728a90f 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceBaseImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.base;
@@ -80,7 +80,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @return the tasks entry that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public TasksEntry addTasksEntry(TasksEntry tasksEntry) {
 		tasksEntry.setNew(true);
 
@@ -93,7 +93,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param tasksEntryId the primary key for the new tasks entry
 	 * @return the new tasks entry
 	 */
-	@Override
+
 	public TasksEntry createTasksEntry(long tasksEntryId) {
 		return tasksEntryPersistence.create(tasksEntryId);
 	}
@@ -106,7 +106,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @throws PortalException if a tasks entry with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public TasksEntry deleteTasksEntry(long tasksEntryId)
 		throws PortalException {
 		return tasksEntryPersistence.remove(tasksEntryId);
@@ -120,13 +120,13 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @throws PortalException
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public TasksEntry deleteTasksEntry(TasksEntry tasksEntry)
 		throws PortalException {
 		return tasksEntryPersistence.remove(tasksEntry);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -140,7 +140,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return tasksEntryPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -157,7 +157,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return tasksEntryPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -177,7 +177,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return tasksEntryPersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -190,7 +190,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return tasksEntryPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -202,14 +202,14 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return tasksEntryPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public TasksEntry fetchTasksEntry(long tasksEntryId) {
 		return tasksEntryPersistence.fetchByPrimaryKey(tasksEntryId);
 	}
@@ -221,13 +221,13 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @return the tasks entry
 	 * @throws PortalException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry getTasksEntry(long tasksEntryId)
 		throws PortalException {
 		return tasksEntryPersistence.findByPrimaryKey(tasksEntryId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -240,7 +240,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -266,13 +266,13 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return tasksEntryLocalService.deleteTasksEntry((TasksEntry)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return tasksEntryPersistence.findByPrimaryKey(primaryKeyObj);
@@ -289,7 +289,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> getTasksEntries(int start, int end) {
 		return tasksEntryPersistence.findAll(start, end);
 	}
@@ -299,7 +299,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 *
 	 * @return the number of tasks entries
 	 */
-	@Override
+
 	public int getTasksEntriesCount() {
 		return tasksEntryPersistence.countAll();
 	}
@@ -311,7 +311,7 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 * @return the tasks entry that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public TasksEntry updateTasksEntry(TasksEntry tasksEntry) {
 		return tasksEntryPersistence.update(tasksEntry);
 	}
@@ -504,12 +504,12 @@ public abstract class TasksEntryLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return TasksEntryLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceClpInvoker.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceClpInvoker.java
index dab829bd294..266a6075575 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceClpInvoker.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.base;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceBaseImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceBaseImpl.java
index bd385580b71..1ad56289a32 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceBaseImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.base;
@@ -292,12 +292,12 @@ public abstract class TasksEntryServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return TasksEntryService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceClpInvoker.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceClpInvoker.java
index 93840853f5e..52fd557fcb5 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceClpInvoker.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/base/TasksEntryServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.base;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceHttp.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceHttp.java
index 61bf2e18d66..436f4c3f032 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceHttp.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.http;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceSoap.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceSoap.java
index fdb91adc374..9d69f466235 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceSoap.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/http/TasksEntryServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.http;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryLocalServiceImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryLocalServiceImpl.java
index d6a2fceff66..52f22184148 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryLocalServiceImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryLocalServiceImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.service.impl;
 
 import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil;
@@ -123,7 +124,7 @@ public class TasksEntryLocalServiceImpl extends TasksEntryLocalServiceBaseImpl {
 		return tasksEntry;
 	}
 
-	@Override
+
 	public TasksEntry deleteTasksEntry(long tasksEntryId)
 		throws PortalException {
 
@@ -133,7 +134,7 @@ public class TasksEntryLocalServiceImpl extends TasksEntryLocalServiceBaseImpl {
 		return deleteTasksEntry(tasksEntry);
 	}
 
-	@Override
+
 	public TasksEntry deleteTasksEntry(TasksEntry tasksEntry)
 		throws PortalException {
 
@@ -244,7 +245,7 @@ public class TasksEntryLocalServiceImpl extends TasksEntryLocalServiceBaseImpl {
 			notTagsEntryIds);
 	}
 
-	@Override
+
 	public TasksEntry getTasksEntry(long tasksEntryId) throws PortalException {
 		return tasksEntryPersistence.findByPrimaryKey(tasksEntryId);
 	}
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryServiceImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryServiceImpl.java
index 409473402cb..f4c25bb529b 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryServiceImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/impl/TasksEntryServiceImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.service.impl;
 
 import com.liferay.portal.kernel.exception.PortalException;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderBaseImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderBaseImpl.java
index 969d94d1483..d26615f6513 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderBaseImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.persistence.impl;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderImpl.java
index 6fe4760fffa..84d9ed08b5e 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryFinderImpl.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.service.persistence.impl;
 
 import com.liferay.portal.kernel.dao.orm.QueryPos;
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryPersistenceImpl.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryPersistenceImpl.java
index 95ea31a6b13..b3550b6778e 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryPersistenceImpl.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/service/persistence/impl/TasksEntryPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tasks.service.persistence.impl;
@@ -123,7 +123,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByGroupId(long groupId) {
 		return findByGroupId(groupId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -140,7 +140,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByGroupId(long groupId, int start, int end) {
 		return findByGroupId(groupId, start, end, null);
 	}
@@ -158,7 +158,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByGroupId(long groupId, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		return findByGroupId(groupId, start, end, orderByComparator, true);
@@ -178,7 +178,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByGroupId(long groupId, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -289,7 +289,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByGroupId_First(long groupId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -318,7 +318,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByGroupId_First(long groupId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByGroupId(groupId, 0, 1, orderByComparator);
@@ -338,7 +338,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByGroupId_Last(long groupId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -367,7 +367,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByGroupId_Last(long groupId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByGroupId(groupId);
@@ -395,7 +395,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByGroupId_PrevAndNext(long tasksEntryId,
 		long groupId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -538,7 +538,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByGroupId(long groupId) {
 		return filterFindByGroupId(groupId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -556,7 +556,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByGroupId(long groupId, int start, int end) {
 		return filterFindByGroupId(groupId, start, end, null);
 	}
@@ -574,7 +574,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByGroupId(long groupId, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -664,7 +664,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] filterFindByGroupId_PrevAndNext(long tasksEntryId,
 		long groupId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -846,7 +846,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @param groupId the group ID
 	 */
-	@Override
+
 	public void removeByGroupId(long groupId) {
 		for (TasksEntry tasksEntry : findByGroupId(groupId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -860,7 +860,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByGroupId(long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_GROUPID;
 
@@ -911,7 +911,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByGroupId(long groupId) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByGroupId(groupId);
@@ -983,7 +983,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByUserId(long userId) {
 		return findByUserId(userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1000,7 +1000,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByUserId(long userId, int start, int end) {
 		return findByUserId(userId, start, end, null);
 	}
@@ -1018,7 +1018,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByUserId(long userId, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		return findByUserId(userId, start, end, orderByComparator, true);
@@ -1038,7 +1038,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByUserId(long userId, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1149,7 +1149,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByUserId_First(long userId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -1178,7 +1178,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByUserId_First(long userId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByUserId(userId, 0, 1, orderByComparator);
@@ -1198,7 +1198,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByUserId_Last(long userId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -1227,7 +1227,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByUserId_Last(long userId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByUserId(userId);
@@ -1255,7 +1255,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByUserId_PrevAndNext(long tasksEntryId,
 		long userId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -1397,7 +1397,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @param userId the user ID
 	 */
-	@Override
+
 	public void removeByUserId(long userId) {
 		for (TasksEntry tasksEntry : findByUserId(userId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -1411,7 +1411,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByUserId(long userId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_USERID;
 
@@ -1487,7 +1487,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByAssigneeUserId(long assigneeUserId) {
 		return findByAssigneeUserId(assigneeUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1505,7 +1505,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByAssigneeUserId(long assigneeUserId,
 		int start, int end) {
 		return findByAssigneeUserId(assigneeUserId, start, end, null);
@@ -1524,7 +1524,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByAssigneeUserId(long assigneeUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByAssigneeUserId(assigneeUserId, start, end,
@@ -1545,7 +1545,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByAssigneeUserId(long assigneeUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1660,7 +1660,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByAssigneeUserId_First(long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -1690,7 +1690,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByAssigneeUserId_First(long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByAssigneeUserId(assigneeUserId, 0, 1,
@@ -1711,7 +1711,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByAssigneeUserId_Last(long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -1741,7 +1741,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByAssigneeUserId_Last(long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByAssigneeUserId(assigneeUserId);
@@ -1769,7 +1769,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByAssigneeUserId_PrevAndNext(long tasksEntryId,
 		long assigneeUserId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -1911,7 +1911,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @param assigneeUserId the assignee user ID
 	 */
-	@Override
+
 	public void removeByAssigneeUserId(long assigneeUserId) {
 		for (TasksEntry tasksEntry : findByAssigneeUserId(assigneeUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1925,7 +1925,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByAssigneeUserId(long assigneeUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_ASSIGNEEUSERID;
 
@@ -2001,7 +2001,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param resolverUserId the resolver user ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByResolverUserId(long resolverUserId) {
 		return findByResolverUserId(resolverUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -2019,7 +2019,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByResolverUserId(long resolverUserId,
 		int start, int end) {
 		return findByResolverUserId(resolverUserId, start, end, null);
@@ -2038,7 +2038,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByResolverUserId(long resolverUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByResolverUserId(resolverUserId, start, end,
@@ -2059,7 +2059,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByResolverUserId(long resolverUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2174,7 +2174,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByResolverUserId_First(long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -2204,7 +2204,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByResolverUserId_First(long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByResolverUserId(resolverUserId, 0, 1,
@@ -2225,7 +2225,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByResolverUserId_Last(long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -2255,7 +2255,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByResolverUserId_Last(long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByResolverUserId(resolverUserId);
@@ -2283,7 +2283,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByResolverUserId_PrevAndNext(long tasksEntryId,
 		long resolverUserId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -2425,7 +2425,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @param resolverUserId the resolver user ID
 	 */
-	@Override
+
 	public void removeByResolverUserId(long resolverUserId) {
 		for (TasksEntry tasksEntry : findByResolverUserId(resolverUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -2439,7 +2439,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param resolverUserId the resolver user ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByResolverUserId(long resolverUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_RESOLVERUSERID;
 
@@ -2515,7 +2515,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U(long groupId, long userId) {
 		return findByG_U(groupId, userId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -2534,7 +2534,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U(long groupId, long userId, int start,
 		int end) {
 		return findByG_U(groupId, userId, start, end, null);
@@ -2554,7 +2554,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U(long groupId, long userId, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByG_U(groupId, userId, start, end, orderByComparator, true);
@@ -2575,7 +2575,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U(long groupId, long userId, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -2696,7 +2696,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_U_First(long groupId, long userId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -2730,7 +2730,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_U_First(long groupId, long userId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByG_U(groupId, userId, 0, 1,
@@ -2752,7 +2752,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_U_Last(long groupId, long userId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -2786,7 +2786,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_U_Last(long groupId, long userId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByG_U(groupId, userId);
@@ -2815,7 +2815,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByG_U_PrevAndNext(long tasksEntryId, long groupId,
 		long userId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -2963,7 +2963,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U(long groupId, long userId) {
 		return filterFindByG_U(groupId, userId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -2982,7 +2982,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U(long groupId, long userId,
 		int start, int end) {
 		return filterFindByG_U(groupId, userId, start, end, null);
@@ -3002,7 +3002,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U(long groupId, long userId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -3097,7 +3097,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] filterFindByG_U_PrevAndNext(long tasksEntryId,
 		long groupId, long userId,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -3285,7 +3285,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @param userId the user ID
 	 */
-	@Override
+
 	public void removeByG_U(long groupId, long userId) {
 		for (TasksEntry tasksEntry : findByG_U(groupId, userId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -3300,7 +3300,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_U(long groupId, long userId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_G_U;
 
@@ -3356,7 +3356,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_U(long groupId, long userId) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_U(groupId, userId);
@@ -3434,7 +3434,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A(long groupId, long assigneeUserId) {
 		return findByG_A(groupId, assigneeUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -3453,7 +3453,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A(long groupId, long assigneeUserId,
 		int start, int end) {
 		return findByG_A(groupId, assigneeUserId, start, end, null);
@@ -3473,7 +3473,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A(long groupId, long assigneeUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByG_A(groupId, assigneeUserId, start, end,
@@ -3495,7 +3495,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A(long groupId, long assigneeUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -3616,7 +3616,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_A_First(long groupId, long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -3650,7 +3650,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_A_First(long groupId, long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByG_A(groupId, assigneeUserId, 0, 1,
@@ -3672,7 +3672,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_A_Last(long groupId, long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -3706,7 +3706,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_A_Last(long groupId, long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByG_A(groupId, assigneeUserId);
@@ -3735,7 +3735,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByG_A_PrevAndNext(long tasksEntryId, long groupId,
 		long assigneeUserId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -3883,7 +3883,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A(long groupId, long assigneeUserId) {
 		return filterFindByG_A(groupId, assigneeUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -3902,7 +3902,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A(long groupId, long assigneeUserId,
 		int start, int end) {
 		return filterFindByG_A(groupId, assigneeUserId, start, end, null);
@@ -3922,7 +3922,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A(long groupId, long assigneeUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -4018,7 +4018,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] filterFindByG_A_PrevAndNext(long tasksEntryId,
 		long groupId, long assigneeUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -4206,7 +4206,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @param assigneeUserId the assignee user ID
 	 */
-	@Override
+
 	public void removeByG_A(long groupId, long assigneeUserId) {
 		for (TasksEntry tasksEntry : findByG_A(groupId, assigneeUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -4221,7 +4221,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_A(long groupId, long assigneeUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_G_A;
 
@@ -4277,7 +4277,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_A(long groupId, long assigneeUserId) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_A(groupId, assigneeUserId);
@@ -4355,7 +4355,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param resolverUserId the resolver user ID
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_R(long groupId, long resolverUserId) {
 		return findByG_R(groupId, resolverUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -4374,7 +4374,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_R(long groupId, long resolverUserId,
 		int start, int end) {
 		return findByG_R(groupId, resolverUserId, start, end, null);
@@ -4394,7 +4394,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_R(long groupId, long resolverUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByG_R(groupId, resolverUserId, start, end,
@@ -4416,7 +4416,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_R(long groupId, long resolverUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -4537,7 +4537,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_R_First(long groupId, long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -4571,7 +4571,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_R_First(long groupId, long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByG_R(groupId, resolverUserId, 0, 1,
@@ -4593,7 +4593,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_R_Last(long groupId, long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -4627,7 +4627,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_R_Last(long groupId, long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByG_R(groupId, resolverUserId);
@@ -4656,7 +4656,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByG_R_PrevAndNext(long tasksEntryId, long groupId,
 		long resolverUserId, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -4804,7 +4804,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param resolverUserId the resolver user ID
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_R(long groupId, long resolverUserId) {
 		return filterFindByG_R(groupId, resolverUserId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -4823,7 +4823,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_R(long groupId, long resolverUserId,
 		int start, int end) {
 		return filterFindByG_R(groupId, resolverUserId, start, end, null);
@@ -4843,7 +4843,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_R(long groupId, long resolverUserId,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -4939,7 +4939,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] filterFindByG_R_PrevAndNext(long tasksEntryId,
 		long groupId, long resolverUserId,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -5127,7 +5127,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param groupId the group ID
 	 * @param resolverUserId the resolver user ID
 	 */
-	@Override
+
 	public void removeByG_R(long groupId, long resolverUserId) {
 		for (TasksEntry tasksEntry : findByG_R(groupId, resolverUserId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -5142,7 +5142,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param resolverUserId the resolver user ID
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_R(long groupId, long resolverUserId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_G_R;
 
@@ -5198,7 +5198,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param resolverUserId the resolver user ID
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_R(long groupId, long resolverUserId) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_R(groupId, resolverUserId);
@@ -5280,7 +5280,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int status) {
 		return findByU_S(userId, status, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 			null);
@@ -5299,7 +5299,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int status, int start,
 		int end) {
 		return findByU_S(userId, status, start, end, null);
@@ -5319,7 +5319,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int status, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByU_S(userId, status, start, end, orderByComparator, true);
@@ -5340,7 +5340,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int status, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -5461,7 +5461,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByU_S_First(long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -5495,7 +5495,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByU_S_First(long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByU_S(userId, status, 0, 1,
@@ -5517,7 +5517,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByU_S_Last(long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -5551,7 +5551,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByU_S_Last(long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByU_S(userId, status);
@@ -5580,7 +5580,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByU_S_PrevAndNext(long tasksEntryId, long userId,
 		int status, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -5732,7 +5732,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int[] statuses) {
 		return findByU_S(userId, statuses, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -5751,7 +5751,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int[] statuses, int start,
 		int end) {
 		return findByU_S(userId, statuses, start, end, null);
@@ -5771,7 +5771,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int[] statuses, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByU_S(userId, statuses, start, end, orderByComparator, true);
@@ -5792,7 +5792,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByU_S(long userId, int[] statuses, int start,
 		int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -5925,7 +5925,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @param status the status
 	 */
-	@Override
+
 	public void removeByU_S(long userId, int status) {
 		for (TasksEntry tasksEntry : findByU_S(userId, status,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -5940,7 +5940,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByU_S(long userId, int status) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_U_S;
 
@@ -5996,7 +5996,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByU_S(long userId, int[] statuses) {
 		if (statuses == null) {
 			statuses = new int[0];
@@ -6103,7 +6103,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int status) {
 		return findByA_S(assigneeUserId, status, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -6122,7 +6122,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int status,
 		int start, int end) {
 		return findByA_S(assigneeUserId, status, start, end, null);
@@ -6142,7 +6142,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int status,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByA_S(assigneeUserId, status, start, end, orderByComparator,
@@ -6164,7 +6164,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int status,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -6285,7 +6285,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByA_S_First(long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -6319,7 +6319,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByA_S_First(long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByA_S(assigneeUserId, status, 0, 1,
@@ -6341,7 +6341,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByA_S_Last(long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -6375,7 +6375,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByA_S_Last(long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByA_S(assigneeUserId, status);
@@ -6404,7 +6404,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByA_S_PrevAndNext(long tasksEntryId,
 		long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -6557,7 +6557,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int[] statuses) {
 		return findByA_S(assigneeUserId, statuses, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -6576,7 +6576,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int[] statuses,
 		int start, int end) {
 		return findByA_S(assigneeUserId, statuses, start, end, null);
@@ -6596,7 +6596,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int[] statuses,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByA_S(assigneeUserId, statuses, start, end,
@@ -6618,7 +6618,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByA_S(long assigneeUserId, int[] statuses,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -6752,7 +6752,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @param status the status
 	 */
-	@Override
+
 	public void removeByA_S(long assigneeUserId, int status) {
 		for (TasksEntry tasksEntry : findByA_S(assigneeUserId, status,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -6767,7 +6767,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByA_S(long assigneeUserId, int status) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_A_S;
 
@@ -6823,7 +6823,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByA_S(long assigneeUserId, int[] statuses) {
 		if (statuses == null) {
 			statuses = new int[0];
@@ -6944,7 +6944,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId, int status) {
 		return findByG_U_S(groupId, userId, status, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -6964,7 +6964,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId, int status,
 		int start, int end) {
 		return findByG_U_S(groupId, userId, status, start, end, null);
@@ -6985,7 +6985,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId, int status,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator) {
 		return findByG_U_S(groupId, userId, status, start, end,
@@ -7008,7 +7008,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId, int status,
 		int start, int end, OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -7135,7 +7135,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_U_S_First(long groupId, long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -7173,7 +7173,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_U_S_First(long groupId, long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByG_U_S(groupId, userId, status, 0, 1,
@@ -7196,7 +7196,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_U_S_Last(long groupId, long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -7234,7 +7234,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_U_S_Last(long groupId, long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByG_U_S(groupId, userId, status);
@@ -7264,7 +7264,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByG_U_S_PrevAndNext(long tasksEntryId,
 		long groupId, long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -7418,7 +7418,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U_S(long groupId, long userId,
 		int status) {
 		return filterFindByG_U_S(groupId, userId, status, QueryUtil.ALL_POS,
@@ -7439,7 +7439,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U_S(long groupId, long userId,
 		int status, int start, int end) {
 		return filterFindByG_U_S(groupId, userId, status, start, end, null);
@@ -7460,7 +7460,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U_S(long groupId, long userId,
 		int status, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -7562,7 +7562,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] filterFindByG_U_S_PrevAndNext(long tasksEntryId,
 		long groupId, long userId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -7756,7 +7756,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U_S(long groupId, long userId,
 		int[] statuses) {
 		return filterFindByG_U_S(groupId, userId, statuses, QueryUtil.ALL_POS,
@@ -7777,7 +7777,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U_S(long groupId, long userId,
 		int[] statuses, int start, int end) {
 		return filterFindByG_U_S(groupId, userId, statuses, start, end, null);
@@ -7798,7 +7798,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_U_S(long groupId, long userId,
 		int[] statuses, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -7913,7 +7913,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId,
 		int[] statuses) {
 		return findByG_U_S(groupId, userId, statuses, QueryUtil.ALL_POS,
@@ -7934,7 +7934,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId,
 		int[] statuses, int start, int end) {
 		return findByG_U_S(groupId, userId, statuses, start, end, null);
@@ -7955,7 +7955,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId,
 		int[] statuses, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -7979,7 +7979,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_U_S(long groupId, long userId,
 		int[] statuses, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator,
@@ -8122,7 +8122,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param userId the user ID
 	 * @param status the status
 	 */
-	@Override
+
 	public void removeByG_U_S(long groupId, long userId, int status) {
 		for (TasksEntry tasksEntry : findByG_U_S(groupId, userId, status,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -8138,7 +8138,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_U_S(long groupId, long userId, int status) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_G_U_S;
 
@@ -8199,7 +8199,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_U_S(long groupId, long userId, int[] statuses) {
 		if (statuses == null) {
 			statuses = new int[0];
@@ -8283,7 +8283,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_U_S(long groupId, long userId, int status) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_U_S(groupId, userId, status);
@@ -8341,7 +8341,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_U_S(long groupId, long userId, int[] statuses) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_U_S(groupId, userId, statuses);
@@ -8461,7 +8461,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int status) {
 		return findByG_A_S(groupId, assigneeUserId, status, QueryUtil.ALL_POS,
@@ -8482,7 +8482,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int status, int start, int end) {
 		return findByG_A_S(groupId, assigneeUserId, status, start, end, null);
@@ -8503,7 +8503,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int status, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -8527,7 +8527,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int status, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator,
@@ -8655,7 +8655,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the first matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_A_S_First(long groupId, long assigneeUserId,
 		int status, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -8693,7 +8693,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_A_S_First(long groupId, long assigneeUserId,
 		int status, OrderByComparator<TasksEntry> orderByComparator) {
 		List<TasksEntry> list = findByG_A_S(groupId, assigneeUserId, status, 0,
@@ -8716,7 +8716,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the last matching tasks entry
 	 * @throws NoSuchTasksEntryException if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry findByG_A_S_Last(long groupId, long assigneeUserId,
 		int status, OrderByComparator<TasksEntry> orderByComparator)
 		throws NoSuchTasksEntryException {
@@ -8754,7 +8754,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching tasks entry, or <code>null</code> if a matching tasks entry could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByG_A_S_Last(long groupId, long assigneeUserId,
 		int status, OrderByComparator<TasksEntry> orderByComparator) {
 		int count = countByG_A_S(groupId, assigneeUserId, status);
@@ -8784,7 +8784,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] findByG_A_S_PrevAndNext(long tasksEntryId,
 		long groupId, long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -8938,7 +8938,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A_S(long groupId,
 		long assigneeUserId, int status) {
 		return filterFindByG_A_S(groupId, assigneeUserId, status,
@@ -8959,7 +8959,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A_S(long groupId,
 		long assigneeUserId, int status, int start, int end) {
 		return filterFindByG_A_S(groupId, assigneeUserId, status, start, end,
@@ -8981,7 +8981,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A_S(long groupId,
 		long assigneeUserId, int status, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -9083,7 +9083,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the previous, current, and next tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry[] filterFindByG_A_S_PrevAndNext(long tasksEntryId,
 		long groupId, long assigneeUserId, int status,
 		OrderByComparator<TasksEntry> orderByComparator)
@@ -9277,7 +9277,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A_S(long groupId,
 		long assigneeUserId, int[] statuses) {
 		return filterFindByG_A_S(groupId, assigneeUserId, statuses,
@@ -9298,7 +9298,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A_S(long groupId,
 		long assigneeUserId, int[] statuses, int start, int end) {
 		return filterFindByG_A_S(groupId, assigneeUserId, statuses, start, end,
@@ -9320,7 +9320,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public List<TasksEntry> filterFindByG_A_S(long groupId,
 		long assigneeUserId, int[] statuses, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -9435,7 +9435,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int[] statuses) {
 		return findByG_A_S(groupId, assigneeUserId, statuses,
@@ -9456,7 +9456,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int[] statuses, int start, int end) {
 		return findByG_A_S(groupId, assigneeUserId, statuses, start, end, null);
@@ -9477,7 +9477,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int[] statuses, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
@@ -9501,7 +9501,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findByG_A_S(long groupId, long assigneeUserId,
 		int[] statuses, int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator,
@@ -9644,7 +9644,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param assigneeUserId the assignee user ID
 	 * @param status the status
 	 */
-	@Override
+
 	public void removeByG_A_S(long groupId, long assigneeUserId, int status) {
 		for (TasksEntry tasksEntry : findByG_A_S(groupId, assigneeUserId,
 				status, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -9660,7 +9660,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_A_S(long groupId, long assigneeUserId, int status) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_G_A_S;
 
@@ -9721,7 +9721,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the number of matching tasks entries
 	 */
-	@Override
+
 	public int countByG_A_S(long groupId, long assigneeUserId, int[] statuses) {
 		if (statuses == null) {
 			statuses = new int[0];
@@ -9805,7 +9805,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param status the status
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_A_S(long groupId, long assigneeUserId, int status) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_A_S(groupId, assigneeUserId, status);
@@ -9863,7 +9863,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param statuses the statuses
 	 * @return the number of matching tasks entries that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_A_S(long groupId, long assigneeUserId,
 		int[] statuses) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -9948,7 +9948,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @param tasksEntry the tasks entry
 	 */
-	@Override
+
 	public void cacheResult(TasksEntry tasksEntry) {
 		entityCache.putResult(TasksEntryModelImpl.ENTITY_CACHE_ENABLED,
 			TasksEntryImpl.class, tasksEntry.getPrimaryKey(), tasksEntry);
@@ -9961,7 +9961,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @param tasksEntries the tasks entries
 	 */
-	@Override
+
 	public void cacheResult(List<TasksEntry> tasksEntries) {
 		for (TasksEntry tasksEntry : tasksEntries) {
 			if (entityCache.getResult(
@@ -9982,7 +9982,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(TasksEntryImpl.class);
 
@@ -9998,7 +9998,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(TasksEntry tasksEntry) {
 		entityCache.removeResult(TasksEntryModelImpl.ENTITY_CACHE_ENABLED,
 			TasksEntryImpl.class, tasksEntry.getPrimaryKey());
@@ -10007,7 +10007,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<TasksEntry> tasksEntries) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -10024,7 +10024,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param tasksEntryId the primary key for the new tasks entry
 	 * @return the new tasks entry
 	 */
-	@Override
+
 	public TasksEntry create(long tasksEntryId) {
 		TasksEntry tasksEntry = new TasksEntryImpl();
 
@@ -10043,7 +10043,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the tasks entry that was removed
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry remove(long tasksEntryId)
 		throws NoSuchTasksEntryException {
 		return remove((Serializable)tasksEntryId);
@@ -10056,7 +10056,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the tasks entry that was removed
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry remove(Serializable primaryKey)
 		throws NoSuchTasksEntryException {
 		Session session = null;
@@ -10089,7 +10089,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 		}
 	}
 
-	@Override
+
 	protected TasksEntry removeImpl(TasksEntry tasksEntry) {
 		tasksEntry = toUnwrappedModel(tasksEntry);
 
@@ -10121,7 +10121,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 		return tasksEntry;
 	}
 
-	@Override
+
 	public TasksEntry updateImpl(TasksEntry tasksEntry) {
 		tasksEntry = toUnwrappedModel(tasksEntry);
 
@@ -10446,7 +10446,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchTasksEntryException {
 		TasksEntry tasksEntry = fetchByPrimaryKey(primaryKey);
@@ -10470,7 +10470,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @return the tasks entry
 	 * @throws NoSuchTasksEntryException if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry findByPrimaryKey(long tasksEntryId)
 		throws NoSuchTasksEntryException {
 		return findByPrimaryKey((Serializable)tasksEntryId);
@@ -10482,7 +10482,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param primaryKey the primary key of the tasks entry
 	 * @return the tasks entry, or <code>null</code> if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByPrimaryKey(Serializable primaryKey) {
 		TasksEntry tasksEntry = (TasksEntry)entityCache.getResult(TasksEntryModelImpl.ENTITY_CACHE_ENABLED,
 				TasksEntryImpl.class, primaryKey);
@@ -10528,12 +10528,12 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param tasksEntryId the primary key of the tasks entry
 	 * @return the tasks entry, or <code>null</code> if a tasks entry with the primary key could not be found
 	 */
-	@Override
+
 	public TasksEntry fetchByPrimaryKey(long tasksEntryId) {
 		return fetchByPrimaryKey((Serializable)tasksEntryId);
 	}
 
-	@Override
+
 	public Map<Serializable, TasksEntry> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -10630,7 +10630,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @return the tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -10646,7 +10646,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param end the upper bound of the range of tasks entries (not inclusive)
 	 * @return the range of tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -10663,7 +10663,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findAll(int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -10682,7 +10682,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of tasks entries
 	 */
-	@Override
+
 	public List<TasksEntry> findAll(int start, int end,
 		OrderByComparator<TasksEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -10772,7 +10772,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 * Removes all the tasks entries from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (TasksEntry tasksEntry : findAll()) {
 			remove(tasksEntry);
@@ -10784,7 +10784,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	 *
 	 * @return the number of tasks entries
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -10816,7 +10816,7 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return TasksEntryModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -10858,19 +10858,19 @@ public class TasksEntryPersistenceImpl extends BasePersistenceImpl<TasksEntry>
 	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No TasksEntry exists with the key {";
 	private static final Log _log = LogFactoryUtil.getLog(TasksEntryPersistenceImpl.class);
 	private static final TasksEntry _nullTasksEntry = new TasksEntryImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<TasksEntry> toCacheModel() {
 				return _nullTasksEntryCacheModel;
 			}
 		};
 
 	private static final CacheModel<TasksEntry> _nullTasksEntryCacheModel = new CacheModel<TasksEntry>() {
-			@Override
+
 			public TasksEntry toEntityModel() {
 				return _nullTasksEntry;
 			}
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityInterpreter.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityInterpreter.java
index 0d2d15d5920..6cdeaab2f3a 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityInterpreter.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityInterpreter.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.social;
 
 import com.liferay.portal.kernel.security.permission.ActionKeys;
@@ -34,12 +35,12 @@ import com.liferay.tasks.service.permission.TasksEntryPermission;
  */
 public class TasksActivityInterpreter extends BaseSocialActivityInterpreter {
 
-	@Override
+
 	public String[] getClassNames() {
 		return _CLASS_NAMES;
 	}
 
-	@Override
+
 	protected String getBody(
 			SocialActivity activity, ServiceContext serviceContext)
 		throws Exception {
@@ -51,19 +52,19 @@ public class TasksActivityInterpreter extends BaseSocialActivityInterpreter {
 			activity.getExtraData(), "title", tasksEntry.getTitle());
 	}
 
-	@Override
+
 	protected String getLink(
 		SocialActivity activity, ServiceContext serviceContext) {
 
 		return StringPool.BLANK;
 	}
 
-	@Override
+
 	protected ResourceBundleLoader getResourceBundleLoader() {
 		return _resourceBundleLoader;
 	}
 
-	@Override
+
 	protected Object[] getTitleArguments(
 			String groupName, SocialActivity activity, String link,
 			String title, ServiceContext serviceContext)
@@ -88,7 +89,7 @@ public class TasksActivityInterpreter extends BaseSocialActivityInterpreter {
 		return new Object[] {creatorUserName, receiverUserName};
 	}
 
-	@Override
+
 	protected String getTitlePattern(
 		String groupName, SocialActivity activity) {
 
@@ -133,7 +134,7 @@ public class TasksActivityInterpreter extends BaseSocialActivityInterpreter {
 		return StringPool.BLANK;
 	}
 
-	@Override
+
 	protected boolean hasPermissions(
 			PermissionChecker permissionChecker, SocialActivity activity,
 			String actionId, ServiceContext serviceContext)
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityKeys.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityKeys.java
index 556bf75d1cd..31b6e86fd66 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityKeys.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/social/TasksActivityKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.social;
 
 /**
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/PortletKeys.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/PortletKeys.java
index b23086d705e..771255e9712 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/PortletKeys.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.util;
 
 /**
diff --git a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/WebKeys.java b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/WebKeys.java
index 321f6cf2d28..9a0e8d6f8f5 100644
--- a/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/WebKeys.java
+++ b/portlets/tasks-portlet/docroot/WEB-INF/src/com/liferay/tasks/util/WebKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.tasks.util;
 
 /**
diff --git a/portlets/tasks-portlet/docroot/init.jsp b/portlets/tasks-portlet/docroot/init.jsp
index 98b5d036f6e..3f3756b1b07 100644
--- a/portlets/tasks-portlet/docroot/init.jsp
+++ b/portlets/tasks-portlet/docroot/init.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/asset/abstract.jsp b/portlets/tasks-portlet/docroot/tasks/asset/abstract.jsp
index cb26ea3050b..ff2cb44f6be 100644
--- a/portlets/tasks-portlet/docroot/tasks/asset/abstract.jsp
+++ b/portlets/tasks-portlet/docroot/tasks/asset/abstract.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/asset/full_content.jsp b/portlets/tasks-portlet/docroot/tasks/asset/full_content.jsp
index cb26ea3050b..ff2cb44f6be 100644
--- a/portlets/tasks-portlet/docroot/tasks/asset/full_content.jsp
+++ b/portlets/tasks-portlet/docroot/tasks/asset/full_content.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/edit_task.jsp b/portlets/tasks-portlet/docroot/tasks/edit_task.jsp
index ccdd05b4b47..f753cb3da60 100644
--- a/portlets/tasks-portlet/docroot/tasks/edit_task.jsp
+++ b/portlets/tasks-portlet/docroot/tasks/edit_task.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/tabs1.jspf b/portlets/tasks-portlet/docroot/tasks/tabs1.jspf
index 39f0d0fa266..854f389ddde 100644
--- a/portlets/tasks-portlet/docroot/tasks/tabs1.jspf
+++ b/portlets/tasks-portlet/docroot/tasks/tabs1.jspf
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%
diff --git a/portlets/tasks-portlet/docroot/tasks/view.jsp b/portlets/tasks-portlet/docroot/tasks/view.jsp
index d49fe7468ff..25d4dc53f9b 100644
--- a/portlets/tasks-portlet/docroot/tasks/view.jsp
+++ b/portlets/tasks-portlet/docroot/tasks/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/view_comments.jspf b/portlets/tasks-portlet/docroot/tasks/view_comments.jspf
index 5fb411dcc7b..d802fb64b4e 100644
--- a/portlets/tasks-portlet/docroot/tasks/view_comments.jspf
+++ b/portlets/tasks-portlet/docroot/tasks/view_comments.jspf
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <liferay-ui:discussion
diff --git a/portlets/tasks-portlet/docroot/tasks/view_task.jsp b/portlets/tasks-portlet/docroot/tasks/view_task.jsp
index 27ff7aa4794..c4216a9f22f 100644
--- a/portlets/tasks-portlet/docroot/tasks/view_task.jsp
+++ b/portlets/tasks-portlet/docroot/tasks/view_task.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/view_tasks.jsp b/portlets/tasks-portlet/docroot/tasks/view_tasks.jsp
index 86e20b11f9f..006bc509d79 100644
--- a/portlets/tasks-portlet/docroot/tasks/view_tasks.jsp
+++ b/portlets/tasks-portlet/docroot/tasks/view_tasks.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/tasks-portlet/docroot/tasks/view_tasks_filter.jspf b/portlets/tasks-portlet/docroot/tasks/view_tasks_filter.jspf
index e9accc07627..90af37fb6e5 100644
--- a/portlets/tasks-portlet/docroot/tasks/view_tasks_filter.jspf
+++ b/portlets/tasks-portlet/docroot/tasks/view_tasks_filter.jspf
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <h3><liferay-ui:message key="filter-by-tags" /></h3>
diff --git a/portlets/tasks-portlet/docroot/upcoming_tasks/view.jsp b/portlets/tasks-portlet/docroot/upcoming_tasks/view.jsp
index 0a74b8b3f38..975fe3ad92f 100644
--- a/portlets/tasks-portlet/docroot/upcoming_tasks/view.jsp
+++ b/portlets/tasks-portlet/docroot/upcoming_tasks/view.jsp
@@ -2,19 +2,20 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
+
 --%>
 
 <%@ include file="/init.jsp" %>
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/exception/NoSuchEntryException.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/exception/NoSuchEntryException.java
index 40aa0aa5307..0024fbd3894 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/exception/NoSuchEntryException.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/exception/NoSuchEntryException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.exception;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntry.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntry.java
index 455ef2ded62..96d65d54398 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntry.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model;
@@ -39,17 +39,17 @@ public interface TestBlobEntry extends TestBlobEntryModel, PersistedModel {
 	 */
 	public static final Accessor<TestBlobEntry, Long> TEST_BLOB_ENTRY_ID_ACCESSOR =
 		new Accessor<TestBlobEntry, Long>() {
-			@Override
+
 			public Long get(TestBlobEntry testBlobEntry) {
 				return testBlobEntry.getTestBlobEntryId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<TestBlobEntry> getTypeClass() {
 				return TestBlobEntry.class;
 			}
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryBlobFieldBlobModel.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryBlobFieldBlobModel.java
index 003da354df0..00ed0cb31b8 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryBlobFieldBlobModel.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryBlobFieldBlobModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryClp.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryClp.java
index 57331a7dce0..f37b76d14e4 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryClp.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model;
@@ -44,37 +44,37 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 	public TestBlobEntryClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return TestBlobEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return TestBlobEntry.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _testBlobEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setTestBlobEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _testBlobEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -88,7 +88,7 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -112,12 +112,12 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public String getUuid() {
 		return _uuid;
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		_uuid = uuid;
 
@@ -135,12 +135,12 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public long getTestBlobEntryId() {
 		return _testBlobEntryId;
 	}
 
-	@Override
+
 	public void setTestBlobEntryId(long testBlobEntryId) {
 		_testBlobEntryId = testBlobEntryId;
 
@@ -158,12 +158,12 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public Blob getBlobField() {
 		return _blobField;
 	}
 
-	@Override
+
 	public void setBlobField(Blob blobField) {
 		_blobField = blobField;
 
@@ -231,7 +231,7 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			TestBlobEntryLocalServiceUtil.addTestBlobEntry(this);
@@ -241,13 +241,13 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public TestBlobEntry toEscapedModel() {
 		return (TestBlobEntry)ProxyUtil.newProxyInstance(TestBlobEntry.class.getClassLoader(),
 			new Class[] { TestBlobEntry.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		TestBlobEntryClp clone = new TestBlobEntryClp();
 
@@ -258,7 +258,7 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(TestBlobEntry testBlobEntry) {
 		long primaryKey = testBlobEntry.getPrimaryKey();
 
@@ -273,7 +273,7 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -299,22 +299,22 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -329,7 +329,7 @@ public class TestBlobEntryClp extends BaseModelImpl<TestBlobEntry>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(13);
 
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryModel.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryModel.java
index ac4cb0600a9..4cc92ef9a16 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryModel.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model;
@@ -105,60 +105,60 @@ public interface TestBlobEntryModel extends BaseModel<TestBlobEntry> {
 	 */
 	public void setBlobField(Blob blobField);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.testblob.model.TestBlobEntry testBlobEntry);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.testblob.model.TestBlobEntry> toCacheModel();
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry toEscapedModel();
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntrySoap.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntrySoap.java
index be4ff22b4a0..c49ad15e39e 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntrySoap.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntrySoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryWrapper.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryWrapper.java
index c3cd63f3a85..4a7341a7430 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryWrapper.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/model/TestBlobEntryWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model;
@@ -45,17 +45,17 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 		_testBlobEntry = testBlobEntry;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return TestBlobEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return TestBlobEntry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -66,7 +66,7 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -87,57 +87,57 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _testBlobEntry.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _testBlobEntry.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _testBlobEntry.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _testBlobEntry.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.testblob.model.TestBlobEntry> toCacheModel() {
 		return _testBlobEntry.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry toEscapedModel() {
 		return new TestBlobEntryWrapper(_testBlobEntry.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry toUnescapedModel() {
 		return new TestBlobEntryWrapper(_testBlobEntry.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		return _testBlobEntry.compareTo(testBlobEntry);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _testBlobEntry.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _testBlobEntry.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new TestBlobEntryWrapper((TestBlobEntry)_testBlobEntry.clone());
 	}
@@ -147,17 +147,17 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @return the uuid of this test blob entry
 	*/
-	@Override
+
 	public java.lang.String getUuid() {
 		return _testBlobEntry.getUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _testBlobEntry.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _testBlobEntry.toXmlString();
 	}
@@ -167,7 +167,7 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @return the blob field of this test blob entry
 	*/
-	@Override
+
 	public Blob getBlobField() {
 		return _testBlobEntry.getBlobField();
 	}
@@ -177,7 +177,7 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @return the primary key of this test blob entry
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _testBlobEntry.getPrimaryKey();
 	}
@@ -187,12 +187,12 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @return the test blob entry ID of this test blob entry
 	*/
-	@Override
+
 	public long getTestBlobEntryId() {
 		return _testBlobEntry.getTestBlobEntryId();
 	}
 
-	@Override
+
 	public void persist() {
 		_testBlobEntry.persist();
 	}
@@ -202,33 +202,33 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @param blobField the blob field of this test blob entry
 	*/
-	@Override
+
 	public void setBlobField(Blob blobField) {
 		_testBlobEntry.setBlobField(blobField);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_testBlobEntry.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_testBlobEntry.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_testBlobEntry.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_testBlobEntry.setExpandoBridgeAttributes(serviceContext);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_testBlobEntry.setNew(n);
 	}
@@ -238,12 +238,12 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @param primaryKey the primary key of this test blob entry
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_testBlobEntry.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_testBlobEntry.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -253,7 +253,7 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @param testBlobEntryId the test blob entry ID of this test blob entry
 	*/
-	@Override
+
 	public void setTestBlobEntryId(long testBlobEntryId) {
 		_testBlobEntry.setTestBlobEntryId(testBlobEntryId);
 	}
@@ -263,12 +263,12 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 	*
 	* @param uuid the uuid of this test blob entry
 	*/
-	@Override
+
 	public void setUuid(java.lang.String uuid) {
 		_testBlobEntry.setUuid(uuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -287,22 +287,22 @@ public class TestBlobEntryWrapper implements TestBlobEntry,
 		return false;
 	}
 
-	@Override
+
 	public TestBlobEntry getWrappedModel() {
 		return _testBlobEntry;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _testBlobEntry.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _testBlobEntry.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_testBlobEntry.resetOriginalValues();
 	}
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/ClpSerializer.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/ClpSerializer.java
index 69794a45bef..ea11783013a 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/ClpSerializer.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalService.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalService.java
index a9f02bbc31d..be07d68894e 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalService.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service;
@@ -73,11 +73,11 @@ public interface TestBlobEntryLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -154,7 +154,7 @@ public interface TestBlobEntryLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getTestBlobEntriesCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceClp.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceClp.java
index fbf58d3f661..00046fb6684 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceClp.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service;
@@ -133,7 +133,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -156,7 +156,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -179,7 +179,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -202,7 +202,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -232,7 +232,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -262,7 +262,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry addTestBlobEntry(
 		com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		Object returnObj = null;
@@ -287,7 +287,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry createTestBlobEntry(
 		long testBlobEntryId) {
 		Object returnObj = null;
@@ -311,7 +311,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry deleteTestBlobEntry(
 		com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		Object returnObj = null;
@@ -336,7 +336,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry deleteTestBlobEntry(
 		long testBlobEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -365,7 +365,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry fetchTestBlobEntry(
 		long testBlobEntryId) {
 		Object returnObj = null;
@@ -389,7 +389,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry getTestBlobEntry(
 		long testBlobEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -418,7 +418,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry updateTestBlobEntry(
 		com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		Object returnObj = null;
@@ -443,7 +443,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntryBlobFieldBlobModel getBlobFieldBlobModel(
 		java.io.Serializable primaryKey) {
 		Object returnObj = null;
@@ -468,7 +468,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (com.liferay.testblob.model.TestBlobEntryBlobFieldBlobModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getTestBlobEntriesCount() {
 		Object returnObj = null;
 
@@ -491,14 +491,14 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -521,7 +521,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -546,7 +546,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -578,7 +578,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -613,7 +613,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.testblob.model.TestBlobEntry> getTestBlobEntries(
 		int start, int end) {
 		Object returnObj = null;
@@ -637,7 +637,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return (java.util.List<com.liferay.testblob.model.TestBlobEntry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -662,7 +662,7 @@ public class TestBlobEntryLocalServiceClp implements TestBlobEntryLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceUtil.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceUtil.java
index 5f22a469714..7e489a13d4b 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceUtil.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceWrapper.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceWrapper.java
index dff62f9a681..3f52bf53b18 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceWrapper.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/TestBlobEntryLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service;
@@ -34,17 +34,17 @@ public class TestBlobEntryLocalServiceWrapper
 		_testBlobEntryLocalService = testBlobEntryLocalService;
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _testBlobEntryLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _testBlobEntryLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _testBlobEntryLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -52,14 +52,14 @@ public class TestBlobEntryLocalServiceWrapper
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _testBlobEntryLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -72,7 +72,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param testBlobEntry the test blob entry
 	* @return the test blob entry that was added
 	*/
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry addTestBlobEntry(
 		com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		return _testBlobEntryLocalService.addTestBlobEntry(testBlobEntry);
@@ -84,7 +84,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param testBlobEntryId the primary key for the new test blob entry
 	* @return the new test blob entry
 	*/
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry createTestBlobEntry(
 		long testBlobEntryId) {
 		return _testBlobEntryLocalService.createTestBlobEntry(testBlobEntryId);
@@ -96,7 +96,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param testBlobEntry the test blob entry
 	* @return the test blob entry that was removed
 	*/
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry deleteTestBlobEntry(
 		com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		return _testBlobEntryLocalService.deleteTestBlobEntry(testBlobEntry);
@@ -109,14 +109,14 @@ public class TestBlobEntryLocalServiceWrapper
 	* @return the test blob entry that was removed
 	* @throws PortalException if a test blob entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry deleteTestBlobEntry(
 		long testBlobEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _testBlobEntryLocalService.deleteTestBlobEntry(testBlobEntryId);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry fetchTestBlobEntry(
 		long testBlobEntryId) {
 		return _testBlobEntryLocalService.fetchTestBlobEntry(testBlobEntryId);
@@ -129,7 +129,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @return the test blob entry
 	* @throws PortalException if a test blob entry with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry getTestBlobEntry(
 		long testBlobEntryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -142,13 +142,13 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param testBlobEntry the test blob entry
 	* @return the test blob entry that was updated
 	*/
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntry updateTestBlobEntry(
 		com.liferay.testblob.model.TestBlobEntry testBlobEntry) {
 		return _testBlobEntryLocalService.updateTestBlobEntry(testBlobEntry);
 	}
 
-	@Override
+
 	public com.liferay.testblob.model.TestBlobEntryBlobFieldBlobModel getBlobFieldBlobModel(
 		java.io.Serializable primaryKey) {
 		return _testBlobEntryLocalService.getBlobFieldBlobModel(primaryKey);
@@ -159,12 +159,12 @@ public class TestBlobEntryLocalServiceWrapper
 	*
 	* @return the number of test blob entries
 	*/
-	@Override
+
 	public int getTestBlobEntriesCount() {
 		return _testBlobEntryLocalService.getTestBlobEntriesCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -177,7 +177,7 @@ public class TestBlobEntryLocalServiceWrapper
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _testBlobEntryLocalService.getOSGiServiceIdentifier();
 	}
@@ -188,7 +188,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _testBlobEntryLocalService.dynamicQuery(dynamicQuery);
@@ -206,7 +206,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -226,7 +226,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -246,7 +246,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param end the upper bound of the range of test blob entries (not inclusive)
 	* @return the range of test blob entries
 	*/
-	@Override
+
 	public java.util.List<com.liferay.testblob.model.TestBlobEntry> getTestBlobEntries(
 		int start, int end) {
 		return _testBlobEntryLocalService.getTestBlobEntries(start, end);
@@ -258,7 +258,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _testBlobEntryLocalService.dynamicQueryCount(dynamicQuery);
@@ -271,7 +271,7 @@ public class TestBlobEntryLocalServiceWrapper
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -279,12 +279,12 @@ public class TestBlobEntryLocalServiceWrapper
 			projection);
 	}
 
-	@Override
+
 	public TestBlobEntryLocalService getWrappedService() {
 		return _testBlobEntryLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		TestBlobEntryLocalService testBlobEntryLocalService) {
 		_testBlobEntryLocalService = testBlobEntryLocalService;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/messaging/ClpMessageListener.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/messaging/ClpMessageListener.java
index a8a5227b69e..0a9bf1f933d 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/messaging/ClpMessageListener.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryPersistence.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryPersistence.java
index a40e5626e82..35e207e3464 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryPersistence.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.persistence;
@@ -225,7 +225,7 @@ public interface TestBlobEntryPersistence extends BasePersistence<TestBlobEntry>
 	*/
 	public TestBlobEntry fetchByPrimaryKey(long testBlobEntryId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, TestBlobEntry> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -293,6 +293,6 @@ public interface TestBlobEntryPersistence extends BasePersistence<TestBlobEntry>
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryUtil.java b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryUtil.java
index 15ec019fdcf..8b590ffd084 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryUtil.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/service/com/liferay/testblob/service/persistence/TestBlobEntryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.persistence;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryBaseImpl.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryBaseImpl.java
index 78caf0bf3fd..c758fd3318f 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryBaseImpl.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model.impl;
@@ -39,7 +39,7 @@ public abstract class TestBlobEntryBaseImpl extends TestBlobEntryModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a test blob entry model instance should use the {@link TestBlobEntry} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			TestBlobEntryLocalServiceUtil.addTestBlobEntry(this);
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryCacheModel.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryCacheModel.java
index 88002310250..6729bb0ed69 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryCacheModel.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model.impl;
@@ -38,7 +38,7 @@ import java.io.ObjectOutput;
 @ProviderType
 public class TestBlobEntryCacheModel implements CacheModel<TestBlobEntry>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -57,12 +57,12 @@ public class TestBlobEntryCacheModel implements CacheModel<TestBlobEntry>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, testBlobEntryId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(5);
 
@@ -74,7 +74,7 @@ public class TestBlobEntryCacheModel implements CacheModel<TestBlobEntry>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public TestBlobEntry toEntityModel() {
 		TestBlobEntryImpl testBlobEntryImpl = new TestBlobEntryImpl();
 
@@ -92,14 +92,14 @@ public class TestBlobEntryCacheModel implements CacheModel<TestBlobEntry>,
 		return testBlobEntryImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		uuid = objectInput.readUTF();
 
 		testBlobEntryId = objectInput.readLong();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		if (uuid == null) {
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryImpl.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryImpl.java
index 0579f0aaa72..397be27fd16 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryImpl.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model.impl;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryModelImpl.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryModelImpl.java
index c31996dfa26..bc5e828c349 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryModelImpl.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/model/impl/TestBlobEntryModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.model.impl;
@@ -100,37 +100,37 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 	public TestBlobEntryModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _testBlobEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setTestBlobEntryId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _testBlobEntryId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return TestBlobEntry.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return TestBlobEntry.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -144,7 +144,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -165,7 +165,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public String getUuid() {
 		if (_uuid == null) {
 			return StringPool.BLANK;
@@ -175,7 +175,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		if (_originalUuid == null) {
 			_originalUuid = _uuid;
@@ -188,17 +188,17 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return GetterUtil.getString(_originalUuid);
 	}
 
-	@Override
+
 	public long getTestBlobEntryId() {
 		return _testBlobEntryId;
 	}
 
-	@Override
+
 	public void setTestBlobEntryId(long testBlobEntryId) {
 		_testBlobEntryId = testBlobEntryId;
 	}
 
-	@Override
+
 	public Blob getBlobField() {
 		if (_blobFieldBlobModel == null) {
 			try {
@@ -217,7 +217,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return blob;
 	}
 
-	@Override
+
 	public void setBlobField(Blob blobField) {
 		if (_blobFieldBlobModel == null) {
 			_blobFieldBlobModel = new TestBlobEntryBlobFieldBlobModel(getPrimaryKey(),
@@ -232,20 +232,20 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			TestBlobEntry.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public TestBlobEntry toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (TestBlobEntry)ProxyUtil.newProxyInstance(_classLoader,
@@ -255,7 +255,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		TestBlobEntryImpl testBlobEntryImpl = new TestBlobEntryImpl();
 
@@ -267,7 +267,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return testBlobEntryImpl;
 	}
 
-	@Override
+
 	public int compareTo(TestBlobEntry testBlobEntry) {
 		long primaryKey = testBlobEntry.getPrimaryKey();
 
@@ -282,7 +282,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -304,22 +304,22 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		TestBlobEntryModelImpl testBlobEntryModelImpl = this;
 
@@ -330,7 +330,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		testBlobEntryModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<TestBlobEntry> toCacheModel() {
 		TestBlobEntryCacheModel testBlobEntryCacheModel = new TestBlobEntryCacheModel();
 
@@ -347,7 +347,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return testBlobEntryCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(7);
 
@@ -359,7 +359,7 @@ public class TestBlobEntryModelImpl extends BaseModelImpl<TestBlobEntry>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(13);
 
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceBaseImpl.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceBaseImpl.java
index c26d01c5475..ba9d36fc7dc 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceBaseImpl.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.base;
@@ -81,7 +81,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @return the test blob entry that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public TestBlobEntry addTestBlobEntry(TestBlobEntry testBlobEntry) {
 		testBlobEntry.setNew(true);
 
@@ -94,7 +94,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param testBlobEntryId the primary key for the new test blob entry
 	 * @return the new test blob entry
 	 */
-	@Override
+
 	public TestBlobEntry createTestBlobEntry(long testBlobEntryId) {
 		return testBlobEntryPersistence.create(testBlobEntryId);
 	}
@@ -107,7 +107,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @throws PortalException if a test blob entry with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public TestBlobEntry deleteTestBlobEntry(long testBlobEntryId)
 		throws PortalException {
 		return testBlobEntryPersistence.remove(testBlobEntryId);
@@ -120,12 +120,12 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @return the test blob entry that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public TestBlobEntry deleteTestBlobEntry(TestBlobEntry testBlobEntry) {
 		return testBlobEntryPersistence.remove(testBlobEntry);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -139,7 +139,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return testBlobEntryPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -156,7 +156,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return testBlobEntryPersistence.findWithDynamicQuery(dynamicQuery,
@@ -176,7 +176,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return testBlobEntryPersistence.findWithDynamicQuery(dynamicQuery,
@@ -189,7 +189,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return testBlobEntryPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -201,14 +201,14 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return testBlobEntryPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public TestBlobEntry fetchTestBlobEntry(long testBlobEntryId) {
 		return testBlobEntryPersistence.fetchByPrimaryKey(testBlobEntryId);
 	}
@@ -220,13 +220,13 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @return the test blob entry
 	 * @throws PortalException if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry getTestBlobEntry(long testBlobEntryId)
 		throws PortalException {
 		return testBlobEntryPersistence.findByPrimaryKey(testBlobEntryId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -239,7 +239,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -265,13 +265,13 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return testBlobEntryLocalService.deleteTestBlobEntry((TestBlobEntry)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return testBlobEntryPersistence.findByPrimaryKey(primaryKeyObj);
@@ -288,7 +288,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @param end the upper bound of the range of test blob entries (not inclusive)
 	 * @return the range of test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> getTestBlobEntries(int start, int end) {
 		return testBlobEntryPersistence.findAll(start, end);
 	}
@@ -298,7 +298,7 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 *
 	 * @return the number of test blob entries
 	 */
-	@Override
+
 	public int getTestBlobEntriesCount() {
 		return testBlobEntryPersistence.countAll();
 	}
@@ -310,12 +310,12 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 * @return the test blob entry that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public TestBlobEntry updateTestBlobEntry(TestBlobEntry testBlobEntry) {
 		return testBlobEntryPersistence.update(testBlobEntry);
 	}
 
-	@Override
+
 	public TestBlobEntryBlobFieldBlobModel getBlobFieldBlobModel(
 		Serializable primaryKey) {
 		Session session = null;
@@ -504,12 +504,12 @@ public abstract class TestBlobEntryLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return TestBlobEntryLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceClpInvoker.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceClpInvoker.java
index 63dad2f66d7..c6ec3a14bcb 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceClpInvoker.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/base/TestBlobEntryLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.base;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/impl/TestBlobEntryLocalServiceImpl.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/impl/TestBlobEntryLocalServiceImpl.java
index 827a5d5b200..450eb77dee8 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/impl/TestBlobEntryLocalServiceImpl.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/impl/TestBlobEntryLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.impl;
diff --git a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/persistence/impl/TestBlobEntryPersistenceImpl.java b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/persistence/impl/TestBlobEntryPersistenceImpl.java
index 846eb36d254..210ea1f402d 100644
--- a/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/persistence/impl/TestBlobEntryPersistenceImpl.java
+++ b/portlets/test-blob-portlet/docroot/WEB-INF/src/com/liferay/testblob/service/persistence/impl/TestBlobEntryPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testblob.service.persistence.impl;
@@ -114,7 +114,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param uuid the uuid
 	 * @return the matching test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findByUuid(String uuid) {
 		return findByUuid(uuid, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -131,7 +131,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param end the upper bound of the range of test blob entries (not inclusive)
 	 * @return the range of matching test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findByUuid(String uuid, int start, int end) {
 		return findByUuid(uuid, start, end, null);
 	}
@@ -149,7 +149,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findByUuid(String uuid, int start, int end,
 		OrderByComparator<TestBlobEntry> orderByComparator) {
 		return findByUuid(uuid, start, end, orderByComparator, true);
@@ -169,7 +169,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findByUuid(String uuid, int start, int end,
 		OrderByComparator<TestBlobEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -294,7 +294,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the first matching test blob entry
 	 * @throws NoSuchEntryException if a matching test blob entry could not be found
 	 */
-	@Override
+
 	public TestBlobEntry findByUuid_First(String uuid,
 		OrderByComparator<TestBlobEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -323,7 +323,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching test blob entry, or <code>null</code> if a matching test blob entry could not be found
 	 */
-	@Override
+
 	public TestBlobEntry fetchByUuid_First(String uuid,
 		OrderByComparator<TestBlobEntry> orderByComparator) {
 		List<TestBlobEntry> list = findByUuid(uuid, 0, 1, orderByComparator);
@@ -343,7 +343,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the last matching test blob entry
 	 * @throws NoSuchEntryException if a matching test blob entry could not be found
 	 */
-	@Override
+
 	public TestBlobEntry findByUuid_Last(String uuid,
 		OrderByComparator<TestBlobEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -372,7 +372,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching test blob entry, or <code>null</code> if a matching test blob entry could not be found
 	 */
-	@Override
+
 	public TestBlobEntry fetchByUuid_Last(String uuid,
 		OrderByComparator<TestBlobEntry> orderByComparator) {
 		int count = countByUuid(uuid);
@@ -400,7 +400,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the previous, current, and next test blob entry
 	 * @throws NoSuchEntryException if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry[] findByUuid_PrevAndNext(long testBlobEntryId,
 		String uuid, OrderByComparator<TestBlobEntry> orderByComparator)
 		throws NoSuchEntryException {
@@ -556,7 +556,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 *
 	 * @param uuid the uuid
 	 */
-	@Override
+
 	public void removeByUuid(String uuid) {
 		for (TestBlobEntry testBlobEntry : findByUuid(uuid, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -570,7 +570,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param uuid the uuid
 	 * @return the number of matching test blob entries
 	 */
-	@Override
+
 	public int countByUuid(String uuid) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID;
 
@@ -642,7 +642,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 *
 	 * @param testBlobEntry the test blob entry
 	 */
-	@Override
+
 	public void cacheResult(TestBlobEntry testBlobEntry) {
 		entityCache.putResult(TestBlobEntryModelImpl.ENTITY_CACHE_ENABLED,
 			TestBlobEntryImpl.class, testBlobEntry.getPrimaryKey(),
@@ -656,7 +656,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 *
 	 * @param testBlobEntries the test blob entries
 	 */
-	@Override
+
 	public void cacheResult(List<TestBlobEntry> testBlobEntries) {
 		for (TestBlobEntry testBlobEntry : testBlobEntries) {
 			if (entityCache.getResult(
@@ -677,7 +677,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(TestBlobEntryImpl.class);
 
@@ -693,7 +693,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(TestBlobEntry testBlobEntry) {
 		entityCache.removeResult(TestBlobEntryModelImpl.ENTITY_CACHE_ENABLED,
 			TestBlobEntryImpl.class, testBlobEntry.getPrimaryKey());
@@ -702,7 +702,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<TestBlobEntry> testBlobEntries) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -719,7 +719,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param testBlobEntryId the primary key for the new test blob entry
 	 * @return the new test blob entry
 	 */
-	@Override
+
 	public TestBlobEntry create(long testBlobEntryId) {
 		TestBlobEntry testBlobEntry = new TestBlobEntryImpl();
 
@@ -740,7 +740,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the test blob entry that was removed
 	 * @throws NoSuchEntryException if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry remove(long testBlobEntryId)
 		throws NoSuchEntryException {
 		return remove((Serializable)testBlobEntryId);
@@ -753,7 +753,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the test blob entry that was removed
 	 * @throws NoSuchEntryException if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry remove(Serializable primaryKey)
 		throws NoSuchEntryException {
 		Session session = null;
@@ -786,7 +786,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 		}
 	}
 
-	@Override
+
 	protected TestBlobEntry removeImpl(TestBlobEntry testBlobEntry) {
 		testBlobEntry = toUnwrappedModel(testBlobEntry);
 
@@ -818,7 +818,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 		return testBlobEntry;
 	}
 
-	@Override
+
 	public TestBlobEntry updateImpl(TestBlobEntry testBlobEntry) {
 		testBlobEntry = toUnwrappedModel(testBlobEntry);
 
@@ -915,7 +915,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the test blob entry
 	 * @throws NoSuchEntryException if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchEntryException {
 		TestBlobEntry testBlobEntry = fetchByPrimaryKey(primaryKey);
@@ -939,7 +939,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @return the test blob entry
 	 * @throws NoSuchEntryException if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry findByPrimaryKey(long testBlobEntryId)
 		throws NoSuchEntryException {
 		return findByPrimaryKey((Serializable)testBlobEntryId);
@@ -951,7 +951,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param primaryKey the primary key of the test blob entry
 	 * @return the test blob entry, or <code>null</code> if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry fetchByPrimaryKey(Serializable primaryKey) {
 		TestBlobEntry testBlobEntry = (TestBlobEntry)entityCache.getResult(TestBlobEntryModelImpl.ENTITY_CACHE_ENABLED,
 				TestBlobEntryImpl.class, primaryKey);
@@ -997,12 +997,12 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param testBlobEntryId the primary key of the test blob entry
 	 * @return the test blob entry, or <code>null</code> if a test blob entry with the primary key could not be found
 	 */
-	@Override
+
 	public TestBlobEntry fetchByPrimaryKey(long testBlobEntryId) {
 		return fetchByPrimaryKey((Serializable)testBlobEntryId);
 	}
 
-	@Override
+
 	public Map<Serializable, TestBlobEntry> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1099,7 +1099,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 *
 	 * @return the test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1115,7 +1115,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param end the upper bound of the range of test blob entries (not inclusive)
 	 * @return the range of test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1132,7 +1132,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findAll(int start, int end,
 		OrderByComparator<TestBlobEntry> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1151,7 +1151,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of test blob entries
 	 */
-	@Override
+
 	public List<TestBlobEntry> findAll(int start, int end,
 		OrderByComparator<TestBlobEntry> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1241,7 +1241,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 * Removes all the test blob entries from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (TestBlobEntry testBlobEntry : findAll()) {
 			remove(testBlobEntry);
@@ -1253,7 +1253,7 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 	 *
 	 * @return the number of test blob entries
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1285,12 +1285,12 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return TestBlobEntryModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1323,19 +1323,19 @@ public class TestBlobEntryPersistenceImpl extends BasePersistenceImpl<TestBlobEn
 				"uuid"
 			});
 	private static final TestBlobEntry _nullTestBlobEntry = new TestBlobEntryImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<TestBlobEntry> toCacheModel() {
 				return _nullTestBlobEntryCacheModel;
 			}
 		};
 
 	private static final CacheModel<TestBlobEntry> _nullTestBlobEntryCacheModel = new CacheModel<TestBlobEntry>() {
-			@Override
+
 			public TestBlobEntry toEntityModel() {
 				return _nullTestBlobEntry;
 			}
diff --git a/portlets/test-blob-portlet/docroot/init.jsp b/portlets/test-blob-portlet/docroot/init.jsp
index c90f09fb5a0..6e843185bad 100644
--- a/portlets/test-blob-portlet/docroot/init.jsp
+++ b/portlets/test-blob-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-blob-portlet/docroot/view.jsp b/portlets/test-blob-portlet/docroot/view.jsp
index 6c9055a4bc9..5d7b86ef0e2 100644
--- a/portlets/test-blob-portlet/docroot/view.jsp
+++ b/portlets/test-blob-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-cache-configuration-portlet/docroot/init.jsp b/portlets/test-cache-configuration-portlet/docroot/init.jsp
index 595521c9808..8ed69489e8c 100644
--- a/portlets/test-cache-configuration-portlet/docroot/init.jsp
+++ b/portlets/test-cache-configuration-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-cache-configuration-portlet/docroot/view.jsp b/portlets/test-cache-configuration-portlet/docroot/view.jsp
index e28eb766017..d06f8b0069c 100644
--- a/portlets/test-cache-configuration-portlet/docroot/view.jsp
+++ b/portlets/test-cache-configuration-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-dependency-able-portlet/docroot/view.jsp b/portlets/test-dependency-able-portlet/docroot/view.jsp
index 2d0eac4a556..f933b84b7ee 100644
--- a/portlets/test-dependency-able-portlet/docroot/view.jsp
+++ b/portlets/test-dependency-able-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-dependency-baker-portlet/docroot/view.jsp b/portlets/test-dependency-baker-portlet/docroot/view.jsp
index fd0f738ceae..a2d3db6e2c0 100644
--- a/portlets/test-dependency-baker-portlet/docroot/view.jsp
+++ b/portlets/test-dependency-baker-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-dependency-charlie-portlet/docroot/view.jsp b/portlets/test-dependency-charlie-portlet/docroot/view.jsp
index 18a2f5b37c9..7c7ddca0271 100644
--- a/portlets/test-dependency-charlie-portlet/docroot/view.jsp
+++ b/portlets/test-dependency-charlie-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-dependency-dog-portlet/docroot/view.jsp b/portlets/test-dependency-dog-portlet/docroot/view.jsp
index 2dd3777aa72..62fa07b533d 100644
--- a/portlets/test-dependency-dog-portlet/docroot/view.jsp
+++ b/portlets/test-dependency-dog-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-dependency-easy-portlet/docroot/view.jsp b/portlets/test-dependency-easy-portlet/docroot/view.jsp
index 1aab9dec826..12a432d1781 100644
--- a/portlets/test-dependency-easy-portlet/docroot/view.jsp
+++ b/portlets/test-dependency-easy-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-dependency-fox-portlet/docroot/view.jsp b/portlets/test-dependency-fox-portlet/docroot/view.jsp
index 0fdda0b9538..bebab6d85a8 100644
--- a/portlets/test-dependency-fox-portlet/docroot/view.jsp
+++ b/portlets/test-dependency-fox-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventConsumer.java b/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventConsumer.java
index 4b818e73d37..746a6175b70 100644
--- a/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventConsumer.java
+++ b/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventConsumer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testevent.portlet;
@@ -32,7 +32,7 @@ import javax.portlet.RenderResponse;
  */
 public class EventConsumer extends GenericPortlet {
 
-	@Override
+
 	public void doView(RenderRequest request, RenderResponse response)
 		throws IOException {
 
@@ -52,7 +52,7 @@ public class EventConsumer extends GenericPortlet {
 		printWriter.close();
 	}
 
-	@Override
+
 	public void processEvent(
 		EventRequest eventRequest, EventResponse eventResponse) {
 
diff --git a/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventProducer.java b/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventProducer.java
index 89e4d5bb2a0..93611e66b6d 100644
--- a/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventProducer.java
+++ b/portlets/test-event-portlet/docroot/WEB-INF/src/com/liferay/testevent/portlet/EventProducer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testevent.portlet;
@@ -34,7 +34,7 @@ import javax.xml.namespace.QName;
  */
 public class EventProducer extends GenericPortlet {
 
-	@Override
+
 	public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException {
@@ -50,7 +50,7 @@ public class EventProducer extends GenericPortlet {
 		printWriter.close();
 	}
 
-	@Override
+
 	public void processAction(
 		ActionRequest actionRequest, ActionResponse actionResponse) {
 
diff --git a/portlets/test-hook-portlet/docroot/META-INF/custom_jsps/html/portal/setup_wizard.jsp b/portlets/test-hook-portlet/docroot/META-INF/custom_jsps/html/portal/setup_wizard.jsp
index 41aebb45900..84ba1872676 100644
--- a/portlets/test-hook-portlet/docroot/META-INF/custom_jsps/html/portal/setup_wizard.jsp
+++ b/portlets/test-hook-portlet/docroot/META-INF/custom_jsps/html/portal/setup_wizard.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/events/StartupAction.java b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/events/StartupAction.java
index 30e82ecae08..a411d909a8a 100644
--- a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/events/StartupAction.java
+++ b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/events/StartupAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhook.hook.events;
@@ -25,7 +25,7 @@ import com.liferay.testhook.util.TestHookUtil;
  */
 public class StartupAction extends SimpleAction {
 
-	@Override
+
 	public void run(String[] ids) throws ActionException {
 		try {
 			FileUtil.write(
diff --git a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/model/impl/TestHookUserImpl.java b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/model/impl/TestHookUserImpl.java
index df3b3bb8e26..23a39a2e78b 100644
--- a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/model/impl/TestHookUserImpl.java
+++ b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/model/impl/TestHookUserImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhook.hook.model.impl;
diff --git a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/service/impl/TestHookUserLocalServiceImpl.java b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/service/impl/TestHookUserLocalServiceImpl.java
index 99f97bff2e6..5da0a6b4f53 100644
--- a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/service/impl/TestHookUserLocalServiceImpl.java
+++ b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/service/impl/TestHookUserLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhook.hook.service.impl;
@@ -29,7 +29,7 @@ public class TestHookUserLocalServiceImpl extends UserLocalServiceWrapper {
 		super(userLocalService);
 	}
 
-	@Override
+
 	public User getUserByEmailAddress(long companyId, String emailAddress)
 		throws PortalException {
 
@@ -42,7 +42,7 @@ public class TestHookUserLocalServiceImpl extends UserLocalServiceWrapper {
 		return new TestHookUserImpl(user);
 	}
 
-	@Override
+
 	public User getUserById(long userId) throws PortalException {
 		System.out.println(
 			"Called TestHookUserLocalServiceImpl.getUserById(" + userId + ")");
diff --git a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_0_0.java b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_0_0.java
index edbee77443b..9686f10cc41 100644
--- a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_0_0.java
+++ b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_0_0.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhook.hook.upgrade;
@@ -23,12 +23,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_0_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 100;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		if (_log.isInfoEnabled()) {
 			_log.info("Running " + UpgradeProcess_1_0_0.class.getName());
diff --git a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_1_0.java b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_1_0.java
index 668ed30d084..621addd036a 100644
--- a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_1_0.java
+++ b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/hook/upgrade/UpgradeProcess_1_1_0.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhook.hook.upgrade;
@@ -23,12 +23,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeProcess;
  */
 public class UpgradeProcess_1_1_0 extends UpgradeProcess {
 
-	@Override
+
 	public int getThreshold() {
 		return 110;
 	}
 
-	@Override
+
 	protected void doUpgrade() throws Exception {
 		if (_log.isInfoEnabled()) {
 			_log.info("Running " + UpgradeProcess_1_1_0.class.getName());
diff --git a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/util/TestHookUtil.java b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/util/TestHookUtil.java
index de88154140b..f30057c7311 100644
--- a/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/util/TestHookUtil.java
+++ b/portlets/test-hook-portlet/docroot/WEB-INF/src/com/liferay/testhook/util/TestHookUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhook.util;
diff --git a/portlets/test-hook-portlet/docroot/init.jsp b/portlets/test-hook-portlet/docroot/init.jsp
index 38dfd62a1d1..0f74cf0e9e4 100644
--- a/portlets/test-hook-portlet/docroot/init.jsp
+++ b/portlets/test-hook-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-hook-portlet/docroot/view.jsp b/portlets/test-hook-portlet/docroot/view.jsp
index a79e75e8013..f43c038f5b1 100644
--- a/portlets/test-hook-portlet/docroot/view.jsp
+++ b/portlets/test-hook-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-http-client-portlet/docroot/WEB-INF/src/com/liferay/testhttpclient/servlet/TestHTTPClientServlet.java b/portlets/test-http-client-portlet/docroot/WEB-INF/src/com/liferay/testhttpclient/servlet/TestHTTPClientServlet.java
index bd1212df9de..ebda73253dd 100644
--- a/portlets/test-http-client-portlet/docroot/WEB-INF/src/com/liferay/testhttpclient/servlet/TestHTTPClientServlet.java
+++ b/portlets/test-http-client-portlet/docroot/WEB-INF/src/com/liferay/testhttpclient/servlet/TestHTTPClientServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testhttpclient.servlet;
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class TestHTTPClientServlet extends HttpServlet {
 
-	@Override
+
 	public void service(
 			HttpServletRequest request, HttpServletResponse response)
 		throws IOException {
diff --git a/portlets/test-http-client-portlet/docroot/init.jsp b/portlets/test-http-client-portlet/docroot/init.jsp
index 71c37ad2c0e..ce51bfbba59 100644
--- a/portlets/test-http-client-portlet/docroot/init.jsp
+++ b/portlets/test-http-client-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-http-client-portlet/docroot/view.jsp b/portlets/test-http-client-portlet/docroot/view.jsp
index a3a338ce22c..798e543492e 100644
--- a/portlets/test-http-client-portlet/docroot/view.jsp
+++ b/portlets/test-http-client-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-jsr-286-plt-26-6-portlet/docroot/action_url.jsp b/portlets/test-jsr-286-plt-26-6-portlet/docroot/action_url.jsp
index 4c48ca1f85f..8ac91bf6808 100644
--- a/portlets/test-jsr-286-plt-26-6-portlet/docroot/action_url.jsp
+++ b/portlets/test-jsr-286-plt-26-6-portlet/docroot/action_url.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-jsr-286-plt-26-6-portlet/docroot/init.jsp b/portlets/test-jsr-286-plt-26-6-portlet/docroot/init.jsp
index fe90954f442..7256425a430 100644
--- a/portlets/test-jsr-286-plt-26-6-portlet/docroot/init.jsp
+++ b/portlets/test-jsr-286-plt-26-6-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-jsr-286-plt-26-6-portlet/docroot/portlet_url.jspf b/portlets/test-jsr-286-plt-26-6-portlet/docroot/portlet_url.jspf
index 46208ca4f28..6b2960fee28 100644
--- a/portlets/test-jsr-286-plt-26-6-portlet/docroot/portlet_url.jspf
+++ b/portlets/test-jsr-286-plt-26-6-portlet/docroot/portlet_url.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-jsr-286-plt-26-6-portlet/docroot/render_url.jsp b/portlets/test-jsr-286-plt-26-6-portlet/docroot/render_url.jsp
index 0b3d9cd24f8..7c94bfc9ace 100644
--- a/portlets/test-jsr-286-plt-26-6-portlet/docroot/render_url.jsp
+++ b/portlets/test-jsr-286-plt-26-6-portlet/docroot/render_url.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-jsr-286-plt-26-6-portlet/docroot/resource_url.jsp b/portlets/test-jsr-286-plt-26-6-portlet/docroot/resource_url.jsp
index 6bc21607f38..78ba91b366a 100644
--- a/portlets/test-jsr-286-plt-26-6-portlet/docroot/resource_url.jsp
+++ b/portlets/test-jsr-286-plt-26-6-portlet/docroot/resource_url.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-jsr-286-plt-26-6-portlet/docroot/view.jsp b/portlets/test-jsr-286-plt-26-6-portlet/docroot/view.jsp
index db3d49a4e63..99936633536 100644
--- a/portlets/test-jsr-286-plt-26-6-portlet/docroot/view.jsp
+++ b/portlets/test-jsr-286-plt-26-6-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-localized-portlet/docroot/init.jsp b/portlets/test-localized-portlet/docroot/init.jsp
index 631de044584..3c6d06dff79 100644
--- a/portlets/test-localized-portlet/docroot/init.jsp
+++ b/portlets/test-localized-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-localized-portlet/docroot/view.jsp b/portlets/test-localized-portlet/docroot/view.jsp
index 6aa0225469d..03eadbd252a 100644
--- a/portlets/test-localized-portlet/docroot/view.jsp
+++ b/portlets/test-localized-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-log-portlet/docroot/WEB-INF/src/com/liferay/testlog/portlet/TestLogPortlet.java b/portlets/test-log-portlet/docroot/WEB-INF/src/com/liferay/testlog/portlet/TestLogPortlet.java
index a47d48dc408..e9c67c4266b 100644
--- a/portlets/test-log-portlet/docroot/WEB-INF/src/com/liferay/testlog/portlet/TestLogPortlet.java
+++ b/portlets/test-log-portlet/docroot/WEB-INF/src/com/liferay/testlog/portlet/TestLogPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testlog.portlet;
@@ -37,7 +37,7 @@ import javax.portlet.RenderResponse;
  */
 public class TestLogPortlet extends GenericPortlet {
 
-	@Override
+
 	public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException {
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestPortletConfigMessageListener.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestPortletConfigMessageListener.java
index ad79e29e8ec..63a03ce782c 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestPortletConfigMessageListener.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestPortletConfigMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.messaging;
@@ -41,7 +41,7 @@ public class TestPortletConfigMessageListener extends BaseMessageListener {
 		}
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		_countDown();
 	}
@@ -60,7 +60,7 @@ public class TestPortletConfigMessageListener extends BaseMessageListener {
 	private static class CountDownProcessCallable
 		implements ProcessCallable<Serializable> {
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				TestPortletConfigMessageListener._countDown();
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestSpringConfigMessageListener.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestSpringConfigMessageListener.java
index 5216f736c45..a67c39186cb 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestSpringConfigMessageListener.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/messaging/TestSpringConfigMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.messaging;
@@ -41,7 +41,7 @@ public class TestSpringConfigMessageListener extends BaseMessageListener {
 		}
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		_countDown();
 	}
@@ -60,7 +60,7 @@ public class TestSpringConfigMessageListener extends BaseMessageListener {
 	private static class CountDownProcessCallable
 		implements ProcessCallable<Serializable> {
 
-		@Override
+
 		public Serializable call() throws ProcessException {
 			try {
 				TestSpringConfigMessageListener._countDown();
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestPortlet.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestPortlet.java
index e42be940ffa..a046d91b6b1 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestPortlet.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.portlet;
@@ -70,7 +70,7 @@ public class TestPortlet extends LiferayPortlet {
 			PortletKeys.TEST_MISC);
 	}
 
-	@Override
+
 	public void doDispatch(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -91,7 +91,7 @@ public class TestPortlet extends LiferayPortlet {
 		include(mvcPath, renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void processAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws IOException, PortletException {
@@ -123,7 +123,7 @@ public class TestPortlet extends LiferayPortlet {
 			request, response, fileName, inputStream, contentType);
 	}
 
-	@Override
+
 	public void serveResource(
 			ResourceRequest resourceRequest, ResourceResponse resourceResponse)
 		throws IOException {
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderFilter.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderFilter.java
index 99d1f6387a6..34574867121 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderFilter.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderFilter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.portlet;
@@ -32,14 +32,14 @@ import javax.portlet.filter.RenderFilter;
  */
 public class TestRenderFilter implements RenderFilter {
 
-	@Override
+
 	public void destroy() {
 		Log log = LogFactoryUtil.getLog(TestRenderFilter.class);
 
 		log.info("Destroy");
 	}
 
-	@Override
+
 	public void doFilter(
 			RenderRequest renderRequest, RenderResponse renderResponse,
 			FilterChain filterChain)
@@ -61,7 +61,7 @@ public class TestRenderFilter implements RenderFilter {
 		log.info("After filter");
 	}
 
-	@Override
+
 	public void init(FilterConfig filterConfig) {
 		Log log = LogFactoryUtil.getLog(TestRenderFilter.class);
 
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderResponse.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderResponse.java
index dc6c5af0c05..d4cfbcc6cc7 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderResponse.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/portlet/TestRenderResponse.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.portlet;
@@ -36,7 +36,7 @@ public class TestRenderResponse extends RenderResponseWrapper {
 		super(renderResponse);
 	}
 
-	@Override
+
 	public OutputStream getPortletOutputStream() {
 		if (_printWriter != null) {
 			throw new IllegalStateException(
@@ -75,7 +75,7 @@ public class TestRenderResponse extends RenderResponseWrapper {
 		return _string;
 	}
 
-	@Override
+
 	public PrintWriter getWriter() {
 		if (_byteArrayOutputStream != null) {
 			throw new IllegalStateException(
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListener.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListener.java
index 368569357f3..ccc9c047b17 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListener.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.servlet;
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpSessionListener;
  */
 public class TestPortletSessionListener implements HttpSessionListener {
 
-	@Override
+
 	public void sessionCreated(HttpSessionEvent event) {
 		HttpSession ses = event.getSession();
 
@@ -36,7 +36,7 @@ public class TestPortletSessionListener implements HttpSessionListener {
 		}
 	}
 
-	@Override
+
 	public void sessionDestroyed(HttpSessionEvent event) {
 		HttpSession ses = event.getSession();
 
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListenerLoader.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListenerLoader.java
index a229a3d3a52..c6986e9dab5 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListenerLoader.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/servlet/TestPortletSessionListenerLoader.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.servlet;
diff --git a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/util/PortletKeys.java b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/util/PortletKeys.java
index baa22cbc51a..be8d69db117 100644
--- a/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/util/PortletKeys.java
+++ b/portlets/test-misc-portlet/docroot/WEB-INF/src/com/liferay/testmisc/util/PortletKeys.java
@@ -1,21 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testmisc.util;
 
 /**
- * @author Sergio González
+ * @author Sergio Gonz??lez
  */
 public class PortletKeys extends com.liferay.portal.kernel.util.PortletKeys {
 
diff --git a/portlets/test-misc-portlet/docroot/init.jsp b/portlets/test-misc-portlet/docroot/init.jsp
index 3852b6a2c59..0f7daf7c080 100644
--- a/portlets/test-misc-portlet/docroot/init.jsp
+++ b/portlets/test-misc-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/portal_message/portal_message.jsp b/portlets/test-misc-portlet/docroot/portal_message/portal_message.jsp
index c79bc39b134..7fdd85048c7 100644
--- a/portlets/test-misc-portlet/docroot/portal_message/portal_message.jsp
+++ b/portlets/test-misc-portlet/docroot/portal_message/portal_message.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/portlet_request/attribute_sharing.jsp b/portlets/test-misc-portlet/docroot/portlet_request/attribute_sharing.jsp
index 7912925b921..30c750b7aa6 100644
--- a/portlets/test-misc-portlet/docroot/portlet_request/attribute_sharing.jsp
+++ b/portlets/test-misc-portlet/docroot/portlet_request/attribute_sharing.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/portlet_request/remote_user.jsp b/portlets/test-misc-portlet/docroot/portlet_request/remote_user.jsp
index 8647f0be8a2..95eb1148bdb 100644
--- a/portlets/test-misc-portlet/docroot/portlet_request/remote_user.jsp
+++ b/portlets/test-misc-portlet/docroot/portlet_request/remote_user.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/portlet_response/buffer_size.jsp b/portlets/test-misc-portlet/docroot/portlet_response/buffer_size.jsp
index c3499096b2b..33c49da9412 100644
--- a/portlets/test-misc-portlet/docroot/portlet_response/buffer_size.jsp
+++ b/portlets/test-misc-portlet/docroot/portlet_response/buffer_size.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/portlet_session/attribute_sharing.jsp b/portlets/test-misc-portlet/docroot/portlet_session/attribute_sharing.jsp
index 378ad6f2321..cfd078dd280 100644
--- a/portlets/test-misc-portlet/docroot/portlet_session/attribute_sharing.jsp
+++ b/portlets/test-misc-portlet/docroot/portlet_session/attribute_sharing.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/servlet_request/remote_user.jsp b/portlets/test-misc-portlet/docroot/servlet_request/remote_user.jsp
index 5e35265715d..25cc2e49694 100644
--- a/portlets/test-misc-portlet/docroot/servlet_request/remote_user.jsp
+++ b/portlets/test-misc-portlet/docroot/servlet_request/remote_user.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/servlet_session/access.jsp b/portlets/test-misc-portlet/docroot/servlet_session/access.jsp
index 4a9a59f140b..057937f82b6 100644
--- a/portlets/test-misc-portlet/docroot/servlet_session/access.jsp
+++ b/portlets/test-misc-portlet/docroot/servlet_session/access.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/upload/form.jsp b/portlets/test-misc-portlet/docroot/upload/form.jsp
index b62c9940949..a31fe8c10cd 100644
--- a/portlets/test-misc-portlet/docroot/upload/form.jsp
+++ b/portlets/test-misc-portlet/docroot/upload/form.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-misc-portlet/docroot/view.jsp b/portlets/test-misc-portlet/docroot/view.jsp
index 235ae7d9714..1fde57e931a 100644
--- a/portlets/test-misc-portlet/docroot/view.jsp
+++ b/portlets/test-misc-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/LiferayOAuthJSONWSClient.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/LiferayOAuthJSONWSClient.java
index 35d59745955..b0152994356 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/LiferayOAuthJSONWSClient.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/LiferayOAuthJSONWSClient.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.oauth;
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandler.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandler.java
index 3d099abee83..8c0c2e3b532 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandler.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandler.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.oauth;
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerFactory.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerFactory.java
index 586b661f345..de444e0a04e 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerFactory.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerFactory.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.oauth;
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerImpl.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerImpl.java
index 325abbfe670..4db22f4b29d 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerImpl.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthServiceHandlerImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.oauth;
@@ -33,7 +33,7 @@ import org.scribe.oauth.OAuthService;
  */
 public class OAuthServiceHandlerImpl implements OAuthServiceHandler {
 
-	@Override
+
 	public Token extractAccessToken(Token requestToken, String oAuthVerifier) {
 		Verifier verifier = new Verifier(oAuthVerifier);
 
@@ -42,12 +42,12 @@ public class OAuthServiceHandlerImpl implements OAuthServiceHandler {
 		return oAuthService.getAccessToken(requestToken, verifier);
 	}
 
-	@Override
+
 	public String getAuthorizeURL(Token requestToken) {
 		return getAuthorizeURL(requestToken, null);
 	}
 
-	@Override
+
 	public String getAuthorizeURL(Token requestToken, String callbackURL) {
 		if (requestToken == null) {
 			_log.error("Request token parameter is null");
@@ -66,23 +66,23 @@ public class OAuthServiceHandlerImpl implements OAuthServiceHandler {
 			authorizeURL, OAuthConstants.TOKEN, requestToken.getToken());
 	}
 
-	@Override
+
 	public OAuthService getOAuthService() {
 		if (_oAuthService == null) {
 			Api api = new DefaultApi10a() {
 
-				@Override
+
 				public String getAccessTokenEndpoint() {
 					return _accessURL;
 				}
 
-				@Override
+
 				public String getAuthorizationUrl(Token token) {
 					return HttpUtil.addParameter(
 						_authorizeURL, OAuthConstants.TOKEN, token.getToken());
 				}
 
-				@Override
+
 				public String getRequestTokenEndpoint() {
 					return _requestURL;
 				}
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthUtil.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthUtil.java
index 66a402e2ac2..bd2f22c65e4 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthUtil.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/oauth/OAuthUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.oauth;
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/portlet/TestOAuthPortlet.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/portlet/TestOAuthPortlet.java
index beedd92a3bc..25fd77050c1 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/portlet/TestOAuthPortlet.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/portlet/TestOAuthPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.portlet;
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsKeys.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsKeys.java
index 73e58a47e7c..36979e99826 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsKeys.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.util;
diff --git a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsValues.java b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsValues.java
index 9eeefd13e5f..58528772c47 100644
--- a/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsValues.java
+++ b/portlets/test-oauth-portlet/docroot/WEB-INF/src/com/liferay/testoauth/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testoauth.util;
diff --git a/portlets/test-oauth-portlet/docroot/init.jsp b/portlets/test-oauth-portlet/docroot/init.jsp
index 65428fc8ea6..07ae0f50c6b 100644
--- a/portlets/test-oauth-portlet/docroot/init.jsp
+++ b/portlets/test-oauth-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-oauth-portlet/docroot/view.jsp b/portlets/test-oauth-portlet/docroot/view.jsp
index 9ee5d1b6721..cc3f5b743f7 100644
--- a/portlets/test-oauth-portlet/docroot/view.jsp
+++ b/portlets/test-oauth-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-oauth-portlet/docroot/view_oauth_settings.jspf b/portlets/test-oauth-portlet/docroot/view_oauth_settings.jspf
index 0347f263239..1bf187848f4 100644
--- a/portlets/test-oauth-portlet/docroot/view_oauth_settings.jspf
+++ b/portlets/test-oauth-portlet/docroot/view_oauth_settings.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-opensocial-oauth-consumer-portlet/docroot/WEB-INF/src/com/liferay/testopensocialoauthconsumer/messaging/TestOpenSocialOAuthConsumerHotDeployMessageListener.java b/portlets/test-opensocial-oauth-consumer-portlet/docroot/WEB-INF/src/com/liferay/testopensocialoauthconsumer/messaging/TestOpenSocialOAuthConsumerHotDeployMessageListener.java
index 875c907908f..8c4473e9422 100644
--- a/portlets/test-opensocial-oauth-consumer-portlet/docroot/WEB-INF/src/com/liferay/testopensocialoauthconsumer/messaging/TestOpenSocialOAuthConsumerHotDeployMessageListener.java
+++ b/portlets/test-opensocial-oauth-consumer-portlet/docroot/WEB-INF/src/com/liferay/testopensocialoauthconsumer/messaging/TestOpenSocialOAuthConsumerHotDeployMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testopensocialoauthconsumer.messaging;
@@ -132,12 +132,12 @@ public class TestOpenSocialOAuthConsumerHotDeployMessageListener
 		return sb.toString();
 	}
 
-	@Override
+
 	protected void onDeploy(Message message) throws Exception {
 		setupGadget();
 	}
 
-	@Override
+
 	protected void onUndeploy(Message message) throws Exception {
 		deleteGadget();
 	}
diff --git a/portlets/test-opensocial-pubsub-portlet/docroot/init.jsp b/portlets/test-opensocial-pubsub-portlet/docroot/init.jsp
index af492e30e39..993d0f571ae 100644
--- a/portlets/test-opensocial-pubsub-portlet/docroot/init.jsp
+++ b/portlets/test-opensocial-pubsub-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-opensocial-pubsub-portlet/docroot/publisher/view.jsp b/portlets/test-opensocial-pubsub-portlet/docroot/publisher/view.jsp
index 659fa50305f..274a26ff184 100644
--- a/portlets/test-opensocial-pubsub-portlet/docroot/publisher/view.jsp
+++ b/portlets/test-opensocial-pubsub-portlet/docroot/publisher/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-opensocial-pubsub-portlet/docroot/subscriber/view.jsp b/portlets/test-opensocial-pubsub-portlet/docroot/subscriber/view.jsp
index d4ad3a050d3..d745c8c89d4 100644
--- a/portlets/test-opensocial-pubsub-portlet/docroot/subscriber/view.jsp
+++ b/portlets/test-opensocial-pubsub-portlet/docroot/subscriber/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-pacl-portlet/docroot/META-INF/custom_jsps/html/common/themes/bottom-ext.jsp b/portlets/test-pacl-portlet/docroot/META-INF/custom_jsps/html/common/themes/bottom-ext.jsp
index 41e4b5f2d03..bb1536ae8a1 100644
--- a/portlets/test-pacl-portlet/docroot/META-INF/custom_jsps/html/common/themes/bottom-ext.jsp
+++ b/portlets/test-pacl-portlet/docroot/META-INF/custom_jsps/html/common/themes/bottom-ext.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/exception/NoSuchFooException.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/exception/NoSuchFooException.java
index 72d8972d7b8..799db0e3244 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/exception/NoSuchFooException.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/exception/NoSuchFooException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.exception;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/Foo.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/Foo.java
index e666039c1f1..4b3d1ce9ab0 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/Foo.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/Foo.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model;
@@ -38,17 +38,17 @@ public interface Foo extends FooModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.testpacl.model.impl.FooImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<Foo, Long> FOO_ID_ACCESSOR = new Accessor<Foo, Long>() {
-			@Override
+
 			public Long get(Foo foo) {
 				return foo.getFooId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<Foo> getTypeClass() {
 				return Foo.class;
 			}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooClp.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooClp.java
index d021f766bfa..de90ea77d82 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooClp.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model;
@@ -46,37 +46,37 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 	public FooClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Foo.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Foo.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setFooId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -99,7 +99,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long fooId = (Long)attributes.get("fooId");
 
@@ -177,12 +177,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getFooId() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setFooId(long fooId) {
 		_fooId = fooId;
 
@@ -200,12 +200,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -223,12 +223,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -246,12 +246,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -269,7 +269,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -281,16 +281,16 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -308,12 +308,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -331,12 +331,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -354,12 +354,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public String getField1() {
 		return _field1;
 	}
 
-	@Override
+
 	public void setField1(String field1) {
 		_field1 = field1;
 
@@ -377,17 +377,17 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public boolean getField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public boolean isField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public void setField2(boolean field2) {
 		_field2 = field2;
 
@@ -405,12 +405,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public int getField3() {
 		return _field3;
 	}
 
-	@Override
+
 	public void setField3(int field3) {
 		_field3 = field3;
 
@@ -428,12 +428,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Date getField4() {
 		return _field4;
 	}
 
-	@Override
+
 	public void setField4(Date field4) {
 		_field4 = field4;
 
@@ -451,12 +451,12 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public String getField5() {
 		return _field5;
 	}
 
-	@Override
+
 	public void setField5(String field5) {
 		_field5 = field5;
 
@@ -523,7 +523,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			FooLocalServiceUtil.addFoo(this);
@@ -533,13 +533,13 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		}
 	}
 
-	@Override
+
 	public Foo toEscapedModel() {
 		return (Foo)ProxyUtil.newProxyInstance(Foo.class.getClassLoader(),
 			new Class[] { Foo.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		FooClp clone = new FooClp();
 
@@ -559,7 +559,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(Foo foo) {
 		int value = 0;
 
@@ -572,7 +572,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -598,22 +598,22 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(25);
 
@@ -646,7 +646,7 @@ public class FooClp extends BaseModelImpl<Foo> implements Foo {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(40);
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooModel.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooModel.java
index a30c817dc8a..b947b3cb2d2 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooModel.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model;
@@ -83,7 +83,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @return the group ID of this foo
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -91,7 +91,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param groupId the group ID of this foo
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -99,7 +99,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @return the company ID of this foo
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -107,7 +107,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param companyId the company ID of this foo
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -115,7 +115,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @return the user ID of this foo
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -123,7 +123,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param userId the user ID of this foo
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -131,7 +131,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @return the user uuid of this foo
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -139,7 +139,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param userUuid the user uuid of this foo
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -148,7 +148,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 * @return the user name of this foo
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -156,7 +156,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param userName the user name of this foo
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -164,7 +164,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @return the create date of this foo
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -172,7 +172,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param createDate the create date of this foo
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -180,7 +180,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @return the modified date of this foo
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -188,7 +188,7 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 *
 	 * @param modifiedDate the modified date of this foo
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -270,60 +270,60 @@ public interface FooModel extends BaseModel<Foo>, GroupedModel, ShardedModel {
 	 */
 	public void setField5(String field5);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.testpacl.model.Foo foo);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.testpacl.model.Foo> toCacheModel();
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo toEscapedModel();
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooSoap.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooSoap.java
index d77ae44c03b..57a4b582832 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooSoap.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooWrapper.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooWrapper.java
index f08bd5c1f62..b03a6768079 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooWrapper.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/model/FooWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model;
@@ -43,17 +43,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		_foo = foo;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Foo.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Foo.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -73,7 +73,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long fooId = (Long)attributes.get("fooId");
 
@@ -153,17 +153,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field2 of this foo
 	*/
-	@Override
+
 	public boolean getField2() {
 		return _foo.getField2();
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _foo.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _foo.isEscapedModel();
 	}
@@ -173,37 +173,37 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return <code>true</code> if this foo is field2; <code>false</code> otherwise
 	*/
-	@Override
+
 	public boolean isField2() {
 		return _foo.isField2();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _foo.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _foo.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.testpacl.model.Foo> toCacheModel() {
 		return _foo.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo toEscapedModel() {
 		return new FooWrapper(_foo.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo toUnescapedModel() {
 		return new FooWrapper(_foo.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.testpacl.model.Foo foo) {
 		return _foo.compareTo(foo);
 	}
@@ -213,22 +213,22 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field3 of this foo
 	*/
-	@Override
+
 	public int getField3() {
 		return _foo.getField3();
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _foo.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _foo.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new FooWrapper((Foo)_foo.clone());
 	}
@@ -238,7 +238,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field1 of this foo
 	*/
-	@Override
+
 	public java.lang.String getField1() {
 		return _foo.getField1();
 	}
@@ -248,7 +248,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field5 of this foo
 	*/
-	@Override
+
 	public java.lang.String getField5() {
 		return _foo.getField5();
 	}
@@ -258,7 +258,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the user name of this foo
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _foo.getUserName();
 	}
@@ -268,17 +268,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the user uuid of this foo
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _foo.getUserUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _foo.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _foo.toXmlString();
 	}
@@ -288,7 +288,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the create date of this foo
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _foo.getCreateDate();
 	}
@@ -298,7 +298,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the field4 of this foo
 	*/
-	@Override
+
 	public Date getField4() {
 		return _foo.getField4();
 	}
@@ -308,7 +308,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the modified date of this foo
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _foo.getModifiedDate();
 	}
@@ -318,7 +318,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the company ID of this foo
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _foo.getCompanyId();
 	}
@@ -328,7 +328,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the foo ID of this foo
 	*/
-	@Override
+
 	public long getFooId() {
 		return _foo.getFooId();
 	}
@@ -338,7 +338,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the group ID of this foo
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _foo.getGroupId();
 	}
@@ -348,7 +348,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the primary key of this foo
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _foo.getPrimaryKey();
 	}
@@ -358,17 +358,17 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @return the user ID of this foo
 	*/
-	@Override
+
 	public long getUserId() {
 		return _foo.getUserId();
 	}
 
-	@Override
+
 	public void persist() {
 		_foo.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_foo.setCachedModel(cachedModel);
 	}
@@ -378,7 +378,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param companyId the company ID of this foo
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_foo.setCompanyId(companyId);
 	}
@@ -388,23 +388,23 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param createDate the create date of this foo
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_foo.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_foo.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_foo.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_foo.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -414,7 +414,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field1 the field1 of this foo
 	*/
-	@Override
+
 	public void setField1(java.lang.String field1) {
 		_foo.setField1(field1);
 	}
@@ -424,7 +424,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field2 the field2 of this foo
 	*/
-	@Override
+
 	public void setField2(boolean field2) {
 		_foo.setField2(field2);
 	}
@@ -434,7 +434,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field3 the field3 of this foo
 	*/
-	@Override
+
 	public void setField3(int field3) {
 		_foo.setField3(field3);
 	}
@@ -444,7 +444,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field4 the field4 of this foo
 	*/
-	@Override
+
 	public void setField4(Date field4) {
 		_foo.setField4(field4);
 	}
@@ -454,7 +454,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param field5 the field5 of this foo
 	*/
-	@Override
+
 	public void setField5(java.lang.String field5) {
 		_foo.setField5(field5);
 	}
@@ -464,7 +464,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param fooId the foo ID of this foo
 	*/
-	@Override
+
 	public void setFooId(long fooId) {
 		_foo.setFooId(fooId);
 	}
@@ -474,7 +474,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param groupId the group ID of this foo
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_foo.setGroupId(groupId);
 	}
@@ -484,12 +484,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param modifiedDate the modified date of this foo
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_foo.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_foo.setNew(n);
 	}
@@ -499,12 +499,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param primaryKey the primary key of this foo
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_foo.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_foo.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -514,7 +514,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param userId the user ID of this foo
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_foo.setUserId(userId);
 	}
@@ -524,7 +524,7 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param userName the user name of this foo
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_foo.setUserName(userName);
 	}
@@ -534,12 +534,12 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 	*
 	* @param userUuid the user uuid of this foo
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_foo.setUserUuid(userUuid);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -558,22 +558,22 @@ public class FooWrapper implements Foo, ModelWrapper<Foo> {
 		return false;
 	}
 
-	@Override
+
 	public Foo getWrappedModel() {
 		return _foo;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _foo.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _foo.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_foo.resetOriginalValues();
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/ClpSerializer.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/ClpSerializer.java
index b6b56658322..101dca6bdef 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/ClpSerializer.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalService.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalService.java
index d82b1236128..cfe36c48ce8 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalService.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service;
@@ -108,11 +108,11 @@ public interface FooLocalService extends BaseLocalService, InvokableLocalService
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -206,7 +206,7 @@ public interface FooLocalService extends BaseLocalService, InvokableLocalService
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getReleaseInfo_GetBuildNumber();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceClp.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceClp.java
index 5aaafaa9288..fd09c50b02f 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceClp.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service;
@@ -190,7 +190,7 @@ public class FooLocalServiceClp implements FooLocalService {
 			};
 	}
 
-	@Override
+
 	public boolean getPortalServiceUtil_TestHasClassName() {
 		Object returnObj = null;
 
@@ -213,7 +213,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Boolean)returnObj).booleanValue();
 	}
 
-	@Override
+
 	public boolean getPortalService_TestHasClassName() {
 		Object returnObj = null;
 
@@ -236,7 +236,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Boolean)returnObj).booleanValue();
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry getEntryLocalServiceUtil_GetEntry(
 		long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -265,7 +265,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.chat.model.Entry)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status getStatusLocalServiceUtil_GetStatus(
 		long statusId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -294,7 +294,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.chat.model.Status)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -317,7 +317,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -340,7 +340,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -363,7 +363,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Company getCompanyPersistence_FindByPrimaryKey(
 		long companyId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -392,7 +392,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.Company)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Company getCompanyUtil_FindByPrimaryKey(
 		long companyId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -421,7 +421,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.Company)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Group getGroupPersistence_FindByPrimaryKey(
 		long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -450,7 +450,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.Group)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Group getGroupUtil_FindByPrimaryKey(
 		long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -479,7 +479,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.Group)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -509,7 +509,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -539,7 +539,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.User getUserPersistence_FindByPrimaryKey(
 		long userId) throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -567,7 +567,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.User)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.User getUserUtil_FindByPrimaryKey(
 		long userId) throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -595,7 +595,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.portal.kernel.model.User)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo addFoo(
 		com.liferay.testpacl.model.Foo foo) {
 		Object returnObj = null;
@@ -620,7 +620,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo createFoo(long fooId) {
 		Object returnObj = null;
 
@@ -643,7 +643,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo deleteFoo(
 		com.liferay.testpacl.model.Foo foo) {
 		Object returnObj = null;
@@ -668,7 +668,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo deleteFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -696,7 +696,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo fetchFoo(long fooId) {
 		Object returnObj = null;
 
@@ -719,7 +719,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo getFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -747,7 +747,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo updateFoo(
 		com.liferay.testpacl.model.Foo foo) {
 		Object returnObj = null;
@@ -772,7 +772,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (com.liferay.testpacl.model.Foo)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getFoosCount() {
 		Object returnObj = null;
 
@@ -795,7 +795,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getPortalServiceUtil_GetBuildNumber() {
 		Object returnObj = null;
 
@@ -818,7 +818,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getPortalServiceUtil_TestGetBuildNumber() {
 		Object returnObj = null;
 
@@ -841,7 +841,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getPortalService_GetBuildNumber() {
 		Object returnObj = null;
 
@@ -864,7 +864,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getPortalService_TestGetBuildNumber() {
 		Object returnObj = null;
 
@@ -887,7 +887,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getReleaseInfo_GetBuildNumber() {
 		Object returnObj = null;
 
@@ -910,14 +910,14 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -940,7 +940,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -965,7 +965,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -997,7 +997,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -1032,7 +1032,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getEntryLocalServiceUtil_GetEntries(
 		int start, int end) {
 		Object returnObj = null;
@@ -1056,7 +1056,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.chat.model.Entry>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.testpacl.model.Foo> getFoos(int start,
 		int end) {
 		Object returnObj = null;
@@ -1080,7 +1080,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.testpacl.model.Foo>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Status> getStatusLocalServiceUtil_GetStatuses(
 		int start, int end) {
 		Object returnObj = null;
@@ -1104,7 +1104,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return (java.util.List<com.liferay.chat.model.Status>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -1129,7 +1129,7 @@ public class FooLocalServiceClp implements FooLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceUtil.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceUtil.java
index e2035270702..33decd08da0 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceUtil.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceWrapper.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceWrapper.java
index b83e2666ab3..a3a09e5d3b0 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceWrapper.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/FooLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service;
@@ -32,67 +32,67 @@ public class FooLocalServiceWrapper implements FooLocalService,
 		_fooLocalService = fooLocalService;
 	}
 
-	@Override
+
 	public boolean getPortalServiceUtil_TestHasClassName() {
 		return _fooLocalService.getPortalServiceUtil_TestHasClassName();
 	}
 
-	@Override
+
 	public boolean getPortalService_TestHasClassName() {
 		return _fooLocalService.getPortalService_TestHasClassName();
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Entry getEntryLocalServiceUtil_GetEntry(
 		long entryId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getEntryLocalServiceUtil_GetEntry(entryId);
 	}
 
-	@Override
+
 	public com.liferay.chat.model.Status getStatusLocalServiceUtil_GetStatus(
 		long statusId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getStatusLocalServiceUtil_GetStatus(statusId);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _fooLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _fooLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _fooLocalService.getIndexableActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Company getCompanyPersistence_FindByPrimaryKey(
 		long companyId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getCompanyPersistence_FindByPrimaryKey(companyId);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Company getCompanyUtil_FindByPrimaryKey(
 		long companyId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getCompanyUtil_FindByPrimaryKey(companyId);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Group getGroupPersistence_FindByPrimaryKey(
 		long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getGroupPersistence_FindByPrimaryKey(groupId);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.Group getGroupUtil_FindByPrimaryKey(
 		long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -102,27 +102,27 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getPersistedModel(primaryKeyObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.User getUserPersistence_FindByPrimaryKey(
 		long userId) throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getUserPersistence_FindByPrimaryKey(userId);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.User getUserUtil_FindByPrimaryKey(
 		long userId) throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getUserUtil_FindByPrimaryKey(userId);
@@ -134,7 +134,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param foo the foo
 	* @return the foo that was added
 	*/
-	@Override
+
 	public com.liferay.testpacl.model.Foo addFoo(
 		com.liferay.testpacl.model.Foo foo) {
 		return _fooLocalService.addFoo(foo);
@@ -146,7 +146,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param fooId the primary key for the new foo
 	* @return the new foo
 	*/
-	@Override
+
 	public com.liferay.testpacl.model.Foo createFoo(long fooId) {
 		return _fooLocalService.createFoo(fooId);
 	}
@@ -157,7 +157,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param foo the foo
 	* @return the foo that was removed
 	*/
-	@Override
+
 	public com.liferay.testpacl.model.Foo deleteFoo(
 		com.liferay.testpacl.model.Foo foo) {
 		return _fooLocalService.deleteFoo(foo);
@@ -170,13 +170,13 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @return the foo that was removed
 	* @throws PortalException if a foo with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.testpacl.model.Foo deleteFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.deleteFoo(fooId);
 	}
 
-	@Override
+
 	public com.liferay.testpacl.model.Foo fetchFoo(long fooId) {
 		return _fooLocalService.fetchFoo(fooId);
 	}
@@ -188,7 +188,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @return the foo
 	* @throws PortalException if a foo with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.testpacl.model.Foo getFoo(long fooId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _fooLocalService.getFoo(fooId);
@@ -200,7 +200,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param foo the foo
 	* @return the foo that was updated
 	*/
-	@Override
+
 	public com.liferay.testpacl.model.Foo updateFoo(
 		com.liferay.testpacl.model.Foo foo) {
 		return _fooLocalService.updateFoo(foo);
@@ -211,37 +211,37 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	*
 	* @return the number of foos
 	*/
-	@Override
+
 	public int getFoosCount() {
 		return _fooLocalService.getFoosCount();
 	}
 
-	@Override
+
 	public int getPortalServiceUtil_GetBuildNumber() {
 		return _fooLocalService.getPortalServiceUtil_GetBuildNumber();
 	}
 
-	@Override
+
 	public int getPortalServiceUtil_TestGetBuildNumber() {
 		return _fooLocalService.getPortalServiceUtil_TestGetBuildNumber();
 	}
 
-	@Override
+
 	public int getPortalService_GetBuildNumber() {
 		return _fooLocalService.getPortalService_GetBuildNumber();
 	}
 
-	@Override
+
 	public int getPortalService_TestGetBuildNumber() {
 		return _fooLocalService.getPortalService_TestGetBuildNumber();
 	}
 
-	@Override
+
 	public int getReleaseInfo_GetBuildNumber() {
 		return _fooLocalService.getReleaseInfo_GetBuildNumber();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -253,7 +253,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _fooLocalService.getOSGiServiceIdentifier();
 	}
@@ -264,7 +264,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _fooLocalService.dynamicQuery(dynamicQuery);
@@ -282,7 +282,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -302,7 +302,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -311,7 +311,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 			orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Entry> getEntryLocalServiceUtil_GetEntries(
 		int start, int end) {
 		return _fooLocalService.getEntryLocalServiceUtil_GetEntries(start, end);
@@ -328,13 +328,13 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param end the upper bound of the range of foos (not inclusive)
 	* @return the range of foos
 	*/
-	@Override
+
 	public java.util.List<com.liferay.testpacl.model.Foo> getFoos(int start,
 		int end) {
 		return _fooLocalService.getFoos(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.chat.model.Status> getStatusLocalServiceUtil_GetStatuses(
 		int start, int end) {
 		return _fooLocalService.getStatusLocalServiceUtil_GetStatuses(start, end);
@@ -346,7 +346,7 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _fooLocalService.dynamicQueryCount(dynamicQuery);
@@ -359,19 +359,19 @@ public class FooLocalServiceWrapper implements FooLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _fooLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public FooLocalService getWrappedService() {
 		return _fooLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(FooLocalService fooLocalService) {
 		_fooLocalService = fooLocalService;
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/messaging/ClpMessageListener.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/messaging/ClpMessageListener.java
index 7b9193b6a00..70773fd78c5 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/messaging/ClpMessageListener.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooPersistence.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooPersistence.java
index 424575a3684..9de31dd6b8a 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooPersistence.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.persistence;
@@ -219,7 +219,7 @@ public interface FooPersistence extends BasePersistence<Foo> {
 	*/
 	public Foo fetchByPrimaryKey(long fooId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, Foo> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooUtil.java b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooUtil.java
index bd7d39cde52..c4ce4bab863 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooUtil.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/service/com/liferay/testpacl/service/persistence/FooUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.persistence;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/FailureStrutsAction.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/FailureStrutsAction.java
index bc99b5c524e..d394808d85f 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/FailureStrutsAction.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/FailureStrutsAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.action;
@@ -32,7 +32,7 @@ public class FailureStrutsAction extends BaseStrutsAction {
 		_instantiated = true;
 	}
 
-	@Override
+
 	public String execute(
 			HttpServletRequest request, HttpServletResponse response)
 		throws Exception {
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/SuccessStrutsAction.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/SuccessStrutsAction.java
index d9e80e31b2e..d3923ac422d 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/SuccessStrutsAction.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/action/SuccessStrutsAction.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.action;
@@ -32,7 +32,7 @@ public class SuccessStrutsAction extends BaseStrutsAction {
 		_instantiated = true;
 	}
 
-	@Override
+
 	public String execute(
 			HttpServletRequest request, HttpServletResponse response)
 		throws Exception {
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/filter/FailureFilter.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/filter/FailureFilter.java
index 69848a1ef26..6f79880c714 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/filter/FailureFilter.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/filter/FailureFilter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.filter;
@@ -28,11 +28,11 @@ import javax.servlet.ServletResponse;
  */
 public class FailureFilter implements Filter {
 
-	@Override
+
 	public void destroy() {
 	}
 
-	@Override
+
 	public void doFilter(
 			ServletRequest servletRequest, ServletResponse servletResponse,
 			FilterChain filterChain)
@@ -45,7 +45,7 @@ public class FailureFilter implements Filter {
 		filterChain.doFilter(servletRequest, servletResponse);
 	}
 
-	@Override
+
 	public void init(FilterConfig filterConfig) {
 	}
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/PhoneNumberFormatImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/PhoneNumberFormatImpl.java
index 752b623f188..e8ee95a0b48 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/PhoneNumberFormatImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/PhoneNumberFormatImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.format;
@@ -21,17 +21,17 @@ import com.liferay.portal.kernel.format.PhoneNumberFormat;
  */
 public class PhoneNumberFormatImpl implements PhoneNumberFormat {
 
-	@Override
+
 	public String format(String phoneNumber) {
 		return "(TEST) " + phoneNumber;
 	}
 
-	@Override
+
 	public String strip(String phoneNumber) {
 		return phoneNumber;
 	}
 
-	@Override
+
 	public boolean validate(String phoneNumber) {
 		return true;
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/TestPhoneNumberFormatImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/TestPhoneNumberFormatImpl.java
index 8252cfce7fa..8a9d8cf2070 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/TestPhoneNumberFormatImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/format/TestPhoneNumberFormatImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.format;
@@ -21,17 +21,17 @@ import com.liferay.portal.kernel.format.PhoneNumberFormat;
  */
 public class TestPhoneNumberFormatImpl implements PhoneNumberFormat {
 
-	@Override
+
 	public String format(String phoneNumber) {
 		return "(TEST) " + phoneNumber;
 	}
 
-	@Override
+
 	public String strip(String phoneNumber) {
 		return phoneNumber;
 	}
 
-	@Override
+
 	public boolean validate(String phoneNumber) {
 		return true;
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/OrganizationIndexerPostProcessor.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/OrganizationIndexerPostProcessor.java
index 35d25ce5a0b..9703492df86 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/OrganizationIndexerPostProcessor.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/OrganizationIndexerPostProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.indexer;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/UserIndexerPostProcessor.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/UserIndexerPostProcessor.java
index 51aa8c1fc39..e891781d7f1 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/UserIndexerPostProcessor.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/indexer/UserIndexerPostProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.indexer;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsEntryLocalServiceImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsEntryLocalServiceImpl.java
index 6fbb7fb14b8..eb732450431 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsEntryLocalServiceImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsEntryLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.service.impl;
@@ -29,7 +29,7 @@ public class TestPACLBlogsEntryLocalServiceImpl
 		super(blogsEntryLocalService);
 	}
 
-	@Override
+
 	public int getBlogsEntriesCount() {
 		return -123;
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsStatsUserLocalServiceImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsStatsUserLocalServiceImpl.java
index 4adea5ad6d8..8eaf120dd39 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsStatsUserLocalServiceImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/hook/service/impl/TestPACLBlogsStatsUserLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.hook.service.impl;
@@ -29,7 +29,7 @@ public class TestPACLBlogsStatsUserLocalServiceImpl
 		super(blogsStatsUserLocalService);
 	}
 
-	@Override
+
 	public int getBlogsStatsUsersCount() {
 		return -456;
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenFailureMessageListener.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenFailureMessageListener.java
index 98b5666bb37..4fe2bf8447e 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenFailureMessageListener.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenFailureMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.messaging;
@@ -23,7 +23,7 @@ import com.liferay.portal.kernel.messaging.MessageBusUtil;
  */
 public class TestPACLListenFailureMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		MessageBusUtil.sendMessage(
 			message.getResponseDestinationName(), message);
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenSuccessMessageListener.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenSuccessMessageListener.java
index dcb1e0e29c9..915578bade8 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenSuccessMessageListener.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLListenSuccessMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.messaging;
@@ -23,7 +23,7 @@ import com.liferay.portal.kernel.messaging.MessageBusUtil;
  */
 public class TestPACLListenSuccessMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		MessageBusUtil.sendMessage(
 			message.getResponseDestinationName(), message);
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLMessageListener.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLMessageListener.java
index a2acdc3a85a..5a299bf3b91 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLMessageListener.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/messaging/TestPACLMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.messaging;
@@ -26,7 +26,7 @@ import java.util.Map;
  */
 public class TestPACLMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		message.setPayload(getResults(message));
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooBaseImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooBaseImpl.java
index 96f9787272c..434f10b13c3 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooBaseImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model.impl;
@@ -38,7 +38,7 @@ public abstract class FooBaseImpl extends FooModelImpl implements Foo {
 	 *
 	 * Never modify or reference this class directly. All methods that expect a foo model instance should use the {@link Foo} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			FooLocalServiceUtil.addFoo(this);
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooCacheModel.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooCacheModel.java
index 9e8a504e664..4b6b0fe1ea9 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooCacheModel.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model.impl;
@@ -39,7 +39,7 @@ import java.util.Date;
  */
 @ProviderType
 public class FooCacheModel implements CacheModel<Foo>, Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -58,12 +58,12 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, fooId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(25);
 
@@ -96,7 +96,7 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		return sb.toString();
 	}
 
-	@Override
+
 	public Foo toEntityModel() {
 		FooImpl fooImpl = new FooImpl();
 
@@ -155,7 +155,7 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		return fooImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		fooId = objectInput.readLong();
 
@@ -176,7 +176,7 @@ public class FooCacheModel implements CacheModel<Foo>, Externalizable {
 		field5 = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(fooId);
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooImpl.java
index c939c7d85f3..091cc6f2237 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model.impl;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooModelImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooModelImpl.java
index 720e2929696..b33a6846ee5 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooModelImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/model/impl/FooModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.model.impl;
@@ -118,37 +118,37 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 	public FooModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setFooId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Foo.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Foo.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -171,7 +171,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long fooId = (Long)attributes.get("fooId");
 
@@ -246,47 +246,47 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public long getFooId() {
 		return _fooId;
 	}
 
-	@Override
+
 	public void setFooId(long fooId) {
 		_fooId = fooId;
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -298,11 +298,11 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -312,22 +312,22 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -336,14 +336,14 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
 		_modifiedDate = modifiedDate;
 	}
 
-	@Override
+
 	public String getField1() {
 		if (_field1 == null) {
 			return StringPool.BLANK;
@@ -353,24 +353,24 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setField1(String field1) {
 		_columnBitmask = -1L;
 
 		_field1 = field1;
 	}
 
-	@Override
+
 	public boolean getField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public boolean isField2() {
 		return _field2;
 	}
 
-	@Override
+
 	public void setField2(boolean field2) {
 		_columnBitmask |= FIELD2_COLUMN_BITMASK;
 
@@ -387,27 +387,27 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _originalField2;
 	}
 
-	@Override
+
 	public int getField3() {
 		return _field3;
 	}
 
-	@Override
+
 	public void setField3(int field3) {
 		_field3 = field3;
 	}
 
-	@Override
+
 	public Date getField4() {
 		return _field4;
 	}
 
-	@Override
+
 	public void setField4(Date field4) {
 		_field4 = field4;
 	}
 
-	@Override
+
 	public String getField5() {
 		if (_field5 == null) {
 			return StringPool.BLANK;
@@ -417,7 +417,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public void setField5(String field5) {
 		_field5 = field5;
 	}
@@ -426,20 +426,20 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			Foo.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public Foo toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (Foo)ProxyUtil.newProxyInstance(_classLoader,
@@ -449,7 +449,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		FooImpl fooImpl = new FooImpl();
 
@@ -471,7 +471,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return fooImpl;
 	}
 
-	@Override
+
 	public int compareTo(Foo foo) {
 		int value = 0;
 
@@ -484,7 +484,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -506,22 +506,22 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		FooModelImpl fooModelImpl = this;
 
@@ -534,7 +534,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		fooModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<Foo> toCacheModel() {
 		FooCacheModel fooCacheModel = new FooCacheModel();
 
@@ -604,7 +604,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return fooCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(25);
 
@@ -637,7 +637,7 @@ public class FooModelImpl extends BaseModelImpl<Foo> implements FooModel {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(40);
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/portlet/TestPACLPortlet.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/portlet/TestPACLPortlet.java
index c30928d4f63..c1c016a22ad 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/portlet/TestPACLPortlet.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/portlet/TestPACLPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.portlet;
@@ -45,12 +45,12 @@ public class TestPACLPortlet extends MVCPortlet {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void destroy() {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void doView(
 			RenderRequest renderRequest, RenderResponse renderResponse)
 		throws IOException, PortletException {
@@ -75,7 +75,7 @@ public class TestPACLPortlet extends MVCPortlet {
 		include(viewTemplate, renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void init() throws PortletException {
 		super.init();
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceBaseImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceBaseImpl.java
index 1dccc5f4699..b3020a3d54a 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceBaseImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.base;
@@ -80,7 +80,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Foo addFoo(Foo foo) {
 		foo.setNew(true);
 
@@ -93,7 +93,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param fooId the primary key for the new foo
 	 * @return the new foo
 	 */
-	@Override
+
 	public Foo createFoo(long fooId) {
 		return fooPersistence.create(fooId);
 	}
@@ -106,7 +106,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a foo with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Foo deleteFoo(long fooId) throws PortalException {
 		return fooPersistence.remove(fooId);
 	}
@@ -118,12 +118,12 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Foo deleteFoo(Foo foo) {
 		return fooPersistence.remove(foo);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -137,7 +137,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return fooPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -154,7 +154,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return fooPersistence.findWithDynamicQuery(dynamicQuery, start, end);
@@ -173,7 +173,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return fooPersistence.findWithDynamicQuery(dynamicQuery, start, end,
@@ -186,7 +186,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return fooPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -198,13 +198,13 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return fooPersistence.countWithDynamicQuery(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public Foo fetchFoo(long fooId) {
 		return fooPersistence.fetchByPrimaryKey(fooId);
 	}
@@ -216,12 +216,12 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo
 	 * @throws PortalException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo getFoo(long fooId) throws PortalException {
 		return fooPersistence.findByPrimaryKey(fooId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -234,7 +234,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -259,13 +259,13 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return fooLocalService.deleteFoo((Foo)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return fooPersistence.findByPrimaryKey(primaryKeyObj);
@@ -282,7 +282,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of foos
 	 */
-	@Override
+
 	public List<Foo> getFoos(int start, int end) {
 		return fooPersistence.findAll(start, end);
 	}
@@ -292,7 +292,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of foos
 	 */
-	@Override
+
 	public int getFoosCount() {
 		return fooPersistence.countAll();
 	}
@@ -304,7 +304,7 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the foo that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Foo updateFoo(Foo foo) {
 		return fooPersistence.update(foo);
 	}
@@ -570,12 +570,12 @@ public abstract class FooLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return FooLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceClpInvoker.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceClpInvoker.java
index 9ef819ed385..fe274f10810 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceClpInvoker.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/base/FooLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.base;
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/impl/FooLocalServiceImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/impl/FooLocalServiceImpl.java
index ca7c96d0242..5b94576f620 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/impl/FooLocalServiceImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/impl/FooLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.impl;
@@ -38,103 +38,103 @@ import java.util.List;
  */
 public class FooLocalServiceImpl extends FooLocalServiceBaseImpl {
 
-	@Override
+
 	public Company getCompanyPersistence_FindByPrimaryKey(long companyId)
 		throws PortalException {
 
 		return companyPersistence.findByPrimaryKey(companyId);
 	}
 
-	@Override
+
 	public Company getCompanyUtil_FindByPrimaryKey(long companyId)
 		throws PortalException {
 
 		return CompanyUtil.findByPrimaryKey(companyId);
 	}
 
-	@Override
+
 	public List<Entry> getEntryLocalServiceUtil_GetEntries(int start, int end) {
 		return EntryLocalServiceUtil.getEntries(start, end);
 	}
 
-	@Override
+
 	public Entry getEntryLocalServiceUtil_GetEntry(long entryId)
 		throws PortalException {
 
 		return EntryLocalServiceUtil.getEntry(entryId);
 	}
 
-	@Override
+
 	public Group getGroupPersistence_FindByPrimaryKey(long groupId)
 		throws PortalException {
 
 		return groupPersistence.findByPrimaryKey(groupId);
 	}
 
-	@Override
+
 	public Group getGroupUtil_FindByPrimaryKey(long groupId)
 		throws PortalException {
 
 		return GroupUtil.findByPrimaryKey(groupId);
 	}
 
-	@Override
+
 	public int getPortalService_GetBuildNumber() {
 		return portalService.getBuildNumber();
 	}
 
-	@Override
+
 	public int getPortalService_TestGetBuildNumber() {
 		return portalService.testGetBuildNumber();
 	}
 
-	@Override
+
 	public boolean getPortalService_TestHasClassName() {
 		return portalService.testHasClassName();
 	}
 
-	@Override
+
 	public int getPortalServiceUtil_GetBuildNumber() {
 		return PortalServiceUtil.getBuildNumber();
 	}
 
-	@Override
+
 	public int getPortalServiceUtil_TestGetBuildNumber() {
 		return PortalServiceUtil.testGetBuildNumber();
 	}
 
-	@Override
+
 	public boolean getPortalServiceUtil_TestHasClassName() {
 		return PortalServiceUtil.testHasClassName();
 	}
 
-	@Override
+
 	public int getReleaseInfo_GetBuildNumber() {
 		return ReleaseInfo.getBuildNumber();
 	}
 
-	@Override
+
 	public Status getStatusLocalServiceUtil_GetStatus(long statusId)
 		throws PortalException {
 
 		return StatusLocalServiceUtil.getStatus(statusId);
 	}
 
-	@Override
+
 	public List<Status> getStatusLocalServiceUtil_GetStatuses(
 		int start, int end) {
 
 		return StatusLocalServiceUtil.getStatuses(start, end);
 	}
 
-	@Override
+
 	public User getUserPersistence_FindByPrimaryKey(long userId)
 		throws PortalException {
 
 		return userPersistence.findByPrimaryKey(userId);
 	}
 
-	@Override
+
 	public User getUserUtil_FindByPrimaryKey(long userId)
 		throws PortalException {
 
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/persistence/impl/FooPersistenceImpl.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/persistence/impl/FooPersistenceImpl.java
index 7a7a310937c..9f0d535aa0f 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/persistence/impl/FooPersistenceImpl.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/service/persistence/impl/FooPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.service.persistence.impl;
@@ -116,7 +116,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field2 the field2
 	 * @return the matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2) {
 		return findByField2(field2, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -133,7 +133,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2, int start, int end) {
 		return findByField2(field2, start, end, null);
 	}
@@ -151,7 +151,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2, int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findByField2(field2, start, end, orderByComparator, true);
@@ -171,7 +171,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching foos
 	 */
-	@Override
+
 	public List<Foo> findByField2(boolean field2, int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -279,7 +279,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the first matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByField2_First(boolean field2,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByField2_First(field2, orderByComparator);
@@ -307,7 +307,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByField2_First(boolean field2,
 		OrderByComparator<Foo> orderByComparator) {
 		List<Foo> list = findByField2(field2, 0, 1, orderByComparator);
@@ -327,7 +327,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the last matching foo
 	 * @throws NoSuchFooException if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo findByField2_Last(boolean field2,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = fetchByField2_Last(field2, orderByComparator);
@@ -355,7 +355,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching foo, or <code>null</code> if a matching foo could not be found
 	 */
-	@Override
+
 	public Foo fetchByField2_Last(boolean field2,
 		OrderByComparator<Foo> orderByComparator) {
 		int count = countByField2(field2);
@@ -383,7 +383,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the previous, current, and next foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo[] findByField2_PrevAndNext(long fooId, boolean field2,
 		OrderByComparator<Foo> orderByComparator) throws NoSuchFooException {
 		Foo foo = findByPrimaryKey(fooId);
@@ -524,7 +524,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param field2 the field2
 	 */
-	@Override
+
 	public void removeByField2(boolean field2) {
 		for (Foo foo : findByField2(field2, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -538,7 +538,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param field2 the field2
 	 * @return the number of matching foos
 	 */
-	@Override
+
 	public int countByField2(boolean field2) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_FIELD2;
 
@@ -594,7 +594,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param foo the foo
 	 */
-	@Override
+
 	public void cacheResult(Foo foo) {
 		entityCache.putResult(FooModelImpl.ENTITY_CACHE_ENABLED, FooImpl.class,
 			foo.getPrimaryKey(), foo);
@@ -607,7 +607,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @param foos the foos
 	 */
-	@Override
+
 	public void cacheResult(List<Foo> foos) {
 		for (Foo foo : foos) {
 			if (entityCache.getResult(FooModelImpl.ENTITY_CACHE_ENABLED,
@@ -627,7 +627,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(FooImpl.class);
 
@@ -643,7 +643,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(Foo foo) {
 		entityCache.removeResult(FooModelImpl.ENTITY_CACHE_ENABLED,
 			FooImpl.class, foo.getPrimaryKey());
@@ -652,7 +652,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<Foo> foos) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -669,7 +669,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param fooId the primary key for the new foo
 	 * @return the new foo
 	 */
-	@Override
+
 	public Foo create(long fooId) {
 		Foo foo = new FooImpl();
 
@@ -688,7 +688,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo that was removed
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo remove(long fooId) throws NoSuchFooException {
 		return remove((Serializable)fooId);
 	}
@@ -700,7 +700,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo that was removed
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo remove(Serializable primaryKey) throws NoSuchFooException {
 		Session session = null;
 
@@ -731,7 +731,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		}
 	}
 
-	@Override
+
 	protected Foo removeImpl(Foo foo) {
 		foo = toUnwrappedModel(foo);
 
@@ -762,7 +762,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		return foo;
 	}
 
-	@Override
+
 	public Foo updateImpl(Foo foo) {
 		foo = toUnwrappedModel(foo);
 
@@ -877,7 +877,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchFooException {
 		Foo foo = fetchByPrimaryKey(primaryKey);
@@ -901,7 +901,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @return the foo
 	 * @throws NoSuchFooException if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo findByPrimaryKey(long fooId) throws NoSuchFooException {
 		return findByPrimaryKey((Serializable)fooId);
 	}
@@ -912,7 +912,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param primaryKey the primary key of the foo
 	 * @return the foo, or <code>null</code> if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo fetchByPrimaryKey(Serializable primaryKey) {
 		Foo foo = (Foo)entityCache.getResult(FooModelImpl.ENTITY_CACHE_ENABLED,
 				FooImpl.class, primaryKey);
@@ -957,12 +957,12 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param fooId the primary key of the foo
 	 * @return the foo, or <code>null</code> if a foo with the primary key could not be found
 	 */
-	@Override
+
 	public Foo fetchByPrimaryKey(long fooId) {
 		return fetchByPrimaryKey((Serializable)fooId);
 	}
 
-	@Override
+
 	public Map<Serializable, Foo> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1059,7 +1059,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @return the foos
 	 */
-	@Override
+
 	public List<Foo> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1075,7 +1075,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param end the upper bound of the range of foos (not inclusive)
 	 * @return the range of foos
 	 */
-	@Override
+
 	public List<Foo> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1092,7 +1092,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of foos
 	 */
-	@Override
+
 	public List<Foo> findAll(int start, int end,
 		OrderByComparator<Foo> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1111,7 +1111,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of foos
 	 */
-	@Override
+
 	public List<Foo> findAll(int start, int end,
 		OrderByComparator<Foo> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -1198,7 +1198,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 * Removes all the foos from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (Foo foo : findAll()) {
 			remove(foo);
@@ -1210,7 +1210,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	 *
 	 * @return the number of foos
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1242,7 +1242,7 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 		return count.intValue();
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return FooModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1274,19 +1274,19 @@ public class FooPersistenceImpl extends BasePersistenceImpl<Foo>
 	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No Foo exists with the key {";
 	private static final Log _log = LogFactoryUtil.getLog(FooPersistenceImpl.class);
 	private static final Foo _nullFoo = new FooImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<Foo> toCacheModel() {
 				return _nullFooCacheModel;
 			}
 		};
 
 	private static final CacheModel<Foo> _nullFooCacheModel = new CacheModel<Foo>() {
-			@Override
+
 			public Foo toEntityModel() {
 				return _nullFoo;
 			}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServlet.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServlet.java
index 22be76927ad..53aca1af749 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServlet.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.servlet;
@@ -27,12 +27,12 @@ public class TestPACLServlet extends HttpServlet {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void destroy() {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void init() {
 		TestPACLUtil.testWriteFile();
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServletContextListener.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServletContextListener.java
index dec584092e0..da76923d7cb 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServletContextListener.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/TestPACLServletContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.servlet;
@@ -28,12 +28,12 @@ public class TestPACLServletContextListener implements ServletContextListener {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void contextDestroyed(ServletContextEvent servletContextEvent) {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		TestPACLUtil.testWriteFile();
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/filters/TestPACLFilter.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/filters/TestPACLFilter.java
index 4edf546cbea..5ce15cd453f 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/filters/TestPACLFilter.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/servlet/filters/TestPACLFilter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.servlet.filters;
@@ -34,12 +34,12 @@ public class TestPACLFilter implements Filter {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void destroy() {
 		TestPACLUtil.testWriteFile();
 	}
 
-	@Override
+
 	public void doFilter(
 			ServletRequest servletRequest, ServletResponse servletResponse,
 			FilterChain filterChain)
@@ -50,7 +50,7 @@ public class TestPACLFilter implements Filter {
 		filterChain.doFilter(servletRequest, servletResponse);
 	}
 
-	@Override
+
 	public void init(FilterConfig filterConfig) {
 		TestPACLUtil.testWriteFile();
 	}
diff --git a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/util/TestPACLUtil.java b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/util/TestPACLUtil.java
index 89e77587a4c..f70ad392592 100644
--- a/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/util/TestPACLUtil.java
+++ b/portlets/test-pacl-portlet/docroot/WEB-INF/src/com/liferay/testpacl/util/TestPACLUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testpacl.util;
@@ -85,7 +85,7 @@ public class TestPACLUtil {
 
 		Thread thread = new Thread() {
 
-			@Override
+
 			public void run() {
 				results.putAll(testCurrentThread(userId));
 			}
diff --git a/portlets/test-pacl-portlet/docroot/init.jsp b/portlets/test-pacl-portlet/docroot/init.jsp
index a45c5a0f389..48799cd9bae 100644
--- a/portlets/test-pacl-portlet/docroot/init.jsp
+++ b/portlets/test-pacl-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-pacl-portlet/docroot/view.jsp b/portlets/test-pacl-portlet/docroot/view.jsp
index dc2716860c0..bee00562da0 100644
--- a/portlets/test-pacl-portlet/docroot/view.jsp
+++ b/portlets/test-pacl-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-runtime-action-portlet/docroot/WEB-INF/src/com/liferay/testruntimeaction/portlet/TestRuntimeActionPortlet.java b/portlets/test-runtime-action-portlet/docroot/WEB-INF/src/com/liferay/testruntimeaction/portlet/TestRuntimeActionPortlet.java
index d4dd2646c21..eaded2eeddb 100644
--- a/portlets/test-runtime-action-portlet/docroot/WEB-INF/src/com/liferay/testruntimeaction/portlet/TestRuntimeActionPortlet.java
+++ b/portlets/test-runtime-action-portlet/docroot/WEB-INF/src/com/liferay/testruntimeaction/portlet/TestRuntimeActionPortlet.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testruntimeaction.portlet;
diff --git a/portlets/test-runtime-action-portlet/docroot/view.jsp b/portlets/test-runtime-action-portlet/docroot/view.jsp
index 7531ba823ff..06861324528 100644
--- a/portlets/test-runtime-action-portlet/docroot/view.jsp
+++ b/portlets/test-runtime-action-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-runtime-parent-portlet/docroot/view.jsp b/portlets/test-runtime-parent-portlet/docroot/view.jsp
index 5e4d8f2d47b..7c91c51bc5d 100644
--- a/portlets/test-runtime-parent-portlet/docroot/view.jsp
+++ b/portlets/test-runtime-parent-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-security-constraints-portlet/docroot/init.jsp b/portlets/test-security-constraints-portlet/docroot/init.jsp
index 19e9245667c..86fe3fe59a3 100644
--- a/portlets/test-security-constraints-portlet/docroot/init.jsp
+++ b/portlets/test-security-constraints-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-security-constraints-portlet/docroot/public/view.jsp b/portlets/test-security-constraints-portlet/docroot/public/view.jsp
index a66847e415f..c17968d824a 100644
--- a/portlets/test-security-constraints-portlet/docroot/public/view.jsp
+++ b/portlets/test-security-constraints-portlet/docroot/public/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-security-constraints-portlet/docroot/view.jsp b/portlets/test-security-constraints-portlet/docroot/view.jsp
index 66b8bb5d880..e844c8e00aa 100644
--- a/portlets/test-security-constraints-portlet/docroot/view.jsp
+++ b/portlets/test-security-constraints-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/exception/NoSuchBarException.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/exception/NoSuchBarException.java
index 73400cb6783..c21ad4f2ea7 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/exception/NoSuchBarException.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/exception/NoSuchBarException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.exception;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/Bar.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/Bar.java
index 42cb89bfd4b..cd346e674ac 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/Bar.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/Bar.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model;
@@ -38,17 +38,17 @@ public interface Bar extends BarModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.testtransaction.model.impl.BarImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<Bar, Long> BAR_ID_ACCESSOR = new Accessor<Bar, Long>() {
-			@Override
+
 			public Long get(Bar bar) {
 				return bar.getBarId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<Bar> getTypeClass() {
 				return Bar.class;
 			}
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarClp.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarClp.java
index 6e31c4481fe..8e950c32b27 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarClp.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model;
@@ -41,37 +41,37 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 	public BarClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Bar.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Bar.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _barId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setBarId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _barId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -84,7 +84,7 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long barId = (Long)attributes.get("barId");
 
@@ -102,12 +102,12 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public long getBarId() {
 		return _barId;
 	}
 
-	@Override
+
 	public void setBarId(long barId) {
 		_barId = barId;
 
@@ -125,12 +125,12 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		}
 	}
 
-	@Override
+
 	public String getText() {
 		return _text;
 	}
 
-	@Override
+
 	public void setText(String text) {
 		_text = text;
 
@@ -197,7 +197,7 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			BarLocalServiceUtil.addBar(this);
@@ -207,13 +207,13 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		}
 	}
 
-	@Override
+
 	public Bar toEscapedModel() {
 		return (Bar)ProxyUtil.newProxyInstance(Bar.class.getClassLoader(),
 			new Class[] { Bar.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		BarClp clone = new BarClp();
 
@@ -223,7 +223,7 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(Bar bar) {
 		int value = 0;
 
@@ -236,7 +236,7 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -262,22 +262,22 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(5);
 
@@ -290,7 +290,7 @@ public class BarClp extends BaseModelImpl<Bar> implements Bar {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(10);
 
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarModel.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarModel.java
index c1845e889dc..d600e2fa355 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarModel.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model;
@@ -89,60 +89,60 @@ public interface BarModel extends BaseModel<Bar> {
 	 */
 	public void setText(String text);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.testtransaction.model.Bar bar);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.testtransaction.model.Bar> toCacheModel();
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar toEscapedModel();
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarSoap.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarSoap.java
index 15577cead0f..570c6afa119 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarSoap.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarWrapper.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarWrapper.java
index 498ec4bfcf6..564b0c250d9 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarWrapper.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/model/BarWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model;
@@ -42,17 +42,17 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 		_bar = bar;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Bar.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Bar.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -62,7 +62,7 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long barId = (Long)attributes.get("barId");
 
@@ -77,57 +77,57 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _bar.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _bar.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _bar.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _bar.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.testtransaction.model.Bar> toCacheModel() {
 		return _bar.toCacheModel();
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar toEscapedModel() {
 		return new BarWrapper(_bar.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar toUnescapedModel() {
 		return new BarWrapper(_bar.toUnescapedModel());
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.testtransaction.model.Bar bar) {
 		return _bar.compareTo(bar);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _bar.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _bar.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new BarWrapper((Bar)_bar.clone());
 	}
@@ -137,17 +137,17 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 	*
 	* @return the text of this bar
 	*/
-	@Override
+
 	public java.lang.String getText() {
 		return _bar.getText();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _bar.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _bar.toXmlString();
 	}
@@ -157,7 +157,7 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 	*
 	* @return the bar ID of this bar
 	*/
-	@Override
+
 	public long getBarId() {
 		return _bar.getBarId();
 	}
@@ -167,12 +167,12 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 	*
 	* @return the primary key of this bar
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _bar.getPrimaryKey();
 	}
 
-	@Override
+
 	public void persist() {
 		_bar.persist();
 	}
@@ -182,33 +182,33 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 	*
 	* @param barId the bar ID of this bar
 	*/
-	@Override
+
 	public void setBarId(long barId) {
 		_bar.setBarId(barId);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_bar.setCachedModel(cachedModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_bar.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_bar.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_bar.setExpandoBridgeAttributes(serviceContext);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_bar.setNew(n);
 	}
@@ -218,12 +218,12 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 	*
 	* @param primaryKey the primary key of this bar
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_bar.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_bar.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -233,12 +233,12 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 	*
 	* @param text the text of this bar
 	*/
-	@Override
+
 	public void setText(java.lang.String text) {
 		_bar.setText(text);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -257,22 +257,22 @@ public class BarWrapper implements Bar, ModelWrapper<Bar> {
 		return false;
 	}
 
-	@Override
+
 	public Bar getWrappedModel() {
 		return _bar;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _bar.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _bar.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_bar.resetOriginalValues();
 	}
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalService.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalService.java
index b0d73c0e602..b7382aa42a7 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalService.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service;
@@ -78,11 +78,11 @@ public interface BarLocalService extends BaseLocalService, InvokableLocalService
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -158,7 +158,7 @@ public interface BarLocalService extends BaseLocalService, InvokableLocalService
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getBarsCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceClp.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceClp.java
index 798cb503524..5a3f60246bb 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceClp.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service;
@@ -166,7 +166,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		_methodParameterTypes29 = new String[] { "java.lang.String" };
 	}
 
-	@Override
+
 	public boolean hasBar(java.lang.String text) {
 		Object returnObj = null;
 
@@ -190,7 +190,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return ((Boolean)returnObj).booleanValue();
 	}
 
-	@Override
+
 	public boolean hasClassName() {
 		Object returnObj = null;
 
@@ -213,7 +213,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return ((Boolean)returnObj).booleanValue();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -236,7 +236,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -259,7 +259,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -282,7 +282,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -312,7 +312,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -342,7 +342,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar addBar(
 		com.liferay.testtransaction.model.Bar bar) {
 		Object returnObj = null;
@@ -367,7 +367,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar addBar_Success(
 		java.lang.String text) {
 		Object returnObj = null;
@@ -392,7 +392,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar createBar(long barId) {
 		Object returnObj = null;
 
@@ -415,7 +415,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar deleteBar(
 		com.liferay.testtransaction.model.Bar bar) {
 		Object returnObj = null;
@@ -440,7 +440,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar deleteBar(long barId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -468,7 +468,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar fetchBar(long barId) {
 		Object returnObj = null;
 
@@ -491,7 +491,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar getBar(java.lang.String text)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -520,7 +520,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar getBar(long barId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		Object returnObj = null;
@@ -548,7 +548,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar updateBar(
 		com.liferay.testtransaction.model.Bar bar) {
 		Object returnObj = null;
@@ -573,7 +573,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (com.liferay.testtransaction.model.Bar)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getBarsCount() {
 		Object returnObj = null;
 
@@ -596,14 +596,14 @@ public class BarLocalServiceClp implements BarLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -626,7 +626,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -651,7 +651,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -683,7 +683,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -718,7 +718,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.testtransaction.model.Bar> getBars(
 		int start, int end) {
 		Object returnObj = null;
@@ -742,7 +742,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return (java.util.List<com.liferay.testtransaction.model.Bar>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -767,7 +767,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -797,7 +797,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void addBarAndClassName_PortalRollback(java.lang.String text) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName25,
@@ -817,7 +817,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		}
 	}
 
-	@Override
+
 	public void addBarAndClassName_PortletRollback(java.lang.String text) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName26,
@@ -837,7 +837,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		}
 	}
 
-	@Override
+
 	public void addBar_Rollback(java.lang.String text) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName27,
@@ -857,7 +857,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		}
 	}
 
-	@Override
+
 	public void deleteBarAndClassName(com.liferay.testtransaction.model.Bar bar)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
@@ -882,7 +882,7 @@ public class BarLocalServiceClp implements BarLocalService {
 		}
 	}
 
-	@Override
+
 	public void testAddClassNameAndBar_Success(java.lang.String text) {
 		try {
 			_invokableLocalService.invokeMethod(_methodName29,
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceUtil.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceUtil.java
index a10976e8f8f..1cbcd150da7 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceUtil.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceWrapper.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceWrapper.java
index c1dccf92b1f..8e63cb62170 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceWrapper.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/BarLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service;
@@ -32,27 +32,27 @@ public class BarLocalServiceWrapper implements BarLocalService,
 		_barLocalService = barLocalService;
 	}
 
-	@Override
+
 	public boolean hasBar(java.lang.String text) {
 		return _barLocalService.hasBar(text);
 	}
 
-	@Override
+
 	public boolean hasClassName() {
 		return _barLocalService.hasClassName();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _barLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _barLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _barLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -60,14 +60,14 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _barLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -80,13 +80,13 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param bar the bar
 	* @return the bar that was added
 	*/
-	@Override
+
 	public com.liferay.testtransaction.model.Bar addBar(
 		com.liferay.testtransaction.model.Bar bar) {
 		return _barLocalService.addBar(bar);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar addBar_Success(
 		java.lang.String text) {
 		return _barLocalService.addBar_Success(text);
@@ -98,7 +98,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param barId the primary key for the new bar
 	* @return the new bar
 	*/
-	@Override
+
 	public com.liferay.testtransaction.model.Bar createBar(long barId) {
 		return _barLocalService.createBar(barId);
 	}
@@ -109,7 +109,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param bar the bar
 	* @return the bar that was removed
 	*/
-	@Override
+
 	public com.liferay.testtransaction.model.Bar deleteBar(
 		com.liferay.testtransaction.model.Bar bar) {
 		return _barLocalService.deleteBar(bar);
@@ -122,18 +122,18 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @return the bar that was removed
 	* @throws PortalException if a bar with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.testtransaction.model.Bar deleteBar(long barId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _barLocalService.deleteBar(barId);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar fetchBar(long barId) {
 		return _barLocalService.fetchBar(barId);
 	}
 
-	@Override
+
 	public com.liferay.testtransaction.model.Bar getBar(java.lang.String text)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _barLocalService.getBar(text);
@@ -146,7 +146,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @return the bar
 	* @throws PortalException if a bar with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.testtransaction.model.Bar getBar(long barId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _barLocalService.getBar(barId);
@@ -158,7 +158,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param bar the bar
 	* @return the bar that was updated
 	*/
-	@Override
+
 	public com.liferay.testtransaction.model.Bar updateBar(
 		com.liferay.testtransaction.model.Bar bar) {
 		return _barLocalService.updateBar(bar);
@@ -169,12 +169,12 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	*
 	* @return the number of bars
 	*/
-	@Override
+
 	public int getBarsCount() {
 		return _barLocalService.getBarsCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -186,7 +186,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _barLocalService.getOSGiServiceIdentifier();
 	}
@@ -197,7 +197,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _barLocalService.dynamicQuery(dynamicQuery);
@@ -215,7 +215,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -235,7 +235,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -255,7 +255,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param end the upper bound of the range of bars (not inclusive)
 	* @return the range of bars
 	*/
-	@Override
+
 	public java.util.List<com.liferay.testtransaction.model.Bar> getBars(
 		int start, int end) {
 		return _barLocalService.getBars(start, end);
@@ -267,7 +267,7 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _barLocalService.dynamicQueryCount(dynamicQuery);
@@ -280,45 +280,45 @@ public class BarLocalServiceWrapper implements BarLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _barLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public void addBarAndClassName_PortalRollback(java.lang.String text) {
 		_barLocalService.addBarAndClassName_PortalRollback(text);
 	}
 
-	@Override
+
 	public void addBarAndClassName_PortletRollback(java.lang.String text) {
 		_barLocalService.addBarAndClassName_PortletRollback(text);
 	}
 
-	@Override
+
 	public void addBar_Rollback(java.lang.String text) {
 		_barLocalService.addBar_Rollback(text);
 	}
 
-	@Override
+
 	public void deleteBarAndClassName(com.liferay.testtransaction.model.Bar bar)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_barLocalService.deleteBarAndClassName(bar);
 	}
 
-	@Override
+
 	public void testAddClassNameAndBar_Success(java.lang.String text) {
 		_barLocalService.testAddClassNameAndBar_Success(text);
 	}
 
-	@Override
+
 	public BarLocalService getWrappedService() {
 		return _barLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(BarLocalService barLocalService) {
 		_barLocalService = barLocalService;
 	}
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/ClpSerializer.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/ClpSerializer.java
index 4bc3136bb45..7329c0fbcda 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/ClpSerializer.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/messaging/ClpMessageListener.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/messaging/ClpMessageListener.java
index dd69ebf641a..64de4eedbf7 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/messaging/ClpMessageListener.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarPersistence.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarPersistence.java
index 4fa6d176750..aa2cf771c92 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarPersistence.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.persistence;
@@ -222,7 +222,7 @@ public interface BarPersistence extends BasePersistence<Bar> {
 	*/
 	public Bar fetchByPrimaryKey(long barId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, Bar> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -290,6 +290,6 @@ public interface BarPersistence extends BasePersistence<Bar> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarUtil.java b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarUtil.java
index 230b8898fb8..24ba5e903d9 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarUtil.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/service/com/liferay/testtransaction/service/persistence/BarUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.persistence;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/messaging/TestTransactionMessageListener.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/messaging/TestTransactionMessageListener.java
index 5b393bbe3f2..de305fa5e1a 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/messaging/TestTransactionMessageListener.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/messaging/TestTransactionMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.messaging;
@@ -23,7 +23,7 @@ import com.liferay.testtransaction.service.BarLocalServiceUtil;
  */
 public class TestTransactionMessageListener extends BaseMessageListener {
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		boolean rollback = message.getBoolean("rollback");
 		String text = message.getString("text");
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarBaseImpl.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarBaseImpl.java
index 8434c3df081..1a1b270cff3 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarBaseImpl.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model.impl;
@@ -38,7 +38,7 @@ public abstract class BarBaseImpl extends BarModelImpl implements Bar {
 	 *
 	 * Never modify or reference this class directly. All methods that expect a bar model instance should use the {@link Bar} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			BarLocalServiceUtil.addBar(this);
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarCacheModel.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarCacheModel.java
index 76ff6d848b4..74c5da6ab6b 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarCacheModel.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model.impl;
@@ -37,7 +37,7 @@ import java.io.ObjectOutput;
  */
 @ProviderType
 public class BarCacheModel implements CacheModel<Bar>, Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -56,12 +56,12 @@ public class BarCacheModel implements CacheModel<Bar>, Externalizable {
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, barId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(5);
 
@@ -74,7 +74,7 @@ public class BarCacheModel implements CacheModel<Bar>, Externalizable {
 		return sb.toString();
 	}
 
-	@Override
+
 	public Bar toEntityModel() {
 		BarImpl barImpl = new BarImpl();
 
@@ -92,13 +92,13 @@ public class BarCacheModel implements CacheModel<Bar>, Externalizable {
 		return barImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		barId = objectInput.readLong();
 		text = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		objectOutput.writeLong(barId);
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarImpl.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarImpl.java
index f4b6829d82d..9eb621ff78c 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarImpl.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model.impl;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarModelImpl.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarModelImpl.java
index 4a98063ff42..6c4386425fa 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarModelImpl.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/model/impl/BarModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.model.impl;
@@ -93,37 +93,37 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 	public BarModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _barId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setBarId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _barId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return Bar.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return Bar.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -136,7 +136,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		Long barId = (Long)attributes.get("barId");
 
@@ -151,17 +151,17 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		}
 	}
 
-	@Override
+
 	public long getBarId() {
 		return _barId;
 	}
 
-	@Override
+
 	public void setBarId(long barId) {
 		_barId = barId;
 	}
 
-	@Override
+
 	public String getText() {
 		if (_text == null) {
 			return StringPool.BLANK;
@@ -171,7 +171,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		}
 	}
 
-	@Override
+
 	public void setText(String text) {
 		_columnBitmask = -1L;
 
@@ -190,20 +190,20 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(0,
 			Bar.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public Bar toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (Bar)ProxyUtil.newProxyInstance(_classLoader,
@@ -213,7 +213,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		BarImpl barImpl = new BarImpl();
 
@@ -225,7 +225,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return barImpl;
 	}
 
-	@Override
+
 	public int compareTo(Bar bar) {
 		int value = 0;
 
@@ -238,7 +238,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return 0;
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -260,22 +260,22 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		BarModelImpl barModelImpl = this;
 
@@ -284,7 +284,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		barModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<Bar> toCacheModel() {
 		BarCacheModel barCacheModel = new BarCacheModel();
 
@@ -301,7 +301,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return barCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(5);
 
@@ -314,7 +314,7 @@ public class BarModelImpl extends BaseModelImpl<Bar> implements BarModel {
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(10);
 
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceBaseImpl.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceBaseImpl.java
index f3a3b7ad72e..2836c0cace3 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceBaseImpl.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.base;
@@ -78,7 +78,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the bar that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Bar addBar(Bar bar) {
 		bar.setNew(true);
 
@@ -91,7 +91,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param barId the primary key for the new bar
 	 * @return the new bar
 	 */
-	@Override
+
 	public Bar createBar(long barId) {
 		return barPersistence.create(barId);
 	}
@@ -104,7 +104,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a bar with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Bar deleteBar(long barId) throws PortalException {
 		return barPersistence.remove(barId);
 	}
@@ -116,12 +116,12 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the bar that was removed
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public Bar deleteBar(Bar bar) {
 		return barPersistence.remove(bar);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -135,7 +135,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return barPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -152,7 +152,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return barPersistence.findWithDynamicQuery(dynamicQuery, start, end);
@@ -171,7 +171,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return barPersistence.findWithDynamicQuery(dynamicQuery, start, end,
@@ -184,7 +184,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return barPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -196,13 +196,13 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return barPersistence.countWithDynamicQuery(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public Bar fetchBar(long barId) {
 		return barPersistence.fetchByPrimaryKey(barId);
 	}
@@ -214,12 +214,12 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the bar
 	 * @throws PortalException if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar getBar(long barId) throws PortalException {
 		return barPersistence.findByPrimaryKey(barId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -232,7 +232,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -257,13 +257,13 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return barLocalService.deleteBar((Bar)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return barPersistence.findByPrimaryKey(primaryKeyObj);
@@ -280,7 +280,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of bars (not inclusive)
 	 * @return the range of bars
 	 */
-	@Override
+
 	public List<Bar> getBars(int start, int end) {
 		return barPersistence.findAll(start, end);
 	}
@@ -290,7 +290,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of bars
 	 */
-	@Override
+
 	public int getBarsCount() {
 		return barPersistence.countAll();
 	}
@@ -302,7 +302,7 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the bar that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public Bar updateBar(Bar bar) {
 		return barPersistence.update(bar);
 	}
@@ -475,12 +475,12 @@ public abstract class BarLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return BarLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceClpInvoker.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceClpInvoker.java
index a276ab8f68d..18047812097 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceClpInvoker.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/base/BarLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.base;
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/impl/BarLocalServiceImpl.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/impl/BarLocalServiceImpl.java
index 27502757ca9..c35b8907016 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/impl/BarLocalServiceImpl.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/impl/BarLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.impl;
@@ -54,7 +54,7 @@ public class BarLocalServiceImpl extends BarLocalServiceBaseImpl {
 		throw new SystemException();
 	}
 
-	@Override
+
 	public Bar deleteBar(Bar bar) {
 		return barPersistence.remove(bar);
 	}
diff --git a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/persistence/impl/BarPersistenceImpl.java b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/persistence/impl/BarPersistenceImpl.java
index fc343587729..70c0316cd64 100644
--- a/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/persistence/impl/BarPersistenceImpl.java
+++ b/portlets/test-transaction-portlet/docroot/WEB-INF/src/com/liferay/testtransaction/service/persistence/impl/BarPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.testtransaction.service.persistence.impl;
@@ -110,7 +110,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param text the text
 	 * @return the matching bars
 	 */
-	@Override
+
 	public List<Bar> findByText(String text) {
 		return findByText(text, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -127,7 +127,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param end the upper bound of the range of bars (not inclusive)
 	 * @return the range of matching bars
 	 */
-	@Override
+
 	public List<Bar> findByText(String text, int start, int end) {
 		return findByText(text, start, end, null);
 	}
@@ -145,7 +145,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching bars
 	 */
-	@Override
+
 	public List<Bar> findByText(String text, int start, int end,
 		OrderByComparator<Bar> orderByComparator) {
 		return findByText(text, start, end, orderByComparator, true);
@@ -165,7 +165,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching bars
 	 */
-	@Override
+
 	public List<Bar> findByText(String text, int start, int end,
 		OrderByComparator<Bar> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -287,7 +287,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the first matching bar
 	 * @throws NoSuchBarException if a matching bar could not be found
 	 */
-	@Override
+
 	public Bar findByText_First(String text,
 		OrderByComparator<Bar> orderByComparator) throws NoSuchBarException {
 		Bar bar = fetchByText_First(text, orderByComparator);
@@ -315,7 +315,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching bar, or <code>null</code> if a matching bar could not be found
 	 */
-	@Override
+
 	public Bar fetchByText_First(String text,
 		OrderByComparator<Bar> orderByComparator) {
 		List<Bar> list = findByText(text, 0, 1, orderByComparator);
@@ -335,7 +335,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the last matching bar
 	 * @throws NoSuchBarException if a matching bar could not be found
 	 */
-	@Override
+
 	public Bar findByText_Last(String text,
 		OrderByComparator<Bar> orderByComparator) throws NoSuchBarException {
 		Bar bar = fetchByText_Last(text, orderByComparator);
@@ -363,7 +363,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching bar, or <code>null</code> if a matching bar could not be found
 	 */
-	@Override
+
 	public Bar fetchByText_Last(String text,
 		OrderByComparator<Bar> orderByComparator) {
 		int count = countByText(text);
@@ -390,7 +390,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the previous, current, and next bar
 	 * @throws NoSuchBarException if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar[] findByText_PrevAndNext(long barId, String text,
 		OrderByComparator<Bar> orderByComparator) throws NoSuchBarException {
 		Bar bar = findByPrimaryKey(barId);
@@ -544,7 +544,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 *
 	 * @param text the text
 	 */
-	@Override
+
 	public void removeByText(String text) {
 		for (Bar bar : findByText(text, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
 				null)) {
@@ -558,7 +558,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param text the text
 	 * @return the number of matching bars
 	 */
-	@Override
+
 	public int countByText(String text) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_TEXT;
 
@@ -630,7 +630,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 *
 	 * @param bar the bar
 	 */
-	@Override
+
 	public void cacheResult(Bar bar) {
 		entityCache.putResult(BarModelImpl.ENTITY_CACHE_ENABLED, BarImpl.class,
 			bar.getPrimaryKey(), bar);
@@ -643,7 +643,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 *
 	 * @param bars the bars
 	 */
-	@Override
+
 	public void cacheResult(List<Bar> bars) {
 		for (Bar bar : bars) {
 			if (entityCache.getResult(BarModelImpl.ENTITY_CACHE_ENABLED,
@@ -663,7 +663,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(BarImpl.class);
 
@@ -679,7 +679,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(Bar bar) {
 		entityCache.removeResult(BarModelImpl.ENTITY_CACHE_ENABLED,
 			BarImpl.class, bar.getPrimaryKey());
@@ -688,7 +688,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 	}
 
-	@Override
+
 	public void clearCache(List<Bar> bars) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -705,7 +705,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param barId the primary key for the new bar
 	 * @return the new bar
 	 */
-	@Override
+
 	public Bar create(long barId) {
 		Bar bar = new BarImpl();
 
@@ -722,7 +722,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the bar that was removed
 	 * @throws NoSuchBarException if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar remove(long barId) throws NoSuchBarException {
 		return remove((Serializable)barId);
 	}
@@ -734,7 +734,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the bar that was removed
 	 * @throws NoSuchBarException if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar remove(Serializable primaryKey) throws NoSuchBarException {
 		Session session = null;
 
@@ -765,7 +765,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 		}
 	}
 
-	@Override
+
 	protected Bar removeImpl(Bar bar) {
 		bar = toUnwrappedModel(bar);
 
@@ -796,7 +796,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 		return bar;
 	}
 
-	@Override
+
 	public Bar updateImpl(Bar bar) {
 		bar = toUnwrappedModel(bar);
 
@@ -879,7 +879,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the bar
 	 * @throws NoSuchBarException if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchBarException {
 		Bar bar = fetchByPrimaryKey(primaryKey);
@@ -903,7 +903,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @return the bar
 	 * @throws NoSuchBarException if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar findByPrimaryKey(long barId) throws NoSuchBarException {
 		return findByPrimaryKey((Serializable)barId);
 	}
@@ -914,7 +914,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param primaryKey the primary key of the bar
 	 * @return the bar, or <code>null</code> if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar fetchByPrimaryKey(Serializable primaryKey) {
 		Bar bar = (Bar)entityCache.getResult(BarModelImpl.ENTITY_CACHE_ENABLED,
 				BarImpl.class, primaryKey);
@@ -959,12 +959,12 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param barId the primary key of the bar
 	 * @return the bar, or <code>null</code> if a bar with the primary key could not be found
 	 */
-	@Override
+
 	public Bar fetchByPrimaryKey(long barId) {
 		return fetchByPrimaryKey((Serializable)barId);
 	}
 
-	@Override
+
 	public Map<Serializable, Bar> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -1061,7 +1061,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 *
 	 * @return the bars
 	 */
-	@Override
+
 	public List<Bar> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1077,7 +1077,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param end the upper bound of the range of bars (not inclusive)
 	 * @return the range of bars
 	 */
-	@Override
+
 	public List<Bar> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -1094,7 +1094,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of bars
 	 */
-	@Override
+
 	public List<Bar> findAll(int start, int end,
 		OrderByComparator<Bar> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -1113,7 +1113,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of bars
 	 */
-	@Override
+
 	public List<Bar> findAll(int start, int end,
 		OrderByComparator<Bar> orderByComparator, boolean retrieveFromCache) {
 		boolean pagination = true;
@@ -1200,7 +1200,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 * Removes all the bars from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (Bar bar : findAll()) {
 			remove(bar);
@@ -1212,7 +1212,7 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 	 *
 	 * @return the number of bars
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -1244,12 +1244,12 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return BarModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -1282,19 +1282,19 @@ public class BarPersistenceImpl extends BasePersistenceImpl<Bar>
 				"text"
 			});
 	private static final Bar _nullBar = new BarImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<Bar> toCacheModel() {
 				return _nullBarCacheModel;
 			}
 		};
 
 	private static final CacheModel<Bar> _nullBarCacheModel = new CacheModel<Bar>() {
-			@Override
+
 			public Bar toEntityModel() {
 				return _nullBar;
 			}
diff --git a/portlets/test-transaction-portlet/docroot/view.jsp b/portlets/test-transaction-portlet/docroot/view.jsp
index 988bdb28222..1f22303102d 100644
--- a/portlets/test-transaction-portlet/docroot/view.jsp
+++ b/portlets/test-transaction-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/test-user-attributes-portlet/docroot/view.jsp b/portlets/test-user-attributes-portlet/docroot/view.jsp
index 3dc2a750e59..83720535fcb 100644
--- a/portlets/test-user-attributes-portlet/docroot/view.jsp
+++ b/portlets/test-user-attributes-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/model/Event.java b/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/model/Event.java
index 987c0841ab6..be057b7e379 100644
--- a/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/model/Event.java
+++ b/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/model/Event.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tich.model;
diff --git a/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/EventsWebCacheItem.java b/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/EventsWebCacheItem.java
index 12c180fbf6a..ef8e592082a 100644
--- a/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/EventsWebCacheItem.java
+++ b/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/EventsWebCacheItem.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tich.util;
@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class EventsWebCacheItem implements WebCacheItem {
 
-	@Override
+
 	public Object convert(String key) throws WebCacheException {
 		List<Event> events = new ArrayList<>();
 
@@ -67,7 +67,7 @@ public class EventsWebCacheItem implements WebCacheItem {
 		return events;
 	}
 
-	@Override
+
 	public long getRefreshTime() {
 		return _REFRESH_TIME;
 	}
diff --git a/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/TICHUtil.java b/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/TICHUtil.java
index b9e21ed69df..ce13cdf0adb 100644
--- a/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/TICHUtil.java
+++ b/portlets/tich-portlet/docroot/WEB-INF/src/com/liferay/tich/util/TICHUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.tich.util;
diff --git a/portlets/tich-portlet/docroot/view.jsp b/portlets/tich-portlet/docroot/view.jsp
index 1cb2c93e070..536211d6ad5 100644
--- a/portlets/tich-portlet/docroot/view.jsp
+++ b/portlets/tich-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/vimeo-portlet/docroot/configuration.jsp b/portlets/vimeo-portlet/docroot/configuration.jsp
index 35f424afc61..27f654276cd 100644
--- a/portlets/vimeo-portlet/docroot/configuration.jsp
+++ b/portlets/vimeo-portlet/docroot/configuration.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/vimeo-portlet/docroot/init.jsp b/portlets/vimeo-portlet/docroot/init.jsp
index 83231c88ce2..c1e14258b7b 100644
--- a/portlets/vimeo-portlet/docroot/init.jsp
+++ b/portlets/vimeo-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/vimeo-portlet/docroot/view.jsp b/portlets/vimeo-portlet/docroot/view.jsp
index 9c8a703f1f7..c22a333fa85 100644
--- a/portlets/vimeo-portlet/docroot/view.jsp
+++ b/portlets/vimeo-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/Meeting.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/Meeting.java
index f8d05d0c9d1..cc025b7c8d5 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/Meeting.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/Meeting.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingAttendeeOptions.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingAttendeeOptions.java
index 388366945d4..623fb28fbb8 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingAttendeeOptions.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingAttendeeOptions.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingConfirmation.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingConfirmation.java
index 33cb88479a8..b8947395b53 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingConfirmation.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingConfirmation.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingContext.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingContext.java
index d75873958e3..ddde53e45e9 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingContext.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingContext.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingException.java
index 0970928df70..2f93aae3fdd 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingOptions.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingOptions.java
index ae0128ffb36..80da0accc95 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingOptions.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingOptions.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingParticipant.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingParticipant.java
index 192c3dd36dc..4f0160a1d6b 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingParticipant.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingParticipant.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
@@ -25,7 +25,7 @@ import java.util.TimeZone;
  */
 public class MeetingParticipant implements Serializable {
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -72,7 +72,7 @@ public class MeetingParticipant implements Serializable {
 		return _timeZone;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _emailAddress.hashCode();
 	}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingRequest.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingRequest.java
index 766eae8deff..bade0acf98b 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingRequest.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingRequest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingService.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingService.java
index 085aee53eaf..57596869ecb 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingService.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingSummary.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingSummary.java
index 374c720be4c..d08e1c0e958 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingSummary.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingSummary.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingTelephonyOptions.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingTelephonyOptions.java
index cae852754dc..3e61f6d1d16 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingTelephonyOptions.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/MeetingTelephonyOptions.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchAccountException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchAccountException.java
index 362eaa258bc..065f0070c85 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchAccountException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchAccountException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchSiteException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchSiteException.java
index 108a0c6d85e..60201a697b3 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchSiteException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/NoSuchSiteException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountLoginException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountLoginException.java
index 9c51e4a1db4..d4f6ed66068 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountLoginException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountLoginException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountPasswordException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountPasswordException.java
index 612e7df3bd5..a604c0b3981 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountPasswordException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExAccountPasswordException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteAPIURLException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteAPIURLException.java
index 3091ed9e743..26259b12f2a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteAPIURLException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteAPIURLException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteKeyException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteKeyException.java
index 9957322391b..5b3ede2463d 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteKeyException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteKeyException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteLoginException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteLoginException.java
index dea85021f47..af82a2aa5f3 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteLoginException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteLoginException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteNameException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteNameException.java
index d8911686df0..c7bcc7b6a3f 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteNameException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSiteNameException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSitePasswordException.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSitePasswordException.java
index e8df5745db0..af1817a174a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSitePasswordException.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/exception/WebExSitePasswordException.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.exception;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccount.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccount.java
index 972f40a3c0e..17a9979dd47 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccount.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccount.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -38,17 +38,17 @@ public interface WebExAccount extends WebExAccountModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.meeting.webex.model.impl.WebExAccountImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<WebExAccount, Long> WEB_EX_ACCOUNT_ID_ACCESSOR = new Accessor<WebExAccount, Long>() {
-			@Override
+
 			public Long get(WebExAccount webExAccount) {
 				return webExAccount.getWebExAccountId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<WebExAccount> getTypeClass() {
 				return WebExAccount.class;
 			}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountClp.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountClp.java
index 741b04c1314..0debca9b2c5 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountClp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -50,37 +50,37 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 	public WebExAccountClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return WebExAccount.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return WebExAccount.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _webExAccountId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setWebExAccountId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _webExAccountId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -102,7 +102,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -174,12 +174,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public String getUuid() {
 		return _uuid;
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		_uuid = uuid;
 
@@ -197,12 +197,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public long getWebExAccountId() {
 		return _webExAccountId;
 	}
 
-	@Override
+
 	public void setWebExAccountId(long webExAccountId) {
 		_webExAccountId = webExAccountId;
 
@@ -220,12 +220,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -243,12 +243,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -266,12 +266,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -289,7 +289,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -301,16 +301,16 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -328,12 +328,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -351,12 +351,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -374,12 +374,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public long getWebExSiteId() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setWebExSiteId(long webExSiteId) {
 		_webExSiteId = webExSiteId;
 
@@ -397,12 +397,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public String getLogin() {
 		return _login;
 	}
 
-	@Override
+
 	public void setLogin(String login) {
 		_login = login;
 
@@ -420,12 +420,12 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public String getPassword() {
 		return _password;
 	}
 
-	@Override
+
 	public void setPassword(String password) {
 		_password = password;
 
@@ -443,7 +443,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public com.liferay.meeting.MeetingContext getMeetingContext() {
 		try {
 			String methodName = "getMeetingContext";
@@ -462,7 +462,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSite() {
 		try {
 			String methodName = "getWebExSite";
@@ -481,7 +481,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				WebExAccount.class.getName()));
@@ -536,7 +536,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			WebExAccountLocalServiceUtil.addWebExAccount(this);
@@ -546,13 +546,13 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public WebExAccount toEscapedModel() {
 		return (WebExAccount)ProxyUtil.newProxyInstance(WebExAccount.class.getClassLoader(),
 			new Class[] { WebExAccount.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		WebExAccountClp clone = new WebExAccountClp();
 
@@ -571,7 +571,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(WebExAccount webExAccount) {
 		long primaryKey = webExAccount.getPrimaryKey();
 
@@ -586,7 +586,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -612,22 +612,22 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(23);
 
@@ -658,7 +658,7 @@ public class WebExAccountClp extends BaseModelImpl<WebExAccount>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(37);
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountModel.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountModel.java
index 711d64b719c..f5ad6151bb5 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountModel.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -72,7 +72,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 * @return the uuid of this web ex account
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUuid();
 
 	/**
@@ -80,7 +80,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param uuid the uuid of this web ex account
 	 */
-	@Override
+
 	public void setUuid(String uuid);
 
 	/**
@@ -102,7 +102,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @return the group ID of this web ex account
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -110,7 +110,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param groupId the group ID of this web ex account
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -118,7 +118,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @return the company ID of this web ex account
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -126,7 +126,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param companyId the company ID of this web ex account
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -134,7 +134,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @return the user ID of this web ex account
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -142,7 +142,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param userId the user ID of this web ex account
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -150,7 +150,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @return the user uuid of this web ex account
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -158,7 +158,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param userUuid the user uuid of this web ex account
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -167,7 +167,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 * @return the user name of this web ex account
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -175,7 +175,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param userName the user name of this web ex account
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -183,7 +183,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @return the create date of this web ex account
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -191,7 +191,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param createDate the create date of this web ex account
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -199,7 +199,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @return the modified date of this web ex account
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -207,7 +207,7 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 *
 	 * @param modifiedDate the modified date of this web ex account
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -254,61 +254,61 @@ public interface WebExAccountModel extends BaseModel<WebExAccount>, GroupedModel
 	 */
 	public void setPassword(String password);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.meeting.webex.model.WebExAccount> toCacheModel();
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount toEscapedModel();
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountSoap.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountSoap.java
index d22e1d8e718..4a70285179e 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountSoap.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountWrapper.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountWrapper.java
index 38fe68a5628..f01ba15997a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountWrapper.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExAccountWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -46,17 +46,17 @@ public class WebExAccountWrapper implements WebExAccount,
 		_webExAccount = webExAccount;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return WebExAccount.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return WebExAccount.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -75,7 +75,7 @@ public class WebExAccountWrapper implements WebExAccount,
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -144,70 +144,70 @@ public class WebExAccountWrapper implements WebExAccount,
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _webExAccount.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _webExAccount.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _webExAccount.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _webExAccount.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.meeting.MeetingContext getMeetingContext()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExAccount.getMeetingContext();
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount toEscapedModel() {
 		return new WebExAccountWrapper(_webExAccount.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount toUnescapedModel() {
 		return new WebExAccountWrapper(_webExAccount.toUnescapedModel());
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSite()
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExAccount.getWebExSite();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.meeting.webex.model.WebExAccount> toCacheModel() {
 		return _webExAccount.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount) {
 		return _webExAccount.compareTo(webExAccount);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _webExAccount.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _webExAccount.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new WebExAccountWrapper((WebExAccount)_webExAccount.clone());
 	}
@@ -217,7 +217,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the login of this web ex account
 	*/
-	@Override
+
 	public java.lang.String getLogin() {
 		return _webExAccount.getLogin();
 	}
@@ -227,7 +227,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the password of this web ex account
 	*/
-	@Override
+
 	public java.lang.String getPassword() {
 		return _webExAccount.getPassword();
 	}
@@ -237,7 +237,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the user name of this web ex account
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _webExAccount.getUserName();
 	}
@@ -247,7 +247,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the user uuid of this web ex account
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _webExAccount.getUserUuid();
 	}
@@ -257,17 +257,17 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the uuid of this web ex account
 	*/
-	@Override
+
 	public java.lang.String getUuid() {
 		return _webExAccount.getUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _webExAccount.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _webExAccount.toXmlString();
 	}
@@ -277,7 +277,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the create date of this web ex account
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _webExAccount.getCreateDate();
 	}
@@ -287,7 +287,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the modified date of this web ex account
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _webExAccount.getModifiedDate();
 	}
@@ -297,7 +297,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the company ID of this web ex account
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _webExAccount.getCompanyId();
 	}
@@ -307,7 +307,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the group ID of this web ex account
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _webExAccount.getGroupId();
 	}
@@ -317,7 +317,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the primary key of this web ex account
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _webExAccount.getPrimaryKey();
 	}
@@ -327,7 +327,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the user ID of this web ex account
 	*/
-	@Override
+
 	public long getUserId() {
 		return _webExAccount.getUserId();
 	}
@@ -337,7 +337,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the web ex account ID of this web ex account
 	*/
-	@Override
+
 	public long getWebExAccountId() {
 		return _webExAccount.getWebExAccountId();
 	}
@@ -347,17 +347,17 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @return the web ex site ID of this web ex account
 	*/
-	@Override
+
 	public long getWebExSiteId() {
 		return _webExAccount.getWebExSiteId();
 	}
 
-	@Override
+
 	public void persist() {
 		_webExAccount.persist();
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_webExAccount.setCachedModel(cachedModel);
 	}
@@ -367,7 +367,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param companyId the company ID of this web ex account
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_webExAccount.setCompanyId(companyId);
 	}
@@ -377,23 +377,23 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param createDate the create date of this web ex account
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_webExAccount.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_webExAccount.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_webExAccount.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_webExAccount.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -403,7 +403,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param groupId the group ID of this web ex account
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_webExAccount.setGroupId(groupId);
 	}
@@ -413,7 +413,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param login the login of this web ex account
 	*/
-	@Override
+
 	public void setLogin(java.lang.String login) {
 		_webExAccount.setLogin(login);
 	}
@@ -423,12 +423,12 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param modifiedDate the modified date of this web ex account
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_webExAccount.setModifiedDate(modifiedDate);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_webExAccount.setNew(n);
 	}
@@ -438,7 +438,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param password the password of this web ex account
 	*/
-	@Override
+
 	public void setPassword(java.lang.String password) {
 		_webExAccount.setPassword(password);
 	}
@@ -448,12 +448,12 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param primaryKey the primary key of this web ex account
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_webExAccount.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_webExAccount.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -463,7 +463,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param userId the user ID of this web ex account
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_webExAccount.setUserId(userId);
 	}
@@ -473,7 +473,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param userName the user name of this web ex account
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_webExAccount.setUserName(userName);
 	}
@@ -483,7 +483,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param userUuid the user uuid of this web ex account
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_webExAccount.setUserUuid(userUuid);
 	}
@@ -493,7 +493,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param uuid the uuid of this web ex account
 	*/
-	@Override
+
 	public void setUuid(java.lang.String uuid) {
 		_webExAccount.setUuid(uuid);
 	}
@@ -503,7 +503,7 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param webExAccountId the web ex account ID of this web ex account
 	*/
-	@Override
+
 	public void setWebExAccountId(long webExAccountId) {
 		_webExAccount.setWebExAccountId(webExAccountId);
 	}
@@ -513,12 +513,12 @@ public class WebExAccountWrapper implements WebExAccount,
 	*
 	* @param webExSiteId the web ex site ID of this web ex account
 	*/
-	@Override
+
 	public void setWebExSiteId(long webExSiteId) {
 		_webExAccount.setWebExSiteId(webExSiteId);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -537,27 +537,27 @@ public class WebExAccountWrapper implements WebExAccount,
 		return false;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return _webExAccount.getStagedModelType();
 	}
 
-	@Override
+
 	public WebExAccount getWrappedModel() {
 		return _webExAccount;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _webExAccount.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _webExAccount.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_webExAccount.resetOriginalValues();
 	}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSite.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSite.java
index fd4fb01d0a6..751302491c9 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSite.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSite.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -38,17 +38,17 @@ public interface WebExSite extends WebExSiteModel, PersistedModel {
 	 * Never modify this interface directly. Add methods to {@link com.liferay.meeting.webex.model.impl.WebExSiteImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
 	public static final Accessor<WebExSite, Long> WEB_EX_SITE_ID_ACCESSOR = new Accessor<WebExSite, Long>() {
-			@Override
+
 			public Long get(WebExSite webExSite) {
 				return webExSite.getWebExSiteId();
 			}
 
-			@Override
+
 			public Class<Long> getAttributeClass() {
 				return Long.class;
 			}
 
-			@Override
+
 			public Class<WebExSite> getTypeClass() {
 				return WebExSite.class;
 			}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteClp.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteClp.java
index a991269bbf7..4397b1b57ab 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteClp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -49,37 +49,37 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 	public WebExSiteClp() {
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return WebExSite.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return WebExSite.class.getName();
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setWebExSiteId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -104,7 +104,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -194,12 +194,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		_finderCacheEnabled = GetterUtil.getBoolean("finderCacheEnabled");
 	}
 
-	@Override
+
 	public String getUuid() {
 		return _uuid;
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		_uuid = uuid;
 
@@ -217,12 +217,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public long getWebExSiteId() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setWebExSiteId(long webExSiteId) {
 		_webExSiteId = webExSiteId;
 
@@ -240,12 +240,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_groupId = groupId;
 
@@ -263,12 +263,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_companyId = companyId;
 
@@ -286,12 +286,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 
@@ -309,7 +309,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -321,16 +321,16 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
-	@Override
+
 	public String getUserName() {
 		return _userName;
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 
@@ -348,12 +348,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 
@@ -371,12 +371,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 
@@ -394,12 +394,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public String getName() {
 		return _name;
 	}
 
-	@Override
+
 	public void setName(String name) {
 		_name = name;
 
@@ -417,12 +417,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public String getApiURL() {
 		return _apiURL;
 	}
 
-	@Override
+
 	public void setApiURL(String apiURL) {
 		_apiURL = apiURL;
 
@@ -440,12 +440,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public String getLogin() {
 		return _login;
 	}
 
-	@Override
+
 	public void setLogin(String login) {
 		_login = login;
 
@@ -463,12 +463,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public String getPassword() {
 		return _password;
 	}
 
-	@Override
+
 	public void setPassword(String password) {
 		_password = password;
 
@@ -486,12 +486,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public String getPartnerKey() {
 		return _partnerKey;
 	}
 
-	@Override
+
 	public void setPartnerKey(String partnerKey) {
 		_partnerKey = partnerKey;
 
@@ -509,12 +509,12 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public long getSiteKey() {
 		return _siteKey;
 	}
 
-	@Override
+
 	public void setSiteKey(long siteKey) {
 		_siteKey = siteKey;
 
@@ -532,7 +532,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccounts() {
 		try {
 			String methodName = "getWebExAccounts";
@@ -552,7 +552,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				WebExSite.class.getName()));
@@ -607,7 +607,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		return returnValue;
 	}
 
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			WebExSiteLocalServiceUtil.addWebExSite(this);
@@ -617,13 +617,13 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public WebExSite toEscapedModel() {
 		return (WebExSite)ProxyUtil.newProxyInstance(WebExSite.class.getClassLoader(),
 			new Class[] { WebExSite.class }, new AutoEscapeBeanHandler(this));
 	}
 
-	@Override
+
 	public Object clone() {
 		WebExSiteClp clone = new WebExSiteClp();
 
@@ -645,7 +645,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		return clone;
 	}
 
-	@Override
+
 	public int compareTo(WebExSite webExSite) {
 		long primaryKey = webExSite.getPrimaryKey();
 
@@ -660,7 +660,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -686,22 +686,22 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		return _clpSerializerClass;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _entityCacheEnabled;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _finderCacheEnabled;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(29);
 
@@ -738,7 +738,7 @@ public class WebExSiteClp extends BaseModelImpl<WebExSite> implements WebExSite
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(46);
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteModel.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteModel.java
index 2de4f3fa06f..8498ac37300 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteModel.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -72,7 +72,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 * @return the uuid of this web ex site
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUuid();
 
 	/**
@@ -80,7 +80,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param uuid the uuid of this web ex site
 	 */
-	@Override
+
 	public void setUuid(String uuid);
 
 	/**
@@ -102,7 +102,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @return the group ID of this web ex site
 	 */
-	@Override
+
 	public long getGroupId();
 
 	/**
@@ -110,7 +110,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param groupId the group ID of this web ex site
 	 */
-	@Override
+
 	public void setGroupId(long groupId);
 
 	/**
@@ -118,7 +118,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @return the company ID of this web ex site
 	 */
-	@Override
+
 	public long getCompanyId();
 
 	/**
@@ -126,7 +126,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param companyId the company ID of this web ex site
 	 */
-	@Override
+
 	public void setCompanyId(long companyId);
 
 	/**
@@ -134,7 +134,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @return the user ID of this web ex site
 	 */
-	@Override
+
 	public long getUserId();
 
 	/**
@@ -142,7 +142,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param userId the user ID of this web ex site
 	 */
-	@Override
+
 	public void setUserId(long userId);
 
 	/**
@@ -150,7 +150,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @return the user uuid of this web ex site
 	 */
-	@Override
+
 	public String getUserUuid();
 
 	/**
@@ -158,7 +158,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param userUuid the user uuid of this web ex site
 	 */
-	@Override
+
 	public void setUserUuid(String userUuid);
 
 	/**
@@ -167,7 +167,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 * @return the user name of this web ex site
 	 */
 	@AutoEscape
-	@Override
+
 	public String getUserName();
 
 	/**
@@ -175,7 +175,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param userName the user name of this web ex site
 	 */
-	@Override
+
 	public void setUserName(String userName);
 
 	/**
@@ -183,7 +183,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @return the create date of this web ex site
 	 */
-	@Override
+
 	public Date getCreateDate();
 
 	/**
@@ -191,7 +191,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param createDate the create date of this web ex site
 	 */
-	@Override
+
 	public void setCreateDate(Date createDate);
 
 	/**
@@ -199,7 +199,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @return the modified date of this web ex site
 	 */
-	@Override
+
 	public Date getModifiedDate();
 
 	/**
@@ -207,7 +207,7 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 *
 	 * @param modifiedDate the modified date of this web ex site
 	 */
-	@Override
+
 	public void setModifiedDate(Date modifiedDate);
 
 	/**
@@ -299,60 +299,60 @@ public interface WebExSiteModel extends BaseModel<WebExSite>, GroupedModel,
 	 */
 	public void setSiteKey(long siteKey);
 
-	@Override
+
 	public boolean isNew();
 
-	@Override
+
 	public void setNew(boolean n);
 
-	@Override
+
 	public boolean isCachedModel();
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel);
 
-	@Override
+
 	public boolean isEscapedModel();
 
-	@Override
+
 	public Serializable getPrimaryKeyObj();
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj);
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge();
 
-	@Override
+
 	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
 
-	@Override
+
 	public Object clone();
 
-	@Override
+
 	public int compareTo(com.liferay.meeting.webex.model.WebExSite webExSite);
 
-	@Override
+
 	public int hashCode();
 
-	@Override
+
 	public CacheModel<com.liferay.meeting.webex.model.WebExSite> toCacheModel();
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite toEscapedModel();
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite toUnescapedModel();
 
-	@Override
+
 	public String toString();
 
-	@Override
+
 	public String toXmlString();
 }
\ No newline at end of file
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteSoap.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteSoap.java
index 395d95cead5..25ad1e50fba 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteSoap.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteWrapper.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteWrapper.java
index f34bfbcbe23..f510024db1d 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteWrapper.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/model/WebExSiteWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model;
@@ -45,17 +45,17 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 		_webExSite = webExSite;
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return WebExSite.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return WebExSite.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -77,7 +77,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -164,57 +164,57 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 		}
 	}
 
-	@Override
+
 	public boolean isCachedModel() {
 		return _webExSite.isCachedModel();
 	}
 
-	@Override
+
 	public boolean isEscapedModel() {
 		return _webExSite.isEscapedModel();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _webExSite.isNew();
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return _webExSite.getExpandoBridge();
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite toEscapedModel() {
 		return new WebExSiteWrapper(_webExSite.toEscapedModel());
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite toUnescapedModel() {
 		return new WebExSiteWrapper(_webExSite.toUnescapedModel());
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.CacheModel<com.liferay.meeting.webex.model.WebExSite> toCacheModel() {
 		return _webExSite.toCacheModel();
 	}
 
-	@Override
+
 	public int compareTo(com.liferay.meeting.webex.model.WebExSite webExSite) {
 		return _webExSite.compareTo(webExSite);
 	}
 
-	@Override
+
 	public int hashCode() {
 		return _webExSite.hashCode();
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _webExSite.getPrimaryKeyObj();
 	}
 
-	@Override
+
 	public java.lang.Object clone() {
 		return new WebExSiteWrapper((WebExSite)_webExSite.clone());
 	}
@@ -224,7 +224,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the api u r l of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getApiURL() {
 		return _webExSite.getApiURL();
 	}
@@ -234,7 +234,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the login of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getLogin() {
 		return _webExSite.getLogin();
 	}
@@ -244,7 +244,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the name of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getName() {
 		return _webExSite.getName();
 	}
@@ -254,7 +254,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the partner key of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getPartnerKey() {
 		return _webExSite.getPartnerKey();
 	}
@@ -264,7 +264,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the password of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getPassword() {
 		return _webExSite.getPassword();
 	}
@@ -274,7 +274,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the user name of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getUserName() {
 		return _webExSite.getUserName();
 	}
@@ -284,7 +284,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the user uuid of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getUserUuid() {
 		return _webExSite.getUserUuid();
 	}
@@ -294,17 +294,17 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the uuid of this web ex site
 	*/
-	@Override
+
 	public java.lang.String getUuid() {
 		return _webExSite.getUuid();
 	}
 
-	@Override
+
 	public java.lang.String toString() {
 		return _webExSite.toString();
 	}
 
-	@Override
+
 	public java.lang.String toXmlString() {
 		return _webExSite.toXmlString();
 	}
@@ -314,7 +314,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the create date of this web ex site
 	*/
-	@Override
+
 	public Date getCreateDate() {
 		return _webExSite.getCreateDate();
 	}
@@ -324,12 +324,12 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the modified date of this web ex site
 	*/
-	@Override
+
 	public Date getModifiedDate() {
 		return _webExSite.getModifiedDate();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccounts() {
 		return _webExSite.getWebExAccounts();
 	}
@@ -339,7 +339,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the company ID of this web ex site
 	*/
-	@Override
+
 	public long getCompanyId() {
 		return _webExSite.getCompanyId();
 	}
@@ -349,7 +349,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the group ID of this web ex site
 	*/
-	@Override
+
 	public long getGroupId() {
 		return _webExSite.getGroupId();
 	}
@@ -359,7 +359,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the primary key of this web ex site
 	*/
-	@Override
+
 	public long getPrimaryKey() {
 		return _webExSite.getPrimaryKey();
 	}
@@ -369,7 +369,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the site key of this web ex site
 	*/
-	@Override
+
 	public long getSiteKey() {
 		return _webExSite.getSiteKey();
 	}
@@ -379,7 +379,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the user ID of this web ex site
 	*/
-	@Override
+
 	public long getUserId() {
 		return _webExSite.getUserId();
 	}
@@ -389,12 +389,12 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @return the web ex site ID of this web ex site
 	*/
-	@Override
+
 	public long getWebExSiteId() {
 		return _webExSite.getWebExSiteId();
 	}
 
-	@Override
+
 	public void persist() {
 		_webExSite.persist();
 	}
@@ -404,12 +404,12 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param apiURL the api u r l of this web ex site
 	*/
-	@Override
+
 	public void setApiURL(java.lang.String apiURL) {
 		_webExSite.setApiURL(apiURL);
 	}
 
-	@Override
+
 	public void setCachedModel(boolean cachedModel) {
 		_webExSite.setCachedModel(cachedModel);
 	}
@@ -419,7 +419,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param companyId the company ID of this web ex site
 	*/
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_webExSite.setCompanyId(companyId);
 	}
@@ -429,23 +429,23 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param createDate the create date of this web ex site
 	*/
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_webExSite.setCreateDate(createDate);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge) {
 		_webExSite.setExpandoBridgeAttributes(expandoBridge);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(
 		com.liferay.portal.kernel.model.BaseModel<?> baseModel) {
 		_webExSite.setExpandoBridgeAttributes(baseModel);
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		_webExSite.setExpandoBridgeAttributes(serviceContext);
 	}
@@ -455,7 +455,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param groupId the group ID of this web ex site
 	*/
-	@Override
+
 	public void setGroupId(long groupId) {
 		_webExSite.setGroupId(groupId);
 	}
@@ -465,7 +465,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param login the login of this web ex site
 	*/
-	@Override
+
 	public void setLogin(java.lang.String login) {
 		_webExSite.setLogin(login);
 	}
@@ -475,7 +475,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param modifiedDate the modified date of this web ex site
 	*/
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_webExSite.setModifiedDate(modifiedDate);
 	}
@@ -485,12 +485,12 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param name the name of this web ex site
 	*/
-	@Override
+
 	public void setName(java.lang.String name) {
 		_webExSite.setName(name);
 	}
 
-	@Override
+
 	public void setNew(boolean n) {
 		_webExSite.setNew(n);
 	}
@@ -500,7 +500,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param partnerKey the partner key of this web ex site
 	*/
-	@Override
+
 	public void setPartnerKey(java.lang.String partnerKey) {
 		_webExSite.setPartnerKey(partnerKey);
 	}
@@ -510,7 +510,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param password the password of this web ex site
 	*/
-	@Override
+
 	public void setPassword(java.lang.String password) {
 		_webExSite.setPassword(password);
 	}
@@ -520,12 +520,12 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param primaryKey the primary key of this web ex site
 	*/
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		_webExSite.setPrimaryKey(primaryKey);
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		_webExSite.setPrimaryKeyObj(primaryKeyObj);
 	}
@@ -535,7 +535,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param siteKey the site key of this web ex site
 	*/
-	@Override
+
 	public void setSiteKey(long siteKey) {
 		_webExSite.setSiteKey(siteKey);
 	}
@@ -545,7 +545,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param userId the user ID of this web ex site
 	*/
-	@Override
+
 	public void setUserId(long userId) {
 		_webExSite.setUserId(userId);
 	}
@@ -555,7 +555,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param userName the user name of this web ex site
 	*/
-	@Override
+
 	public void setUserName(java.lang.String userName) {
 		_webExSite.setUserName(userName);
 	}
@@ -565,7 +565,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param userUuid the user uuid of this web ex site
 	*/
-	@Override
+
 	public void setUserUuid(java.lang.String userUuid) {
 		_webExSite.setUserUuid(userUuid);
 	}
@@ -575,7 +575,7 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param uuid the uuid of this web ex site
 	*/
-	@Override
+
 	public void setUuid(java.lang.String uuid) {
 		_webExSite.setUuid(uuid);
 	}
@@ -585,12 +585,12 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 	*
 	* @param webExSiteId the web ex site ID of this web ex site
 	*/
-	@Override
+
 	public void setWebExSiteId(long webExSiteId) {
 		_webExSite.setWebExSiteId(webExSiteId);
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -609,27 +609,27 @@ public class WebExSiteWrapper implements WebExSite, ModelWrapper<WebExSite> {
 		return false;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return _webExSite.getStagedModelType();
 	}
 
-	@Override
+
 	public WebExSite getWrappedModel() {
 		return _webExSite;
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return _webExSite.isEntityCacheEnabled();
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return _webExSite.isFinderCacheEnabled();
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		_webExSite.resetOriginalValues();
 	}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/ClpSerializer.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/ClpSerializer.java
index 6d47f8c66dc..a71f034a765 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/ClpSerializer.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalService.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalService.java
index c972d34f47c..a09f2bfdf46 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalService.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -166,11 +166,11 @@ public interface WebExAccountLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -186,7 +186,7 @@ public interface WebExAccountLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getWebExSiteWebExAccountsCount(long groupId, long webExSiteId);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceClp.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceClp.java
index 1a30fd65ebb..0b366093b6b 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceClp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -191,7 +191,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount addWebExAccount(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount) {
 		Object returnObj = null;
@@ -216,7 +216,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount createWebExAccount(
 		long webExAccountId) {
 		Object returnObj = null;
@@ -240,7 +240,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount deleteWebExAccount(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -270,7 +270,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount deleteWebExAccount(
 		long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -299,7 +299,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount fetchWebExAccount(
 		long webExAccountId) {
 		Object returnObj = null;
@@ -323,7 +323,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount fetchWebExAccountByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		Object returnObj = null;
@@ -348,7 +348,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount getWebExAccount(
 		long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -377,7 +377,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount getWebExAccountByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -407,7 +407,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount updateWebExAccount(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount) {
 		Object returnObj = null;
@@ -432,7 +432,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -455,7 +455,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -478,7 +478,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		Object returnObj = null;
@@ -505,7 +505,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -528,7 +528,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -558,7 +558,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -588,7 +588,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getWebExAccountsCount() {
 		Object returnObj = null;
 
@@ -611,7 +611,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public int getWebExSiteWebExAccountsCount(long groupId, long webExSiteId) {
 		Object returnObj = null;
 
@@ -635,14 +635,14 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -665,7 +665,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -690,7 +690,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -722,7 +722,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -757,7 +757,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccounts(
 		int start, int end) {
 		Object returnObj = null;
@@ -781,7 +781,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccountsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		Object returnObj = null;
@@ -806,7 +806,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccountsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.meeting.webex.model.WebExAccount> orderByComparator) {
@@ -842,7 +842,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId) {
 		Object returnObj = null;
@@ -867,7 +867,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId, int start, int end) {
 		Object returnObj = null;
@@ -892,7 +892,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -928,7 +928,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -953,7 +953,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -983,7 +983,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void addWebExAccount(long userId, long groupId, long webExSiteId,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -1022,7 +1022,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		}
 	}
 
-	@Override
+
 	public void deleteWebExSiteWebExAccounts(long groupId, long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
@@ -1046,7 +1046,7 @@ public class WebExAccountLocalServiceClp implements WebExAccountLocalService {
 		}
 	}
 
-	@Override
+
 	public void updateWebExAccount(long webExAccountId,
 		java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceUtil.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceUtil.java
index d32255f72c3..15f3d25f451 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceWrapper.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceWrapper.java
index 4e9051e4d45..5743abdfd84 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceWrapper.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -39,7 +39,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param webExAccount the web ex account
 	* @return the web ex account that was added
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount addWebExAccount(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount) {
 		return _webExAccountLocalService.addWebExAccount(webExAccount);
@@ -51,7 +51,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param webExAccountId the primary key for the new web ex account
 	* @return the new web ex account
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount createWebExAccount(
 		long webExAccountId) {
 		return _webExAccountLocalService.createWebExAccount(webExAccountId);
@@ -64,7 +64,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @return the web ex account that was removed
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount deleteWebExAccount(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -78,14 +78,14 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @return the web ex account that was removed
 	* @throws PortalException if a web ex account with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount deleteWebExAccount(
 		long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExAccountLocalService.deleteWebExAccount(webExAccountId);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount fetchWebExAccount(
 		long webExAccountId) {
 		return _webExAccountLocalService.fetchWebExAccount(webExAccountId);
@@ -98,7 +98,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param groupId the primary key of the group
 	* @return the matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount fetchWebExAccountByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		return _webExAccountLocalService.fetchWebExAccountByUuidAndGroupId(uuid,
@@ -112,7 +112,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @return the web ex account
 	* @throws PortalException if a web ex account with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount getWebExAccount(
 		long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -127,7 +127,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @return the matching web ex account
 	* @throws PortalException if a matching web ex account could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount getWebExAccountByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -141,29 +141,29 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param webExAccount the web ex account
 	* @return the web ex account that was updated
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount updateWebExAccount(
 		com.liferay.meeting.webex.model.WebExAccount webExAccount) {
 		return _webExAccountLocalService.updateWebExAccount(webExAccount);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _webExAccountLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _webExAccountLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		return _webExAccountLocalService.getExportActionableDynamicQuery(portletDataContext);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _webExAccountLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -171,14 +171,14 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExAccountLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -190,18 +190,18 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	*
 	* @return the number of web ex accounts
 	*/
-	@Override
+
 	public int getWebExAccountsCount() {
 		return _webExAccountLocalService.getWebExAccountsCount();
 	}
 
-	@Override
+
 	public int getWebExSiteWebExAccountsCount(long groupId, long webExSiteId) {
 		return _webExAccountLocalService.getWebExSiteWebExAccountsCount(groupId,
 			webExSiteId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -214,7 +214,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _webExAccountLocalService.getOSGiServiceIdentifier();
 	}
@@ -225,7 +225,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _webExAccountLocalService.dynamicQuery(dynamicQuery);
@@ -243,7 +243,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -263,7 +263,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -283,7 +283,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param end the upper bound of the range of web ex accounts (not inclusive)
 	* @return the range of web ex accounts
 	*/
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccounts(
 		int start, int end) {
 		return _webExAccountLocalService.getWebExAccounts(start, end);
@@ -296,7 +296,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param companyId the primary key of the company
 	* @return the matching web ex accounts, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccountsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		return _webExAccountLocalService.getWebExAccountsByUuidAndCompanyId(uuid,
@@ -313,7 +313,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the range of matching web ex accounts, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExAccountsByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.meeting.webex.model.WebExAccount> orderByComparator) {
@@ -321,21 +321,21 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 			companyId, start, end, orderByComparator);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId) {
 		return _webExAccountLocalService.getWebExSiteWebExAccounts(groupId,
 			webExSiteId);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId, int start, int end) {
 		return _webExAccountLocalService.getWebExSiteWebExAccounts(groupId,
 			webExSiteId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -349,7 +349,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _webExAccountLocalService.dynamicQueryCount(dynamicQuery);
@@ -362,7 +362,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -370,7 +370,7 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 			projection);
 	}
 
-	@Override
+
 	public void addWebExAccount(long userId, long groupId, long webExSiteId,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -379,14 +379,14 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 			login, password, serviceContext);
 	}
 
-	@Override
+
 	public void deleteWebExSiteWebExAccounts(long groupId, long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_webExAccountLocalService.deleteWebExSiteWebExAccounts(groupId,
 			webExSiteId);
 	}
 
-	@Override
+
 	public void updateWebExAccount(long webExAccountId,
 		java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -395,12 +395,12 @@ public class WebExAccountLocalServiceWrapper implements WebExAccountLocalService
 			serviceContext);
 	}
 
-	@Override
+
 	public WebExAccountLocalService getWrappedService() {
 		return _webExAccountLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(
 		WebExAccountLocalService webExAccountLocalService) {
 		_webExAccountLocalService = webExAccountLocalService;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountService.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountService.java
index fe3fc813c62..6426ce0eafe 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountService.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -61,7 +61,7 @@ public interface WebExAccountService extends BaseService, InvokableService {
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getWebExSiteWebExAccountsCount(long groupId, long webExSiteId);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceClp.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceClp.java
index 59f0fee39b0..6c1b9376e5c 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceClp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -65,7 +65,7 @@ public class WebExAccountServiceClp implements WebExAccountService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount getWebExAccount(
 		long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -94,7 +94,7 @@ public class WebExAccountServiceClp implements WebExAccountService {
 		return (com.liferay.meeting.webex.model.WebExAccount)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getWebExSiteWebExAccountsCount(long groupId, long webExSiteId) {
 		Object returnObj = null;
 
@@ -118,14 +118,14 @@ public class WebExAccountServiceClp implements WebExAccountService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -148,7 +148,7 @@ public class WebExAccountServiceClp implements WebExAccountService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -184,7 +184,7 @@ public class WebExAccountServiceClp implements WebExAccountService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExAccount>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public void addWebExAccount(long groupId, long webExSiteId,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -221,7 +221,7 @@ public class WebExAccountServiceClp implements WebExAccountService {
 		}
 	}
 
-	@Override
+
 	public void deleteWebExAccount(long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		try {
@@ -245,7 +245,7 @@ public class WebExAccountServiceClp implements WebExAccountService {
 		}
 	}
 
-	@Override
+
 	public void updateWebExAccount(long webExAccountId,
 		java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceUtil.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceUtil.java
index 616a260d6e4..ae36ea173c0 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceWrapper.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceWrapper.java
index 1167131a2f7..4dde2be23b6 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceWrapper.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExAccountServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -32,20 +32,20 @@ public class WebExAccountServiceWrapper implements WebExAccountService,
 		_webExAccountService = webExAccountService;
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExAccount getWebExAccount(
 		long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExAccountService.getWebExAccount(webExAccountId);
 	}
 
-	@Override
+
 	public int getWebExSiteWebExAccountsCount(long groupId, long webExSiteId) {
 		return _webExAccountService.getWebExSiteWebExAccountsCount(groupId,
 			webExSiteId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -57,12 +57,12 @@ public class WebExAccountServiceWrapper implements WebExAccountService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _webExAccountService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExAccount> getWebExSiteWebExAccounts(
 		long groupId, long webExSiteId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -70,7 +70,7 @@ public class WebExAccountServiceWrapper implements WebExAccountService,
 			webExSiteId, start, end, obc);
 	}
 
-	@Override
+
 	public void addWebExAccount(long groupId, long webExSiteId,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -79,13 +79,13 @@ public class WebExAccountServiceWrapper implements WebExAccountService,
 			password, serviceContext);
 	}
 
-	@Override
+
 	public void deleteWebExAccount(long webExAccountId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		_webExAccountService.deleteWebExAccount(webExAccountId);
 	}
 
-	@Override
+
 	public void updateWebExAccount(long webExAccountId,
 		java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -94,12 +94,12 @@ public class WebExAccountServiceWrapper implements WebExAccountService,
 			serviceContext);
 	}
 
-	@Override
+
 	public WebExAccountService getWrappedService() {
 		return _webExAccountService;
 	}
 
-	@Override
+
 	public void setWrappedService(WebExAccountService webExAccountService) {
 		_webExAccountService = webExAccountService;
 	}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalService.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalService.java
index 1606141765e..260dec117cd 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalService.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -172,11 +172,11 @@ public interface WebExSiteLocalService extends BaseLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException;
 
-	@Override
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException;
@@ -189,7 +189,7 @@ public interface WebExSiteLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getWebExSitesCount();
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceClp.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceClp.java
index 4c7356d5eb2..be80435c31b 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceClp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -188,7 +188,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite addWebExSite(
 		com.liferay.meeting.webex.model.WebExSite webExSite) {
 		Object returnObj = null;
@@ -213,7 +213,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite createWebExSite(
 		long webExSiteId) {
 		Object returnObj = null;
@@ -237,7 +237,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite deleteWebExSite(
 		com.liferay.meeting.webex.model.WebExSite webExSite)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -267,7 +267,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite deleteWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -296,7 +296,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchSiteKeyWebExSite(
 		long siteKey) {
 		Object returnObj = null;
@@ -320,7 +320,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchWebExSite(
 		long webExSiteId) {
 		Object returnObj = null;
@@ -344,7 +344,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchWebExSiteByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		Object returnObj = null;
@@ -369,7 +369,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getSiteKeyWebExSite(
 		long siteKey)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -398,7 +398,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -427,7 +427,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSiteByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -457,7 +457,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite updateWebExSite(
 		com.liferay.meeting.webex.model.WebExSite webExSite) {
 		Object returnObj = null;
@@ -482,7 +482,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -505,7 +505,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		Object returnObj = null;
 
@@ -528,7 +528,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		Object returnObj = null;
@@ -555,7 +555,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		Object returnObj = null;
 
@@ -578,7 +578,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -608,7 +608,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -638,7 +638,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (com.liferay.portal.kernel.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getWebExSitesCount() {
 		Object returnObj = null;
 
@@ -661,14 +661,14 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -691,7 +691,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -716,7 +716,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -748,7 +748,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -783,7 +783,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<T>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		int start, int end) {
 		Object returnObj = null;
@@ -807,7 +807,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExSite>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		long groupId, int start, int end) {
 		Object returnObj = null;
@@ -832,7 +832,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExSite>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		long groupId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -866,7 +866,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExSite>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSitesByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		Object returnObj = null;
@@ -891,7 +891,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExSite>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSitesByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.meeting.webex.model.WebExSite> orderByComparator) {
@@ -927,7 +927,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExSite>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		Object returnObj = null;
@@ -952,7 +952,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
@@ -982,7 +982,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		return ((Long)returnObj).longValue();
 	}
 
-	@Override
+
 	public void addWebExSite(long userId, long groupId, java.lang.String name,
 		java.lang.String apiURL, java.lang.String login,
 		java.lang.String password, java.lang.String partnerKey, long siteKey,
@@ -1028,7 +1028,7 @@ public class WebExSiteLocalServiceClp implements WebExSiteLocalService {
 		}
 	}
 
-	@Override
+
 	public void updateWebExSite(long webExSiteId, java.lang.String apiURL,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceUtil.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceUtil.java
index 0ddd7e761a3..188eccf7a52 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceWrapper.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceWrapper.java
index fa5b249c87d..6abb60eb981 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceWrapper.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteLocalServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -39,7 +39,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param webExSite the web ex site
 	* @return the web ex site that was added
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite addWebExSite(
 		com.liferay.meeting.webex.model.WebExSite webExSite) {
 		return _webExSiteLocalService.addWebExSite(webExSite);
@@ -51,7 +51,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param webExSiteId the primary key for the new web ex site
 	* @return the new web ex site
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite createWebExSite(
 		long webExSiteId) {
 		return _webExSiteLocalService.createWebExSite(webExSiteId);
@@ -64,7 +64,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @return the web ex site that was removed
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite deleteWebExSite(
 		com.liferay.meeting.webex.model.WebExSite webExSite)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -78,20 +78,20 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @return the web ex site that was removed
 	* @throws PortalException if a web ex site with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite deleteWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExSiteLocalService.deleteWebExSite(webExSiteId);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchSiteKeyWebExSite(
 		long siteKey) {
 		return _webExSiteLocalService.fetchSiteKeyWebExSite(siteKey);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchWebExSite(
 		long webExSiteId) {
 		return _webExSiteLocalService.fetchWebExSite(webExSiteId);
@@ -104,14 +104,14 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param groupId the primary key of the group
 	* @return the matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchWebExSiteByUuidAndGroupId(
 		java.lang.String uuid, long groupId) {
 		return _webExSiteLocalService.fetchWebExSiteByUuidAndGroupId(uuid,
 			groupId);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getSiteKeyWebExSite(
 		long siteKey)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -125,7 +125,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @return the web ex site
 	* @throws PortalException if a web ex site with the primary key could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -140,7 +140,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @return the matching web ex site
 	* @throws PortalException if a matching web ex site could not be found
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSiteByUuidAndGroupId(
 		java.lang.String uuid, long groupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -153,29 +153,29 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param webExSite the web ex site
 	* @return the web ex site that was updated
 	*/
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite updateWebExSite(
 		com.liferay.meeting.webex.model.WebExSite webExSite) {
 		return _webExSiteLocalService.updateWebExSite(webExSite);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDynamicQuery() {
 		return _webExSiteLocalService.getActionableDynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
 		return _webExSiteLocalService.dynamicQuery();
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		com.liferay.exportimport.kernel.lar.PortletDataContext portletDataContext) {
 		return _webExSiteLocalService.getExportActionableDynamicQuery(portletDataContext);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.dao.orm.IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		return _webExSiteLocalService.getIndexableActionableDynamicQuery();
 	}
@@ -183,14 +183,14 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	/**
 	* @throws PortalException
 	*/
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel deletePersistedModel(
 		com.liferay.portal.kernel.model.PersistedModel persistedModel)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExSiteLocalService.deletePersistedModel(persistedModel);
 	}
 
-	@Override
+
 	public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 		java.io.Serializable primaryKeyObj)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -202,12 +202,12 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	*
 	* @return the number of web ex sites
 	*/
-	@Override
+
 	public int getWebExSitesCount() {
 		return _webExSiteLocalService.getWebExSitesCount();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -220,7 +220,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _webExSiteLocalService.getOSGiServiceIdentifier();
 	}
@@ -231,7 +231,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _webExSiteLocalService.dynamicQuery(dynamicQuery);
@@ -249,7 +249,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param end the upper bound of the range of model instances (not inclusive)
 	* @return the range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end) {
@@ -269,7 +269,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the ordered range of matching rows
 	*/
-	@Override
+
 	public <T> java.util.List<T> dynamicQuery(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
 		int end,
@@ -289,19 +289,19 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param end the upper bound of the range of web ex sites (not inclusive)
 	* @return the range of web ex sites
 	*/
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		int start, int end) {
 		return _webExSiteLocalService.getWebExSites(start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		long groupId, int start, int end) {
 		return _webExSiteLocalService.getWebExSites(groupId, start, end);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		long groupId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -315,7 +315,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param companyId the primary key of the company
 	* @return the matching web ex sites, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSitesByUuidAndCompanyId(
 		java.lang.String uuid, long companyId) {
 		return _webExSiteLocalService.getWebExSitesByUuidAndCompanyId(uuid,
@@ -332,7 +332,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	* @return the range of matching web ex sites, or an empty list if no matches were found
 	*/
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSitesByUuidAndCompanyId(
 		java.lang.String uuid, long companyId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator<com.liferay.meeting.webex.model.WebExSite> orderByComparator) {
@@ -346,7 +346,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param dynamicQuery the dynamic query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery) {
 		return _webExSiteLocalService.dynamicQueryCount(dynamicQuery);
@@ -359,14 +359,14 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 	* @param projection the projection to apply to the query
 	* @return the number of rows matching the dynamic query
 	*/
-	@Override
+
 	public long dynamicQueryCount(
 		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
 		com.liferay.portal.kernel.dao.orm.Projection projection) {
 		return _webExSiteLocalService.dynamicQueryCount(dynamicQuery, projection);
 	}
 
-	@Override
+
 	public void addWebExSite(long userId, long groupId, java.lang.String name,
 		java.lang.String apiURL, java.lang.String login,
 		java.lang.String password, java.lang.String partnerKey, long siteKey,
@@ -376,7 +376,7 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 			login, password, partnerKey, siteKey, serviceContext);
 	}
 
-	@Override
+
 	public void updateWebExSite(long webExSiteId, java.lang.String apiURL,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -385,12 +385,12 @@ public class WebExSiteLocalServiceWrapper implements WebExSiteLocalService,
 			password, serviceContext);
 	}
 
-	@Override
+
 	public WebExSiteLocalService getWrappedService() {
 		return _webExSiteLocalService;
 	}
 
-	@Override
+
 	public void setWrappedService(WebExSiteLocalService webExSiteLocalService) {
 		_webExSiteLocalService = webExSiteLocalService;
 	}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteService.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteService.java
index ab1f1388158..3faf9101d38 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteService.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -67,7 +67,7 @@ public interface WebExSiteService extends BaseService, InvokableService {
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getWebExSitesCount(long groupId);
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceClp.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceClp.java
index 45d9909ffbe..cd1d852ffbb 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceClp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -71,7 +71,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 			};
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite deleteWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -100,7 +100,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchSiteKeyWebExSite(
 		long siteKey)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -129,7 +129,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -158,7 +158,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		return (com.liferay.meeting.webex.model.WebExSite)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public int getWebExSitesCount(long groupId) {
 		Object returnObj = null;
 
@@ -181,14 +181,14 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		return ((Integer)returnObj).intValue();
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -211,7 +211,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		long groupId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
@@ -245,7 +245,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		return (java.util.List<com.liferay.meeting.webex.model.WebExSite>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public void addWebExSite(long groupId, java.lang.String name,
 		java.lang.String apiURL, java.lang.String login,
 		java.lang.String password, java.lang.String partnerKey, long siteKey,
@@ -289,7 +289,7 @@ public class WebExSiteServiceClp implements WebExSiteService {
 		}
 	}
 
-	@Override
+
 	public void updateWebExSite(long webExSiteId, java.lang.String apiURL,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceUtil.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceUtil.java
index 8a9e61ef00e..e58a6a3392f 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceWrapper.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceWrapper.java
index 6a574916a31..ea4521455a5 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceWrapper.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/WebExSiteServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service;
@@ -32,33 +32,33 @@ public class WebExSiteServiceWrapper implements WebExSiteService,
 		_webExSiteService = webExSiteService;
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite deleteWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExSiteService.deleteWebExSite(webExSiteId);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite fetchSiteKeyWebExSite(
 		long siteKey)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExSiteService.fetchSiteKeyWebExSite(siteKey);
 	}
 
-	@Override
+
 	public com.liferay.meeting.webex.model.WebExSite getWebExSite(
 		long webExSiteId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 		return _webExSiteService.getWebExSite(webExSiteId);
 	}
 
-	@Override
+
 	public int getWebExSitesCount(long groupId) {
 		return _webExSiteService.getWebExSitesCount(groupId);
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -70,19 +70,19 @@ public class WebExSiteServiceWrapper implements WebExSiteService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _webExSiteService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.meeting.webex.model.WebExSite> getWebExSites(
 		long groupId, int start, int end,
 		com.liferay.portal.kernel.util.OrderByComparator obc) {
 		return _webExSiteService.getWebExSites(groupId, start, end, obc);
 	}
 
-	@Override
+
 	public void addWebExSite(long groupId, java.lang.String name,
 		java.lang.String apiURL, java.lang.String login,
 		java.lang.String password, java.lang.String partnerKey, long siteKey,
@@ -92,7 +92,7 @@ public class WebExSiteServiceWrapper implements WebExSiteService,
 			partnerKey, siteKey, serviceContext);
 	}
 
-	@Override
+
 	public void updateWebExSite(long webExSiteId, java.lang.String apiURL,
 		java.lang.String login, java.lang.String password,
 		com.liferay.portal.kernel.service.ServiceContext serviceContext)
@@ -101,12 +101,12 @@ public class WebExSiteServiceWrapper implements WebExSiteService,
 			serviceContext);
 	}
 
-	@Override
+
 	public WebExSiteService getWrappedService() {
 		return _webExSiteService;
 	}
 
-	@Override
+
 	public void setWrappedService(WebExSiteService webExSiteService) {
 		_webExSiteService = webExSiteService;
 	}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/messaging/ClpMessageListener.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/messaging/ClpMessageListener.java
index f7c2d674b2c..41e29171fd7 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/messaging/ClpMessageListener.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.messaging;
@@ -34,7 +34,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountPersistence.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountPersistence.java
index 2a09a7b5f72..a1898a4b80a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountPersistence.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountPersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.persistence;
@@ -634,7 +634,7 @@ public interface WebExAccountPersistence extends BasePersistence<WebExAccount> {
 	*/
 	public WebExAccount fetchByPrimaryKey(long webExAccountId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, WebExAccount> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -702,6 +702,6 @@ public interface WebExAccountPersistence extends BasePersistence<WebExAccount> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountUtil.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountUtil.java
index 770782099df..1786e8b9429 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExAccountUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.persistence;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSitePersistence.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSitePersistence.java
index d9cca6476ca..7c9da469a25 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSitePersistence.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSitePersistence.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.persistence;
@@ -654,7 +654,7 @@ public interface WebExSitePersistence extends BasePersistence<WebExSite> {
 	*/
 	public WebExSite fetchByPrimaryKey(long webExSiteId);
 
-	@Override
+
 	public java.util.Map<java.io.Serializable, WebExSite> fetchByPrimaryKeys(
 		java.util.Set<java.io.Serializable> primaryKeys);
 
@@ -722,6 +722,6 @@ public interface WebExSitePersistence extends BasePersistence<WebExSite> {
 	*/
 	public int countAll();
 
-	@Override
+
 	public java.util.Set<java.lang.String> getBadColumnNames();
 }
\ No newline at end of file
diff --git a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSiteUtil.java b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSiteUtil.java
index 5950fe7833c..f9818642fe2 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSiteUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/service/com/liferay/meeting/webex/service/persistence/WebExSiteUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.persistence;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddMeetingMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddMeetingMVCActionCommand.java
index c5a1bef122c..ca2050d4041 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddMeetingMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddMeetingMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -42,7 +42,7 @@ import javax.portlet.ActionResponse;
  */
 public class AddMeetingMVCActionCommand extends BaseMeetingMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExAccountMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExAccountMVCActionCommand.java
index 455fb22b864..76f9393937e 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExAccountMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExAccountMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -31,7 +31,7 @@ import javax.portlet.ActionResponse;
  */
 public class AddWebExAccountMVCActionCommand extends BaseMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExSiteMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExSiteMVCActionCommand.java
index b81d37cf5fa..736ceb93aec 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExSiteMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/AddWebExSiteMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -31,7 +31,7 @@ import javax.portlet.ActionResponse;
  */
 public class AddWebExSiteMVCActionCommand extends BaseMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/BaseMeetingMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/BaseMeetingMVCActionCommand.java
index f9c11b3a3bd..aea27fa9d5a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/BaseMeetingMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/BaseMeetingMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteMeetingMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteMeetingMVCActionCommand.java
index c120d927ef7..a2d21508812 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteMeetingMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteMeetingMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -27,7 +27,7 @@ import javax.portlet.ActionResponse;
  */
 public class DeleteMeetingMVCActionCommand extends BaseMeetingMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExAccountMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExAccountMVCActionCommand.java
index 53eedbf4bf1..8cca90d7960 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExAccountMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExAccountMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -26,7 +26,7 @@ import javax.portlet.ActionResponse;
  */
 public class DeleteWebExAccountMVCActionCommand extends BaseMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExSiteMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExSiteMVCActionCommand.java
index f9fcf5f9b85..75c44aabc8e 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExSiteMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/DeleteWebExSiteMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -26,7 +26,7 @@ import javax.portlet.ActionResponse;
  */
 public class DeleteWebExSiteMVCActionCommand extends BaseMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateMeetingMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateMeetingMVCActionCommand.java
index a782542aa42..49de743d249 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateMeetingMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateMeetingMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -28,7 +28,7 @@ import javax.portlet.ActionResponse;
  */
 public class UpdateMeetingMVCActionCommand extends AddMeetingMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExAccountMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExAccountMVCActionCommand.java
index e1747371b47..f10d03cd0f1 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExAccountMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExAccountMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -29,7 +29,7 @@ import javax.portlet.ActionResponse;
  */
 public class UpdateWebExAccountMVCActionCommand extends BaseMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExSiteMVCActionCommand.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExSiteMVCActionCommand.java
index 223d3f1b44d..7fa10ad766f 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExSiteMVCActionCommand.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/portlet/action/UpdateWebExSiteMVCActionCommand.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.portlet.action;
@@ -29,7 +29,7 @@ import javax.portlet.ActionResponse;
  */
 public class UpdateWebExSiteMVCActionCommand extends BaseMVCActionCommand {
 
-	@Override
+
 	protected void doProcessAction(
 			ActionRequest actionRequest, ActionResponse actionResponse)
 		throws Exception {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceImpl.java
index c4ff2748b80..8e165245fb6 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceUtil.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceUtil.java
index 320778d061c..e7b94cf6cf3 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/MeetingServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountBaseImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountBaseImpl.java
index 0a7554a3dac..71b7f54d9ba 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountBaseImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
@@ -39,7 +39,7 @@ public abstract class WebExAccountBaseImpl extends WebExAccountModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a web ex account model instance should use the {@link WebExAccount} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			WebExAccountLocalServiceUtil.addWebExAccount(this);
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountCacheModel.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountCacheModel.java
index 816cd05ba0c..446c83e0c46 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountCacheModel.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class WebExAccountCacheModel implements CacheModel<WebExAccount>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class WebExAccountCacheModel implements CacheModel<WebExAccount>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, webExAccountId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(23);
 
@@ -95,7 +95,7 @@ public class WebExAccountCacheModel implements CacheModel<WebExAccount>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public WebExAccount toEntityModel() {
 		WebExAccountImpl webExAccountImpl = new WebExAccountImpl();
 
@@ -153,7 +153,7 @@ public class WebExAccountCacheModel implements CacheModel<WebExAccount>,
 		return webExAccountImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		uuid = objectInput.readUTF();
 
@@ -173,7 +173,7 @@ public class WebExAccountCacheModel implements CacheModel<WebExAccount>,
 		password = objectInput.readUTF();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		if (uuid == null) {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountImpl.java
index 6478592136e..3b3a532cc08 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountModelImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountModelImpl.java
index 751bb519385..06a0facd995 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountModelImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExAccountModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
@@ -177,37 +177,37 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	public WebExAccountModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _webExAccountId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setWebExAccountId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _webExAccountId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return WebExAccount.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return WebExAccount.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -229,7 +229,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -299,7 +299,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	}
 
 	@JSON
-	@Override
+
 	public String getUuid() {
 		if (_uuid == null) {
 			return StringPool.BLANK;
@@ -309,7 +309,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		if (_originalUuid == null) {
 			_originalUuid = _uuid;
@@ -323,23 +323,23 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	}
 
 	@JSON
-	@Override
+
 	public long getWebExAccountId() {
 		return _webExAccountId;
 	}
 
-	@Override
+
 	public void setWebExAccountId(long webExAccountId) {
 		_webExAccountId = webExAccountId;
 	}
 
 	@JSON
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_columnBitmask |= GROUPID_COLUMN_BITMASK;
 
@@ -357,12 +357,12 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	}
 
 	@JSON
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_columnBitmask |= COMPANYID_COLUMN_BITMASK;
 
@@ -380,17 +380,17 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	}
 
 	@JSON
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -402,12 +402,12 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
 	@JSON
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -417,24 +417,24 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
 	@JSON
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
 	@JSON
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -443,7 +443,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -451,12 +451,12 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	}
 
 	@JSON
-	@Override
+
 	public long getWebExSiteId() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setWebExSiteId(long webExSiteId) {
 		_columnBitmask |= WEBEXSITEID_COLUMN_BITMASK;
 
@@ -474,7 +474,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 	}
 
 	@JSON
-	@Override
+
 	public String getLogin() {
 		if (_login == null) {
 			return StringPool.BLANK;
@@ -484,13 +484,13 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public void setLogin(String login) {
 		_login = login;
 	}
 
 	@JSON
-	@Override
+
 	public String getPassword() {
 		if (_password == null) {
 			return StringPool.BLANK;
@@ -500,12 +500,12 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public void setPassword(String password) {
 		_password = password;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				WebExAccount.class.getName()));
@@ -515,20 +515,20 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			WebExAccount.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public WebExAccount toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (WebExAccount)ProxyUtil.newProxyInstance(_classLoader,
@@ -538,7 +538,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		WebExAccountImpl webExAccountImpl = new WebExAccountImpl();
 
@@ -559,7 +559,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return webExAccountImpl;
 	}
 
-	@Override
+
 	public int compareTo(WebExAccount webExAccount) {
 		long primaryKey = webExAccount.getPrimaryKey();
 
@@ -574,7 +574,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -596,22 +596,22 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		WebExAccountModelImpl webExAccountModelImpl = this;
 
@@ -634,7 +634,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		webExAccountModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<WebExAccount> toCacheModel() {
 		WebExAccountCacheModel webExAccountCacheModel = new WebExAccountCacheModel();
 
@@ -701,7 +701,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return webExAccountCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(23);
 
@@ -732,7 +732,7 @@ public class WebExAccountModelImpl extends BaseModelImpl<WebExAccount>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(37);
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteBaseImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteBaseImpl.java
index 9f890d2b7c3..9e459c5c80a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteBaseImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
@@ -39,7 +39,7 @@ public abstract class WebExSiteBaseImpl extends WebExSiteModelImpl
 	 *
 	 * Never modify or reference this class directly. All methods that expect a web ex site model instance should use the {@link WebExSite} interface instead.
 	 */
-	@Override
+
 	public void persist() {
 		if (this.isNew()) {
 			WebExSiteLocalServiceUtil.addWebExSite(this);
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteCacheModel.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteCacheModel.java
index e2319d4074f..1ddbcd76415 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteCacheModel.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteCacheModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
@@ -40,7 +40,7 @@ import java.util.Date;
 @ProviderType
 public class WebExSiteCacheModel implements CacheModel<WebExSite>,
 	Externalizable {
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -59,12 +59,12 @@ public class WebExSiteCacheModel implements CacheModel<WebExSite>,
 		return false;
 	}
 
-	@Override
+
 	public int hashCode() {
 		return HashUtil.hash(0, webExSiteId);
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(29);
 
@@ -101,7 +101,7 @@ public class WebExSiteCacheModel implements CacheModel<WebExSite>,
 		return sb.toString();
 	}
 
-	@Override
+
 	public WebExSite toEntityModel() {
 		WebExSiteImpl webExSiteImpl = new WebExSiteImpl();
 
@@ -180,7 +180,7 @@ public class WebExSiteCacheModel implements CacheModel<WebExSite>,
 		return webExSiteImpl;
 	}
 
-	@Override
+
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		uuid = objectInput.readUTF();
 
@@ -203,7 +203,7 @@ public class WebExSiteCacheModel implements CacheModel<WebExSite>,
 		siteKey = objectInput.readLong();
 	}
 
-	@Override
+
 	public void writeExternal(ObjectOutput objectOutput)
 		throws IOException {
 		if (uuid == null) {
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteImpl.java
index 9091307c7f8..ba6b0580dbc 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteModelImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteModelImpl.java
index d15f11fe520..547f01799ef 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteModelImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/model/impl/WebExSiteModelImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.model.impl;
@@ -186,37 +186,37 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 	public WebExSiteModelImpl() {
 	}
 
-	@Override
+
 	public long getPrimaryKey() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setPrimaryKey(long primaryKey) {
 		setWebExSiteId(primaryKey);
 	}
 
-	@Override
+
 	public Serializable getPrimaryKeyObj() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
 		setPrimaryKey(((Long)primaryKeyObj).longValue());
 	}
 
-	@Override
+
 	public Class<?> getModelClass() {
 		return WebExSite.class;
 	}
 
-	@Override
+
 	public String getModelClassName() {
 		return WebExSite.class.getName();
 	}
 
-	@Override
+
 	public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
@@ -241,7 +241,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return attributes;
 	}
 
-	@Override
+
 	public void setModelAttributes(Map<String, Object> attributes) {
 		String uuid = (String)attributes.get("uuid");
 
@@ -329,7 +329,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 	}
 
 	@JSON
-	@Override
+
 	public String getUuid() {
 		if (_uuid == null) {
 			return StringPool.BLANK;
@@ -339,7 +339,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setUuid(String uuid) {
 		if (_originalUuid == null) {
 			_originalUuid = _uuid;
@@ -353,23 +353,23 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 	}
 
 	@JSON
-	@Override
+
 	public long getWebExSiteId() {
 		return _webExSiteId;
 	}
 
-	@Override
+
 	public void setWebExSiteId(long webExSiteId) {
 		_webExSiteId = webExSiteId;
 	}
 
 	@JSON
-	@Override
+
 	public long getGroupId() {
 		return _groupId;
 	}
 
-	@Override
+
 	public void setGroupId(long groupId) {
 		_columnBitmask |= GROUPID_COLUMN_BITMASK;
 
@@ -387,12 +387,12 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 	}
 
 	@JSON
-	@Override
+
 	public long getCompanyId() {
 		return _companyId;
 	}
 
-	@Override
+
 	public void setCompanyId(long companyId) {
 		_columnBitmask |= COMPANYID_COLUMN_BITMASK;
 
@@ -410,17 +410,17 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 	}
 
 	@JSON
-	@Override
+
 	public long getUserId() {
 		return _userId;
 	}
 
-	@Override
+
 	public void setUserId(long userId) {
 		_userId = userId;
 	}
 
-	@Override
+
 	public String getUserUuid() {
 		try {
 			User user = UserLocalServiceUtil.getUserById(getUserId());
@@ -432,12 +432,12 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setUserUuid(String userUuid) {
 	}
 
 	@JSON
-	@Override
+
 	public String getUserName() {
 		if (_userName == null) {
 			return StringPool.BLANK;
@@ -447,24 +447,24 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setUserName(String userName) {
 		_userName = userName;
 	}
 
 	@JSON
-	@Override
+
 	public Date getCreateDate() {
 		return _createDate;
 	}
 
-	@Override
+
 	public void setCreateDate(Date createDate) {
 		_createDate = createDate;
 	}
 
 	@JSON
-	@Override
+
 	public Date getModifiedDate() {
 		return _modifiedDate;
 	}
@@ -473,7 +473,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return _setModifiedDate;
 	}
 
-	@Override
+
 	public void setModifiedDate(Date modifiedDate) {
 		_setModifiedDate = true;
 
@@ -481,7 +481,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 	}
 
 	@JSON
-	@Override
+
 	public String getName() {
 		if (_name == null) {
 			return StringPool.BLANK;
@@ -491,13 +491,13 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setName(String name) {
 		_name = name;
 	}
 
 	@JSON
-	@Override
+
 	public String getApiURL() {
 		if (_apiURL == null) {
 			return StringPool.BLANK;
@@ -507,13 +507,13 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setApiURL(String apiURL) {
 		_apiURL = apiURL;
 	}
 
 	@JSON
-	@Override
+
 	public String getLogin() {
 		if (_login == null) {
 			return StringPool.BLANK;
@@ -523,13 +523,13 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setLogin(String login) {
 		_login = login;
 	}
 
 	@JSON
-	@Override
+
 	public String getPassword() {
 		if (_password == null) {
 			return StringPool.BLANK;
@@ -539,13 +539,13 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setPassword(String password) {
 		_password = password;
 	}
 
 	@JSON
-	@Override
+
 	public String getPartnerKey() {
 		if (_partnerKey == null) {
 			return StringPool.BLANK;
@@ -555,18 +555,18 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public void setPartnerKey(String partnerKey) {
 		_partnerKey = partnerKey;
 	}
 
 	@JSON
-	@Override
+
 	public long getSiteKey() {
 		return _siteKey;
 	}
 
-	@Override
+
 	public void setSiteKey(long siteKey) {
 		_columnBitmask |= SITEKEY_COLUMN_BITMASK;
 
@@ -583,7 +583,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return _originalSiteKey;
 	}
 
-	@Override
+
 	public StagedModelType getStagedModelType() {
 		return new StagedModelType(PortalUtil.getClassNameId(
 				WebExSite.class.getName()));
@@ -593,20 +593,20 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return _columnBitmask;
 	}
 
-	@Override
+
 	public ExpandoBridge getExpandoBridge() {
 		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
 			WebExSite.class.getName(), getPrimaryKey());
 	}
 
-	@Override
+
 	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
 		ExpandoBridge expandoBridge = getExpandoBridge();
 
 		expandoBridge.setAttributes(serviceContext);
 	}
 
-	@Override
+
 	public WebExSite toEscapedModel() {
 		if (_escapedModel == null) {
 			_escapedModel = (WebExSite)ProxyUtil.newProxyInstance(_classLoader,
@@ -616,7 +616,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return _escapedModel;
 	}
 
-	@Override
+
 	public Object clone() {
 		WebExSiteImpl webExSiteImpl = new WebExSiteImpl();
 
@@ -640,7 +640,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return webExSiteImpl;
 	}
 
-	@Override
+
 	public int compareTo(WebExSite webExSite) {
 		long primaryKey = webExSite.getPrimaryKey();
 
@@ -655,7 +655,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
@@ -677,22 +677,22 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	public int hashCode() {
 		return (int)getPrimaryKey();
 	}
 
-	@Override
+
 	public boolean isEntityCacheEnabled() {
 		return ENTITY_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public boolean isFinderCacheEnabled() {
 		return FINDER_CACHE_ENABLED;
 	}
 
-	@Override
+
 	public void resetOriginalValues() {
 		WebExSiteModelImpl webExSiteModelImpl = this;
 
@@ -715,7 +715,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		webExSiteModelImpl._columnBitmask = 0;
 	}
 
-	@Override
+
 	public CacheModel<WebExSite> toCacheModel() {
 		WebExSiteCacheModel webExSiteCacheModel = new WebExSiteCacheModel();
 
@@ -806,7 +806,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return webExSiteCacheModel;
 	}
 
-	@Override
+
 	public String toString() {
 		StringBundler sb = new StringBundler(29);
 
@@ -843,7 +843,7 @@ public class WebExSiteModelImpl extends BaseModelImpl<WebExSite>
 		return sb.toString();
 	}
 
-	@Override
+
 	public String toXmlString() {
 		StringBundler sb = new StringBundler(46);
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/BaseMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/BaseMeetingRequestTranslator.java
index 3e547a453c3..b68937b5fcb 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/BaseMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/BaseMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/CreateMeetingMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/CreateMeetingMeetingRequestTranslator.java
index fd0e17ffaab..15ef755dc5e 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/CreateMeetingMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/CreateMeetingMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -27,7 +27,7 @@ import com.webex.schemas.x2002.x06.service.meeting.CreateMeeting;
 public class CreateMeetingMeetingRequestTranslator
 	extends BaseMeetingRequestTranslator implements MeetingRequestTranslator {
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/DeleteMeetingMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/DeleteMeetingMeetingRequestTranslator.java
index d95d2c5eff1..733f1d95c03 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/DeleteMeetingMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/DeleteMeetingMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -27,7 +27,7 @@ import com.webex.schemas.x2002.x06.service.meeting.DelMeeting;
 public class DeleteMeetingMeetingRequestTranslator
 	extends BaseMeetingRequestTranslator {
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetHostURLMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetHostURLMeetingRequestTranslator.java
index 1fe033711e9..94664f6a486 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetHostURLMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetHostURLMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -26,7 +26,7 @@ import com.webex.schemas.x2002.x06.service.meeting.GethosturlMeeting;
 public class GetHostURLMeetingRequestTranslator
 	extends BaseMeetingRequestTranslator {
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetJoinURLMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetJoinURLMeetingRequestTranslator.java
index ac229603cd5..94b5aa461ef 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetJoinURLMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetJoinURLMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -27,7 +27,7 @@ import com.webex.schemas.x2002.x06.service.meeting.GetjoinurlMeeting;
 public class GetJoinURLMeetingRequestTranslator
 	extends BaseMeetingRequestTranslator {
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingMeetingRequestTranslator.java
index cb2ae496055..5166e13f416 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -26,7 +26,7 @@ import com.webex.schemas.x2002.x06.service.meeting.GetMeeting;
 public class GetMeetingMeetingRequestTranslator
 	extends BaseMeetingRequestTranslator {
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingSummariesMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingSummariesMeetingRequestTranslator.java
index a188b8f1219..952fd7fb295 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingSummariesMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/GetMeetingSummariesMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -67,7 +67,7 @@ public class GetMeetingSummariesMeetingRequestTranslator
 		lstControlType.setStartFrom(BigInteger.valueOf(start));
 	}
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslator.java
index a7f2bf43c48..53948e95675 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslatorRegistry.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslatorRegistry.java
index 23b30807a07..97211c1ef51 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslatorRegistry.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/MeetingRequestTranslatorRegistry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/UpdateMeetingMeetingRequestTranslator.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/UpdateMeetingMeetingRequestTranslator.java
index 1774fb6b73c..c8eb6d9d1d1 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/UpdateMeetingMeetingRequestTranslator.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/UpdateMeetingMeetingRequestTranslator.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
@@ -27,7 +27,7 @@ import com.webex.schemas.x2002.x06.service.meeting.SetMeeting;
 public class UpdateMeetingMeetingRequestTranslator
 	extends BaseMeetingRequestTranslator {
 
-	@Override
+
 	protected BodyContentType getBodyContentType(
 		MeetingRequest meetingRequest, MeetingContext meetingContext) {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/WebExMeetingRequestType.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/WebExMeetingRequestType.java
index 6935cfdcea3..936de3c0d92 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/WebExMeetingRequestType.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/request/WebExMeetingRequestType.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.request;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/BaseMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/BaseMeetingResponseProcessor.java
index 314a2ef6adf..96c572714a1 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/BaseMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/BaseMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/CreateMeetingMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/CreateMeetingMeetingResponseProcessor.java
index 6dddbfeaead..a0c0172545f 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/CreateMeetingMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/CreateMeetingMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetHostURLMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetHostURLMeetingResponseProcessor.java
index 13f491a1b27..75c8116bbe9 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetHostURLMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetHostURLMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetJoinURLMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetJoinURLMeetingResponseProcessor.java
index 8f4914f3197..b6dff553ad1 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetJoinURLMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetJoinURLMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingMeetingResponseProcessor.java
index 19212df6bd3..356ec8bd0e7 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingSummariesMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingSummariesMeetingResponseProcessor.java
index c2975891558..1cd4c83e04d 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingSummariesMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/GetMeetingSummariesMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessor.java
index 0ed16e90814..0a49a5f9997 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessorRegistry.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessorRegistry.java
index c1bd60d29cc..0ae1c94fce5 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessorRegistry.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/MeetingResponseProcessorRegistry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/NullMeetingResponseProcessor.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/NullMeetingResponseProcessor.java
index 5c621f5c845..22882a06bf8 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/NullMeetingResponseProcessor.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/response/NullMeetingResponseProcessor.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.response;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceBaseImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceBaseImpl.java
index 88883f126b3..2a58fd10aac 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceBaseImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
@@ -89,7 +89,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @return the web ex account that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public WebExAccount addWebExAccount(WebExAccount webExAccount) {
 		webExAccount.setNew(true);
 
@@ -102,7 +102,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param webExAccountId the primary key for the new web ex account
 	 * @return the new web ex account
 	 */
-	@Override
+
 	public WebExAccount createWebExAccount(long webExAccountId) {
 		return webExAccountPersistence.create(webExAccountId);
 	}
@@ -115,7 +115,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @throws PortalException if a web ex account with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public WebExAccount deleteWebExAccount(long webExAccountId)
 		throws PortalException {
 		return webExAccountPersistence.remove(webExAccountId);
@@ -129,13 +129,13 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @throws PortalException
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public WebExAccount deleteWebExAccount(WebExAccount webExAccount)
 		throws PortalException {
 		return webExAccountPersistence.remove(webExAccount);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -149,7 +149,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return webExAccountPersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -166,7 +166,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return webExAccountPersistence.findWithDynamicQuery(dynamicQuery,
@@ -186,7 +186,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return webExAccountPersistence.findWithDynamicQuery(dynamicQuery,
@@ -199,7 +199,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return webExAccountPersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -211,14 +211,14 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return webExAccountPersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public WebExAccount fetchWebExAccount(long webExAccountId) {
 		return webExAccountPersistence.fetchByPrimaryKey(webExAccountId);
 	}
@@ -230,7 +230,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param groupId the primary key of the group
 	 * @return the matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchWebExAccountByUuidAndGroupId(String uuid,
 		long groupId) {
 		return webExAccountPersistence.fetchByUUID_G(uuid, groupId);
@@ -243,13 +243,13 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @return the web ex account
 	 * @throws PortalException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount getWebExAccount(long webExAccountId)
 		throws PortalException {
 		return webExAccountPersistence.findByPrimaryKey(webExAccountId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -262,7 +262,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -285,11 +285,11 @@ public abstract class WebExAccountLocalServiceBaseImpl
 		actionableDynamicQuery.setPrimaryKeyPropertyName("webExAccountId");
 	}
 
-	@Override
+
 	public ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		final PortletDataContext portletDataContext) {
 		final ExportActionableDynamicQuery exportActionableDynamicQuery = new ExportActionableDynamicQuery() {
-				@Override
+
 				public long performCount() throws PortalException {
 					ManifestSummary manifestSummary = portletDataContext.getManifestSummary();
 
@@ -313,7 +313,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 		initActionableDynamicQuery(exportActionableDynamicQuery);
 
 		exportActionableDynamicQuery.setAddCriteriaMethod(new ActionableDynamicQuery.AddCriteriaMethod() {
-				@Override
+
 				public void addCriteria(DynamicQuery dynamicQuery) {
 					portletDataContext.addDateRangeCriteria(dynamicQuery,
 						"modifiedDate");
@@ -323,7 +323,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 		exportActionableDynamicQuery.setCompanyId(portletDataContext.getCompanyId());
 
 		exportActionableDynamicQuery.setPerformActionMethod(new ActionableDynamicQuery.PerformActionMethod<WebExAccount>() {
-				@Override
+
 				public void performAction(WebExAccount webExAccount)
 					throws PortalException {
 					StagedModelDataHandlerUtil.exportStagedModel(portletDataContext,
@@ -339,13 +339,13 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return webExAccountLocalService.deleteWebExAccount((WebExAccount)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return webExAccountPersistence.findByPrimaryKey(primaryKeyObj);
@@ -358,7 +358,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param companyId the primary key of the company
 	 * @return the matching web ex accounts, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<WebExAccount> getWebExAccountsByUuidAndCompanyId(String uuid,
 		long companyId) {
 		return webExAccountPersistence.findByUuid_C(uuid, companyId);
@@ -374,7 +374,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the range of matching web ex accounts, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<WebExAccount> getWebExAccountsByUuidAndCompanyId(String uuid,
 		long companyId, int start, int end,
 		OrderByComparator<WebExAccount> orderByComparator) {
@@ -390,7 +390,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @return the matching web ex account
 	 * @throws PortalException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount getWebExAccountByUuidAndGroupId(String uuid,
 		long groupId) throws PortalException {
 		return webExAccountPersistence.findByUUID_G(uuid, groupId);
@@ -407,7 +407,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @param end the upper bound of the range of web ex accounts (not inclusive)
 	 * @return the range of web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> getWebExAccounts(int start, int end) {
 		return webExAccountPersistence.findAll(start, end);
 	}
@@ -417,7 +417,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 *
 	 * @return the number of web ex accounts
 	 */
-	@Override
+
 	public int getWebExAccountsCount() {
 		return webExAccountPersistence.countAll();
 	}
@@ -429,7 +429,7 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 * @return the web ex account that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public WebExAccount updateWebExAccount(WebExAccount webExAccount) {
 		return webExAccountPersistence.update(webExAccount);
 	}
@@ -680,12 +680,12 @@ public abstract class WebExAccountLocalServiceBaseImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return WebExAccountLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceClpInvoker.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceClpInvoker.java
index 1f4dc54024b..f02dcaebe04 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceClpInvoker.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceBaseImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceBaseImpl.java
index 6c7ea23e0ae..571f7101f28 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceBaseImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
@@ -390,12 +390,12 @@ public abstract class WebExAccountServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return WebExAccountService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceClpInvoker.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceClpInvoker.java
index 63a0f8e6c2f..63f6d6b0b57 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceClpInvoker.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExAccountServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceBaseImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceBaseImpl.java
index 15b540ad263..219c082061d 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceBaseImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
@@ -88,7 +88,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the web ex site that was added
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public WebExSite addWebExSite(WebExSite webExSite) {
 		webExSite.setNew(true);
 
@@ -101,7 +101,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param webExSiteId the primary key for the new web ex site
 	 * @return the new web ex site
 	 */
-	@Override
+
 	public WebExSite createWebExSite(long webExSiteId) {
 		return webExSitePersistence.create(webExSiteId);
 	}
@@ -114,7 +114,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException if a web ex site with the primary key could not be found
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public WebExSite deleteWebExSite(long webExSiteId)
 		throws PortalException {
 		return webExSitePersistence.remove(webExSiteId);
@@ -128,13 +128,13 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @throws PortalException
 	 */
 	@Indexable(type = IndexableType.DELETE)
-	@Override
+
 	public WebExSite deleteWebExSite(WebExSite webExSite)
 		throws PortalException {
 		return webExSitePersistence.remove(webExSite);
 	}
 
-	@Override
+
 	public DynamicQuery dynamicQuery() {
 		Class<?> clazz = getClass();
 
@@ -148,7 +148,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery) {
 		return webExSitePersistence.findWithDynamicQuery(dynamicQuery);
 	}
@@ -165,7 +165,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of model instances (not inclusive)
 	 * @return the range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end) {
 		return webExSitePersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -185,7 +185,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching rows
 	 */
-	@Override
+
 	public <T> List<T> dynamicQuery(DynamicQuery dynamicQuery, int start,
 		int end, OrderByComparator<T> orderByComparator) {
 		return webExSitePersistence.findWithDynamicQuery(dynamicQuery, start,
@@ -198,7 +198,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param dynamicQuery the dynamic query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery) {
 		return webExSitePersistence.countWithDynamicQuery(dynamicQuery);
 	}
@@ -210,14 +210,14 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param projection the projection to apply to the query
 	 * @return the number of rows matching the dynamic query
 	 */
-	@Override
+
 	public long dynamicQueryCount(DynamicQuery dynamicQuery,
 		Projection projection) {
 		return webExSitePersistence.countWithDynamicQuery(dynamicQuery,
 			projection);
 	}
 
-	@Override
+
 	public WebExSite fetchWebExSite(long webExSiteId) {
 		return webExSitePersistence.fetchByPrimaryKey(webExSiteId);
 	}
@@ -229,7 +229,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param groupId the primary key of the group
 	 * @return the matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchWebExSiteByUuidAndGroupId(String uuid, long groupId) {
 		return webExSitePersistence.fetchByUUID_G(uuid, groupId);
 	}
@@ -241,12 +241,12 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the web ex site
 	 * @throws PortalException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite getWebExSite(long webExSiteId) throws PortalException {
 		return webExSitePersistence.findByPrimaryKey(webExSiteId);
 	}
 
-	@Override
+
 	public ActionableDynamicQuery getActionableDynamicQuery() {
 		ActionableDynamicQuery actionableDynamicQuery = new DefaultActionableDynamicQuery();
 
@@ -259,7 +259,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 		return actionableDynamicQuery;
 	}
 
-	@Override
+
 	public IndexableActionableDynamicQuery getIndexableActionableDynamicQuery() {
 		IndexableActionableDynamicQuery indexableActionableDynamicQuery = new IndexableActionableDynamicQuery();
 
@@ -281,11 +281,11 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 		actionableDynamicQuery.setPrimaryKeyPropertyName("webExSiteId");
 	}
 
-	@Override
+
 	public ExportActionableDynamicQuery getExportActionableDynamicQuery(
 		final PortletDataContext portletDataContext) {
 		final ExportActionableDynamicQuery exportActionableDynamicQuery = new ExportActionableDynamicQuery() {
-				@Override
+
 				public long performCount() throws PortalException {
 					ManifestSummary manifestSummary = portletDataContext.getManifestSummary();
 
@@ -309,7 +309,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 		initActionableDynamicQuery(exportActionableDynamicQuery);
 
 		exportActionableDynamicQuery.setAddCriteriaMethod(new ActionableDynamicQuery.AddCriteriaMethod() {
-				@Override
+
 				public void addCriteria(DynamicQuery dynamicQuery) {
 					portletDataContext.addDateRangeCriteria(dynamicQuery,
 						"modifiedDate");
@@ -319,7 +319,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 		exportActionableDynamicQuery.setCompanyId(portletDataContext.getCompanyId());
 
 		exportActionableDynamicQuery.setPerformActionMethod(new ActionableDynamicQuery.PerformActionMethod<WebExSite>() {
-				@Override
+
 				public void performAction(WebExSite webExSite)
 					throws PortalException {
 					StagedModelDataHandlerUtil.exportStagedModel(portletDataContext,
@@ -335,13 +335,13 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	/**
 	 * @throws PortalException
 	 */
-	@Override
+
 	public PersistedModel deletePersistedModel(PersistedModel persistedModel)
 		throws PortalException {
 		return webExSiteLocalService.deleteWebExSite((WebExSite)persistedModel);
 	}
 
-	@Override
+
 	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 		throws PortalException {
 		return webExSitePersistence.findByPrimaryKey(primaryKeyObj);
@@ -354,7 +354,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param companyId the primary key of the company
 	 * @return the matching web ex sites, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<WebExSite> getWebExSitesByUuidAndCompanyId(String uuid,
 		long companyId) {
 		return webExSitePersistence.findByUuid_C(uuid, companyId);
@@ -370,7 +370,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the range of matching web ex sites, or an empty list if no matches were found
 	 */
-	@Override
+
 	public List<WebExSite> getWebExSitesByUuidAndCompanyId(String uuid,
 		long companyId, int start, int end,
 		OrderByComparator<WebExSite> orderByComparator) {
@@ -386,7 +386,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the matching web ex site
 	 * @throws PortalException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite getWebExSiteByUuidAndGroupId(String uuid, long groupId)
 		throws PortalException {
 		return webExSitePersistence.findByUUID_G(uuid, groupId);
@@ -403,7 +403,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @param end the upper bound of the range of web ex sites (not inclusive)
 	 * @return the range of web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> getWebExSites(int start, int end) {
 		return webExSitePersistence.findAll(start, end);
 	}
@@ -413,7 +413,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the number of web ex sites
 	 */
-	@Override
+
 	public int getWebExSitesCount() {
 		return webExSitePersistence.countAll();
 	}
@@ -425,7 +425,7 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 * @return the web ex site that was updated
 	 */
 	@Indexable(type = IndexableType.REINDEX)
-	@Override
+
 	public WebExSite updateWebExSite(WebExSite webExSite) {
 		return webExSitePersistence.update(webExSite);
 	}
@@ -676,12 +676,12 @@ public abstract class WebExSiteLocalServiceBaseImpl extends BaseLocalServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return WebExSiteLocalService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceClpInvoker.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceClpInvoker.java
index 8e007c60106..4489ee9227b 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceClpInvoker.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteLocalServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceBaseImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceBaseImpl.java
index 95ebfb4a9e6..285d84649f1 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceBaseImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
@@ -390,12 +390,12 @@ public abstract class WebExSiteServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return WebExSiteService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceClpInvoker.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceClpInvoker.java
index db456f43883..ee744232d4f 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceClpInvoker.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/base/WebExSiteServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.base;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceHttp.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceHttp.java
index 80888d93773..e8b418fb38e 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceHttp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.http;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceSoap.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceSoap.java
index 39ec93d5a24..9dd00f5c029 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceSoap.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExAccountServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.http;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceHttp.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceHttp.java
index 372b24ee9a4..98a60bd9883 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceHttp.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.http;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceSoap.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceSoap.java
index 8fba69551f3..1c296f78c16 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceSoap.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/http/WebExSiteServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.http;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountLocalServiceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountLocalServiceImpl.java
index da8e8232a62..cfefda36315 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountLocalServiceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.impl;
@@ -67,7 +67,7 @@ public class WebExAccountLocalServiceImpl
 		resourceLocalService.addModelResources(webExAccount, serviceContext);
 	}
 
-	@Override
+
 	public WebExAccount deleteWebExAccount(long webExAccountId)
 		throws PortalException {
 
@@ -77,7 +77,7 @@ public class WebExAccountLocalServiceImpl
 		return deleteWebExAccount(webExAccount);
 	}
 
-	@Override
+
 	public WebExAccount deleteWebExAccount(WebExAccount webExAccount)
 		throws PortalException {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountServiceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountServiceImpl.java
index 8d396a3b264..340b65bd995 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountServiceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExAccountServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.impl;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteLocalServiceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteLocalServiceImpl.java
index c4450c770be..53ab824952a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteLocalServiceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.impl;
@@ -73,7 +73,7 @@ public class WebExSiteLocalServiceImpl extends WebExSiteLocalServiceBaseImpl {
 		resourceLocalService.addModelResources(webExSite, serviceContext);
 	}
 
-	@Override
+
 	public WebExSite deleteWebExSite(long webExSiteId) throws PortalException {
 		WebExSite webExSite = webExSitePersistence.findByPrimaryKey(
 			webExSiteId);
@@ -81,7 +81,7 @@ public class WebExSiteLocalServiceImpl extends WebExSiteLocalServiceBaseImpl {
 		return deleteWebExSite(webExSite);
 	}
 
-	@Override
+
 	public WebExSite deleteWebExSite(WebExSite webExSite)
 		throws PortalException {
 
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteServiceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteServiceImpl.java
index 173c6d9624b..57c8dcc1460 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteServiceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/impl/WebExSiteServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.impl;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExAccountPermission.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExAccountPermission.java
index 40250330aa1..a74375800ff 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExAccountPermission.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExAccountPermission.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.permission;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExPermission.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExPermission.java
index 8c8bc8a8fe8..55f9823617a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExPermission.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExPermission.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.permission;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExSitePermission.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExSitePermission.java
index fae4af54fb0..531f913bf9e 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExSitePermission.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/permission/WebExSitePermission.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.permission;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExAccountPersistenceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExAccountPersistenceImpl.java
index a610d969d83..c58d2348618 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExAccountPersistenceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExAccountPersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.persistence.impl;
@@ -119,7 +119,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param uuid the uuid
 	 * @return the matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid(String uuid) {
 		return findByUuid(uuid, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -136,7 +136,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param end the upper bound of the range of web ex accounts (not inclusive)
 	 * @return the range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid(String uuid, int start, int end) {
 		return findByUuid(uuid, start, end, null);
 	}
@@ -154,7 +154,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid(String uuid, int start, int end,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		return findByUuid(uuid, start, end, orderByComparator, true);
@@ -174,7 +174,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid(String uuid, int start, int end,
 		OrderByComparator<WebExAccount> orderByComparator,
 		boolean retrieveFromCache) {
@@ -299,7 +299,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the first matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByUuid_First(String uuid,
 		OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -328,7 +328,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByUuid_First(String uuid,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		List<WebExAccount> list = findByUuid(uuid, 0, 1, orderByComparator);
@@ -348,7 +348,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the last matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByUuid_Last(String uuid,
 		OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -377,7 +377,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByUuid_Last(String uuid,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		int count = countByUuid(uuid);
@@ -405,7 +405,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the previous, current, and next web ex account
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount[] findByUuid_PrevAndNext(long webExAccountId,
 		String uuid, OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -561,7 +561,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 *
 	 * @param uuid the uuid
 	 */
-	@Override
+
 	public void removeByUuid(String uuid) {
 		for (WebExAccount webExAccount : findByUuid(uuid, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -575,7 +575,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param uuid the uuid
 	 * @return the number of matching web ex accounts
 	 */
-	@Override
+
 	public int countByUuid(String uuid) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID;
 
@@ -656,7 +656,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByUUID_G(String uuid, long groupId)
 		throws NoSuchAccountException {
 		WebExAccount webExAccount = fetchByUUID_G(uuid, groupId);
@@ -691,7 +691,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param groupId the group ID
 	 * @return the matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByUUID_G(String uuid, long groupId) {
 		return fetchByUUID_G(uuid, groupId, true);
 	}
@@ -704,7 +704,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByUUID_G(String uuid, long groupId,
 		boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { uuid, groupId };
@@ -809,7 +809,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param groupId the group ID
 	 * @return the web ex account that was removed
 	 */
-	@Override
+
 	public WebExAccount removeByUUID_G(String uuid, long groupId)
 		throws NoSuchAccountException {
 		WebExAccount webExAccount = findByUUID_G(uuid, groupId);
@@ -824,7 +824,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param groupId the group ID
 	 * @return the number of matching web ex accounts
 	 */
-	@Override
+
 	public int countByUUID_G(String uuid, long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_G;
 
@@ -919,7 +919,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param companyId the company ID
 	 * @return the matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid_C(String uuid, long companyId) {
 		return findByUuid_C(uuid, companyId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -938,7 +938,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param end the upper bound of the range of web ex accounts (not inclusive)
 	 * @return the range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid_C(String uuid, long companyId,
 		int start, int end) {
 		return findByUuid_C(uuid, companyId, start, end, null);
@@ -958,7 +958,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid_C(String uuid, long companyId,
 		int start, int end, OrderByComparator<WebExAccount> orderByComparator) {
 		return findByUuid_C(uuid, companyId, start, end, orderByComparator, true);
@@ -979,7 +979,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByUuid_C(String uuid, long companyId,
 		int start, int end, OrderByComparator<WebExAccount> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1114,7 +1114,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the first matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -1148,7 +1148,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		List<WebExAccount> list = findByUuid_C(uuid, companyId, 0, 1,
@@ -1170,7 +1170,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the last matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -1204,7 +1204,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		int count = countByUuid_C(uuid, companyId);
@@ -1233,7 +1233,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the previous, current, and next web ex account
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount[] findByUuid_C_PrevAndNext(long webExAccountId,
 		String uuid, long companyId,
 		OrderByComparator<WebExAccount> orderByComparator)
@@ -1395,7 +1395,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param uuid the uuid
 	 * @param companyId the company ID
 	 */
-	@Override
+
 	public void removeByUuid_C(String uuid, long companyId) {
 		for (WebExAccount webExAccount : findByUuid_C(uuid, companyId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1410,7 +1410,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param companyId the company ID
 	 * @return the number of matching web ex accounts
 	 */
-	@Override
+
 	public int countByUuid_C(String uuid, long companyId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_C;
 
@@ -1504,7 +1504,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param webExSiteId the web ex site ID
 	 * @return the matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByG_W(long groupId, long webExSiteId) {
 		return findByG_W(groupId, webExSiteId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1523,7 +1523,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param end the upper bound of the range of web ex accounts (not inclusive)
 	 * @return the range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByG_W(long groupId, long webExSiteId,
 		int start, int end) {
 		return findByG_W(groupId, webExSiteId, start, end, null);
@@ -1543,7 +1543,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByG_W(long groupId, long webExSiteId,
 		int start, int end, OrderByComparator<WebExAccount> orderByComparator) {
 		return findByG_W(groupId, webExSiteId, start, end, orderByComparator,
@@ -1565,7 +1565,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findByG_W(long groupId, long webExSiteId,
 		int start, int end, OrderByComparator<WebExAccount> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1686,7 +1686,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the first matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByG_W_First(long groupId, long webExSiteId,
 		OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -1720,7 +1720,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByG_W_First(long groupId, long webExSiteId,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		List<WebExAccount> list = findByG_W(groupId, webExSiteId, 0, 1,
@@ -1742,7 +1742,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the last matching web ex account
 	 * @throws NoSuchAccountException if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount findByG_W_Last(long groupId, long webExSiteId,
 		OrderByComparator<WebExAccount> orderByComparator)
 		throws NoSuchAccountException {
@@ -1776,7 +1776,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching web ex account, or <code>null</code> if a matching web ex account could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByG_W_Last(long groupId, long webExSiteId,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		int count = countByG_W(groupId, webExSiteId);
@@ -1805,7 +1805,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the previous, current, and next web ex account
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount[] findByG_W_PrevAndNext(long webExAccountId,
 		long groupId, long webExSiteId,
 		OrderByComparator<WebExAccount> orderByComparator)
@@ -1954,7 +1954,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param webExSiteId the web ex site ID
 	 * @return the matching web ex accounts that the user has permission to view
 	 */
-	@Override
+
 	public List<WebExAccount> filterFindByG_W(long groupId, long webExSiteId) {
 		return filterFindByG_W(groupId, webExSiteId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1973,7 +1973,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param end the upper bound of the range of web ex accounts (not inclusive)
 	 * @return the range of matching web ex accounts that the user has permission to view
 	 */
-	@Override
+
 	public List<WebExAccount> filterFindByG_W(long groupId, long webExSiteId,
 		int start, int end) {
 		return filterFindByG_W(groupId, webExSiteId, start, end, null);
@@ -1993,7 +1993,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex accounts that the user has permission to view
 	 */
-	@Override
+
 	public List<WebExAccount> filterFindByG_W(long groupId, long webExSiteId,
 		int start, int end, OrderByComparator<WebExAccount> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -2089,7 +2089,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the previous, current, and next web ex account
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount[] filterFindByG_W_PrevAndNext(long webExAccountId,
 		long groupId, long webExSiteId,
 		OrderByComparator<WebExAccount> orderByComparator)
@@ -2277,7 +2277,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param groupId the group ID
 	 * @param webExSiteId the web ex site ID
 	 */
-	@Override
+
 	public void removeByG_W(long groupId, long webExSiteId) {
 		for (WebExAccount webExAccount : findByG_W(groupId, webExSiteId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -2292,7 +2292,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param webExSiteId the web ex site ID
 	 * @return the number of matching web ex accounts
 	 */
-	@Override
+
 	public int countByG_W(long groupId, long webExSiteId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_G_W;
 
@@ -2348,7 +2348,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param webExSiteId the web ex site ID
 	 * @return the number of matching web ex accounts that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByG_W(long groupId, long webExSiteId) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByG_W(groupId, webExSiteId);
@@ -2406,7 +2406,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 *
 	 * @param webExAccount the web ex account
 	 */
-	@Override
+
 	public void cacheResult(WebExAccount webExAccount) {
 		entityCache.putResult(WebExAccountModelImpl.ENTITY_CACHE_ENABLED,
 			WebExAccountImpl.class, webExAccount.getPrimaryKey(), webExAccount);
@@ -2423,7 +2423,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 *
 	 * @param webExAccounts the web ex accounts
 	 */
-	@Override
+
 	public void cacheResult(List<WebExAccount> webExAccounts) {
 		for (WebExAccount webExAccount : webExAccounts) {
 			if (entityCache.getResult(
@@ -2444,7 +2444,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(WebExAccountImpl.class);
 
@@ -2460,7 +2460,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(WebExAccount webExAccount) {
 		entityCache.removeResult(WebExAccountModelImpl.ENTITY_CACHE_ENABLED,
 			WebExAccountImpl.class, webExAccount.getPrimaryKey());
@@ -2471,7 +2471,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 		clearUniqueFindersCache((WebExAccountModelImpl)webExAccount);
 	}
 
-	@Override
+
 	public void clearCache(List<WebExAccount> webExAccounts) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -2541,7 +2541,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param webExAccountId the primary key for the new web ex account
 	 * @return the new web ex account
 	 */
-	@Override
+
 	public WebExAccount create(long webExAccountId) {
 		WebExAccount webExAccount = new WebExAccountImpl();
 
@@ -2564,7 +2564,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the web ex account that was removed
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount remove(long webExAccountId)
 		throws NoSuchAccountException {
 		return remove((Serializable)webExAccountId);
@@ -2577,7 +2577,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the web ex account that was removed
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount remove(Serializable primaryKey)
 		throws NoSuchAccountException {
 		Session session = null;
@@ -2610,7 +2610,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 		}
 	}
 
-	@Override
+
 	protected WebExAccount removeImpl(WebExAccount webExAccount) {
 		webExAccount = toUnwrappedModel(webExAccount);
 
@@ -2642,7 +2642,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 		return webExAccount;
 	}
 
-	@Override
+
 	public WebExAccount updateImpl(WebExAccount webExAccount) {
 		webExAccount = toUnwrappedModel(webExAccount);
 
@@ -2810,7 +2810,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the web ex account
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchAccountException {
 		WebExAccount webExAccount = fetchByPrimaryKey(primaryKey);
@@ -2834,7 +2834,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @return the web ex account
 	 * @throws NoSuchAccountException if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount findByPrimaryKey(long webExAccountId)
 		throws NoSuchAccountException {
 		return findByPrimaryKey((Serializable)webExAccountId);
@@ -2846,7 +2846,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param primaryKey the primary key of the web ex account
 	 * @return the web ex account, or <code>null</code> if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByPrimaryKey(Serializable primaryKey) {
 		WebExAccount webExAccount = (WebExAccount)entityCache.getResult(WebExAccountModelImpl.ENTITY_CACHE_ENABLED,
 				WebExAccountImpl.class, primaryKey);
@@ -2892,12 +2892,12 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param webExAccountId the primary key of the web ex account
 	 * @return the web ex account, or <code>null</code> if a web ex account with the primary key could not be found
 	 */
-	@Override
+
 	public WebExAccount fetchByPrimaryKey(long webExAccountId) {
 		return fetchByPrimaryKey((Serializable)webExAccountId);
 	}
 
-	@Override
+
 	public Map<Serializable, WebExAccount> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -2994,7 +2994,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 *
 	 * @return the web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -3010,7 +3010,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param end the upper bound of the range of web ex accounts (not inclusive)
 	 * @return the range of web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -3027,7 +3027,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findAll(int start, int end,
 		OrderByComparator<WebExAccount> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -3046,7 +3046,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of web ex accounts
 	 */
-	@Override
+
 	public List<WebExAccount> findAll(int start, int end,
 		OrderByComparator<WebExAccount> orderByComparator,
 		boolean retrieveFromCache) {
@@ -3136,7 +3136,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 * Removes all the web ex accounts from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (WebExAccount webExAccount : findAll()) {
 			remove(webExAccount);
@@ -3148,7 +3148,7 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 	 *
 	 * @return the number of web ex accounts
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -3180,12 +3180,12 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return WebExAccountModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -3230,19 +3230,19 @@ public class WebExAccountPersistenceImpl extends BasePersistenceImpl<WebExAccoun
 				"uuid", "password"
 			});
 	private static final WebExAccount _nullWebExAccount = new WebExAccountImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<WebExAccount> toCacheModel() {
 				return _nullWebExAccountCacheModel;
 			}
 		};
 
 	private static final CacheModel<WebExAccount> _nullWebExAccountCacheModel = new CacheModel<WebExAccount>() {
-			@Override
+
 			public WebExAccount toEntityModel() {
 				return _nullWebExAccount;
 			}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExSitePersistenceImpl.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExSitePersistenceImpl.java
index 48b31324393..6b601f01ff7 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExSitePersistenceImpl.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/service/persistence/impl/WebExSitePersistenceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.service.persistence.impl;
@@ -120,7 +120,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param uuid the uuid
 	 * @return the matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid(String uuid) {
 		return findByUuid(uuid, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -137,7 +137,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param end the upper bound of the range of web ex sites (not inclusive)
 	 * @return the range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid(String uuid, int start, int end) {
 		return findByUuid(uuid, start, end, null);
 	}
@@ -155,7 +155,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid(String uuid, int start, int end,
 		OrderByComparator<WebExSite> orderByComparator) {
 		return findByUuid(uuid, start, end, orderByComparator, true);
@@ -175,7 +175,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid(String uuid, int start, int end,
 		OrderByComparator<WebExSite> orderByComparator,
 		boolean retrieveFromCache) {
@@ -300,7 +300,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the first matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByUuid_First(String uuid,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -329,7 +329,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByUuid_First(String uuid,
 		OrderByComparator<WebExSite> orderByComparator) {
 		List<WebExSite> list = findByUuid(uuid, 0, 1, orderByComparator);
@@ -349,7 +349,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the last matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByUuid_Last(String uuid,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -378,7 +378,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByUuid_Last(String uuid,
 		OrderByComparator<WebExSite> orderByComparator) {
 		int count = countByUuid(uuid);
@@ -406,7 +406,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the previous, current, and next web ex site
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite[] findByUuid_PrevAndNext(long webExSiteId, String uuid,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -562,7 +562,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 *
 	 * @param uuid the uuid
 	 */
-	@Override
+
 	public void removeByUuid(String uuid) {
 		for (WebExSite webExSite : findByUuid(uuid, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -576,7 +576,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param uuid the uuid
 	 * @return the number of matching web ex sites
 	 */
-	@Override
+
 	public int countByUuid(String uuid) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID;
 
@@ -657,7 +657,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByUUID_G(String uuid, long groupId)
 		throws NoSuchSiteException {
 		WebExSite webExSite = fetchByUUID_G(uuid, groupId);
@@ -692,7 +692,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByUUID_G(String uuid, long groupId) {
 		return fetchByUUID_G(uuid, groupId, true);
 	}
@@ -705,7 +705,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByUUID_G(String uuid, long groupId,
 		boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { uuid, groupId };
@@ -810,7 +810,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the web ex site that was removed
 	 */
-	@Override
+
 	public WebExSite removeByUUID_G(String uuid, long groupId)
 		throws NoSuchSiteException {
 		WebExSite webExSite = findByUUID_G(uuid, groupId);
@@ -825,7 +825,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the number of matching web ex sites
 	 */
-	@Override
+
 	public int countByUUID_G(String uuid, long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_G;
 
@@ -920,7 +920,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param companyId the company ID
 	 * @return the matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid_C(String uuid, long companyId) {
 		return findByUuid_C(uuid, companyId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -939,7 +939,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param end the upper bound of the range of web ex sites (not inclusive)
 	 * @return the range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid_C(String uuid, long companyId, int start,
 		int end) {
 		return findByUuid_C(uuid, companyId, start, end, null);
@@ -959,7 +959,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid_C(String uuid, long companyId, int start,
 		int end, OrderByComparator<WebExSite> orderByComparator) {
 		return findByUuid_C(uuid, companyId, start, end, orderByComparator, true);
@@ -980,7 +980,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByUuid_C(String uuid, long companyId, int start,
 		int end, OrderByComparator<WebExSite> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1115,7 +1115,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the first matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -1149,7 +1149,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByUuid_C_First(String uuid, long companyId,
 		OrderByComparator<WebExSite> orderByComparator) {
 		List<WebExSite> list = findByUuid_C(uuid, companyId, 0, 1,
@@ -1171,7 +1171,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the last matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -1205,7 +1205,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByUuid_C_Last(String uuid, long companyId,
 		OrderByComparator<WebExSite> orderByComparator) {
 		int count = countByUuid_C(uuid, companyId);
@@ -1234,7 +1234,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the previous, current, and next web ex site
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite[] findByUuid_C_PrevAndNext(long webExSiteId, String uuid,
 		long companyId, OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -1395,7 +1395,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param uuid the uuid
 	 * @param companyId the company ID
 	 */
-	@Override
+
 	public void removeByUuid_C(String uuid, long companyId) {
 		for (WebExSite webExSite : findByUuid_C(uuid, companyId,
 				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
@@ -1410,7 +1410,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param companyId the company ID
 	 * @return the number of matching web ex sites
 	 */
-	@Override
+
 	public int countByUuid_C(String uuid, long companyId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_UUID_C;
 
@@ -1503,7 +1503,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByGroupId(long groupId) {
 		return findByGroupId(groupId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -1520,7 +1520,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param end the upper bound of the range of web ex sites (not inclusive)
 	 * @return the range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByGroupId(long groupId, int start, int end) {
 		return findByGroupId(groupId, start, end, null);
 	}
@@ -1538,7 +1538,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByGroupId(long groupId, int start, int end,
 		OrderByComparator<WebExSite> orderByComparator) {
 		return findByGroupId(groupId, start, end, orderByComparator, true);
@@ -1558,7 +1558,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of matching web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findByGroupId(long groupId, int start, int end,
 		OrderByComparator<WebExSite> orderByComparator,
 		boolean retrieveFromCache) {
@@ -1669,7 +1669,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the first matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByGroupId_First(long groupId,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -1698,7 +1698,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the first matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByGroupId_First(long groupId,
 		OrderByComparator<WebExSite> orderByComparator) {
 		List<WebExSite> list = findByGroupId(groupId, 0, 1, orderByComparator);
@@ -1718,7 +1718,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the last matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findByGroupId_Last(long groupId,
 		OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -1747,7 +1747,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
 	 * @return the last matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByGroupId_Last(long groupId,
 		OrderByComparator<WebExSite> orderByComparator) {
 		int count = countByGroupId(groupId);
@@ -1775,7 +1775,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the previous, current, and next web ex site
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite[] findByGroupId_PrevAndNext(long webExSiteId,
 		long groupId, OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -1918,7 +1918,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the matching web ex sites that the user has permission to view
 	 */
-	@Override
+
 	public List<WebExSite> filterFindByGroupId(long groupId) {
 		return filterFindByGroupId(groupId, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
@@ -1936,7 +1936,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param end the upper bound of the range of web ex sites (not inclusive)
 	 * @return the range of matching web ex sites that the user has permission to view
 	 */
-	@Override
+
 	public List<WebExSite> filterFindByGroupId(long groupId, int start, int end) {
 		return filterFindByGroupId(groupId, start, end, null);
 	}
@@ -1954,7 +1954,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of matching web ex sites that the user has permission to view
 	 */
-	@Override
+
 	public List<WebExSite> filterFindByGroupId(long groupId, int start,
 		int end, OrderByComparator<WebExSite> orderByComparator) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
@@ -2044,7 +2044,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the previous, current, and next web ex site
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite[] filterFindByGroupId_PrevAndNext(long webExSiteId,
 		long groupId, OrderByComparator<WebExSite> orderByComparator)
 		throws NoSuchSiteException {
@@ -2226,7 +2226,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 *
 	 * @param groupId the group ID
 	 */
-	@Override
+
 	public void removeByGroupId(long groupId) {
 		for (WebExSite webExSite : findByGroupId(groupId, QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS, null)) {
@@ -2240,7 +2240,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the number of matching web ex sites
 	 */
-	@Override
+
 	public int countByGroupId(long groupId) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_GROUPID;
 
@@ -2291,7 +2291,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param groupId the group ID
 	 * @return the number of matching web ex sites that the user has permission to view
 	 */
-	@Override
+
 	public int filterCountByGroupId(long groupId) {
 		if (!InlineSQLHelperUtil.isEnabled(groupId)) {
 			return countByGroupId(groupId);
@@ -2351,7 +2351,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the matching web ex site
 	 * @throws NoSuchSiteException if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite findBySiteKey(long siteKey) throws NoSuchSiteException {
 		WebExSite webExSite = fetchBySiteKey(siteKey);
 
@@ -2381,7 +2381,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param siteKey the site key
 	 * @return the matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchBySiteKey(long siteKey) {
 		return fetchBySiteKey(siteKey, true);
 	}
@@ -2393,7 +2393,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the matching web ex site, or <code>null</code> if a matching web ex site could not be found
 	 */
-	@Override
+
 	public WebExSite fetchBySiteKey(long siteKey, boolean retrieveFromCache) {
 		Object[] finderArgs = new Object[] { siteKey };
 
@@ -2483,7 +2483,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param siteKey the site key
 	 * @return the web ex site that was removed
 	 */
-	@Override
+
 	public WebExSite removeBySiteKey(long siteKey) throws NoSuchSiteException {
 		WebExSite webExSite = findBySiteKey(siteKey);
 
@@ -2496,7 +2496,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param siteKey the site key
 	 * @return the number of matching web ex sites
 	 */
-	@Override
+
 	public int countBySiteKey(long siteKey) {
 		FinderPath finderPath = FINDER_PATH_COUNT_BY_SITEKEY;
 
@@ -2552,7 +2552,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 *
 	 * @param webExSite the web ex site
 	 */
-	@Override
+
 	public void cacheResult(WebExSite webExSite) {
 		entityCache.putResult(WebExSiteModelImpl.ENTITY_CACHE_ENABLED,
 			WebExSiteImpl.class, webExSite.getPrimaryKey(), webExSite);
@@ -2572,7 +2572,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 *
 	 * @param webExSites the web ex sites
 	 */
-	@Override
+
 	public void cacheResult(List<WebExSite> webExSites) {
 		for (WebExSite webExSite : webExSites) {
 			if (entityCache.getResult(WebExSiteModelImpl.ENTITY_CACHE_ENABLED,
@@ -2592,7 +2592,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache() {
 		entityCache.clearCache(WebExSiteImpl.class);
 
@@ -2608,7 +2608,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * The {@link EntityCache} and {@link FinderCache} are both cleared by this method.
 	 * </p>
 	 */
-	@Override
+
 	public void clearCache(WebExSite webExSite) {
 		entityCache.removeResult(WebExSiteModelImpl.ENTITY_CACHE_ENABLED,
 			WebExSiteImpl.class, webExSite.getPrimaryKey());
@@ -2619,7 +2619,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 		clearUniqueFindersCache((WebExSiteModelImpl)webExSite);
 	}
 
-	@Override
+
 	public void clearCache(List<WebExSite> webExSites) {
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 		finderCache.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
@@ -2718,7 +2718,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param webExSiteId the primary key for the new web ex site
 	 * @return the new web ex site
 	 */
-	@Override
+
 	public WebExSite create(long webExSiteId) {
 		WebExSite webExSite = new WebExSiteImpl();
 
@@ -2741,7 +2741,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the web ex site that was removed
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite remove(long webExSiteId) throws NoSuchSiteException {
 		return remove((Serializable)webExSiteId);
 	}
@@ -2753,7 +2753,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the web ex site that was removed
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite remove(Serializable primaryKey) throws NoSuchSiteException {
 		Session session = null;
 
@@ -2785,7 +2785,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 		}
 	}
 
-	@Override
+
 	protected WebExSite removeImpl(WebExSite webExSite) {
 		webExSite = toUnwrappedModel(webExSite);
 
@@ -2817,7 +2817,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 		return webExSite;
 	}
 
-	@Override
+
 	public WebExSite updateImpl(WebExSite webExSite) {
 		webExSite = toUnwrappedModel(webExSite);
 
@@ -2983,7 +2983,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the web ex site
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite findByPrimaryKey(Serializable primaryKey)
 		throws NoSuchSiteException {
 		WebExSite webExSite = fetchByPrimaryKey(primaryKey);
@@ -3007,7 +3007,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @return the web ex site
 	 * @throws NoSuchSiteException if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite findByPrimaryKey(long webExSiteId)
 		throws NoSuchSiteException {
 		return findByPrimaryKey((Serializable)webExSiteId);
@@ -3019,7 +3019,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param primaryKey the primary key of the web ex site
 	 * @return the web ex site, or <code>null</code> if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByPrimaryKey(Serializable primaryKey) {
 		WebExSite webExSite = (WebExSite)entityCache.getResult(WebExSiteModelImpl.ENTITY_CACHE_ENABLED,
 				WebExSiteImpl.class, primaryKey);
@@ -3065,12 +3065,12 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param webExSiteId the primary key of the web ex site
 	 * @return the web ex site, or <code>null</code> if a web ex site with the primary key could not be found
 	 */
-	@Override
+
 	public WebExSite fetchByPrimaryKey(long webExSiteId) {
 		return fetchByPrimaryKey((Serializable)webExSiteId);
 	}
 
-	@Override
+
 	public Map<Serializable, WebExSite> fetchByPrimaryKeys(
 		Set<Serializable> primaryKeys) {
 		if (primaryKeys.isEmpty()) {
@@ -3167,7 +3167,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 *
 	 * @return the web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findAll() {
 		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 	}
@@ -3183,7 +3183,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param end the upper bound of the range of web ex sites (not inclusive)
 	 * @return the range of web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findAll(int start, int end) {
 		return findAll(start, end, null);
 	}
@@ -3200,7 +3200,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
 	 * @return the ordered range of web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findAll(int start, int end,
 		OrderByComparator<WebExSite> orderByComparator) {
 		return findAll(start, end, orderByComparator, true);
@@ -3219,7 +3219,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * @param retrieveFromCache whether to retrieve from the finder cache
 	 * @return the ordered range of web ex sites
 	 */
-	@Override
+
 	public List<WebExSite> findAll(int start, int end,
 		OrderByComparator<WebExSite> orderByComparator,
 		boolean retrieveFromCache) {
@@ -3309,7 +3309,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 * Removes all the web ex sites from the database.
 	 *
 	 */
-	@Override
+
 	public void removeAll() {
 		for (WebExSite webExSite : findAll()) {
 			remove(webExSite);
@@ -3321,7 +3321,7 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 	 *
 	 * @return the number of web ex sites
 	 */
-	@Override
+
 	public int countAll() {
 		Long count = (Long)finderCache.getResult(FINDER_PATH_COUNT_ALL,
 				FINDER_ARGS_EMPTY, this);
@@ -3353,12 +3353,12 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 		return count.intValue();
 	}
 
-	@Override
+
 	public Set<String> getBadColumnNames() {
 		return _badColumnNames;
 	}
 
-	@Override
+
 	protected Map<String, Integer> getTableColumnsMap() {
 		return WebExSiteModelImpl.TABLE_COLUMNS_MAP;
 	}
@@ -3403,19 +3403,19 @@ public class WebExSitePersistenceImpl extends BasePersistenceImpl<WebExSite>
 				"uuid", "password"
 			});
 	private static final WebExSite _nullWebExSite = new WebExSiteImpl() {
-			@Override
+
 			public Object clone() {
 				return this;
 			}
 
-			@Override
+
 			public CacheModel<WebExSite> toCacheModel() {
 				return _nullWebExSiteCacheModel;
 			}
 		};
 
 	private static final CacheModel<WebExSite> _nullWebExSiteCacheModel = new CacheModel<WebExSite>() {
-			@Override
+
 			public WebExSite toEntityModel() {
 				return _nullWebExSite;
 			}
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/HttpPostTransport.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/HttpPostTransport.java
index b07919d68fe..2d1c19b1922 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/HttpPostTransport.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/HttpPostTransport.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.transport;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/Transport.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/Transport.java
index 605553f7706..fef00d20c32 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/Transport.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/transport/Transport.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.transport;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/ActionKeys.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/ActionKeys.java
index 27e1ea20863..39972262da5 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/ActionKeys.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/ActionKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.util;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/CalendarUtil.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/CalendarUtil.java
index 512af1bdf3b..00d21d4d88a 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/CalendarUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/CalendarUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.util;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/TimeZoneUtil.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/TimeZoneUtil.java
index 514d1c7f2e7..5f092f235f7 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/TimeZoneUtil.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/TimeZoneUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.util;
diff --git a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/WebExConstants.java b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/WebExConstants.java
index e1bde720869..ab2fe3cfc18 100644
--- a/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/WebExConstants.java
+++ b/portlets/webex-portlet/docroot/WEB-INF/src/com/liferay/meeting/webex/util/WebExConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.meeting.webex.util;
diff --git a/portlets/webex-portlet/docroot/init.jsp b/portlets/webex-portlet/docroot/init.jsp
index 8abcf2a49ce..591760753b7 100644
--- a/portlets/webex-portlet/docroot/init.jsp
+++ b/portlets/webex-portlet/docroot/init.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/account_action.jsp b/portlets/webex-portlet/docroot/meetings/account_action.jsp
index 65d5fe2fd1b..a2970e9f867 100644
--- a/portlets/webex-portlet/docroot/meetings/account_action.jsp
+++ b/portlets/webex-portlet/docroot/meetings/account_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/accounts.jspf b/portlets/webex-portlet/docroot/meetings/accounts.jspf
index 448134c2965..02e511a85d1 100644
--- a/portlets/webex-portlet/docroot/meetings/accounts.jspf
+++ b/portlets/webex-portlet/docroot/meetings/accounts.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/edit_account.jsp b/portlets/webex-portlet/docroot/meetings/edit_account.jsp
index b472c27ebaf..87822d0aad4 100644
--- a/portlets/webex-portlet/docroot/meetings/edit_account.jsp
+++ b/portlets/webex-portlet/docroot/meetings/edit_account.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/edit_meeting.jsp b/portlets/webex-portlet/docroot/meetings/edit_meeting.jsp
index e6a845f2b26..0bfc5595319 100644
--- a/portlets/webex-portlet/docroot/meetings/edit_meeting.jsp
+++ b/portlets/webex-portlet/docroot/meetings/edit_meeting.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/edit_site.jsp b/portlets/webex-portlet/docroot/meetings/edit_site.jsp
index b439c2924b5..b97e8036ffd 100644
--- a/portlets/webex-portlet/docroot/meetings/edit_site.jsp
+++ b/portlets/webex-portlet/docroot/meetings/edit_site.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/meeting_action.jsp b/portlets/webex-portlet/docroot/meetings/meeting_action.jsp
index 2e464d5b0f1..8f30f08e76e 100644
--- a/portlets/webex-portlet/docroot/meetings/meeting_action.jsp
+++ b/portlets/webex-portlet/docroot/meetings/meeting_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/meetings.jspf b/portlets/webex-portlet/docroot/meetings/meetings.jspf
index dcf1a04b7e2..0e73bbd7ae5 100644
--- a/portlets/webex-portlet/docroot/meetings/meetings.jspf
+++ b/portlets/webex-portlet/docroot/meetings/meetings.jspf
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/site_action.jsp b/portlets/webex-portlet/docroot/meetings/site_action.jsp
index d1c97341081..418ce6f80c5 100644
--- a/portlets/webex-portlet/docroot/meetings/site_action.jsp
+++ b/portlets/webex-portlet/docroot/meetings/site_action.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/view.jsp b/portlets/webex-portlet/docroot/meetings/view.jsp
index f43f97f83d3..d03d29ff331 100644
--- a/portlets/webex-portlet/docroot/meetings/view.jsp
+++ b/portlets/webex-portlet/docroot/meetings/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/view_account.jsp b/portlets/webex-portlet/docroot/meetings/view_account.jsp
index c1ead4fdaed..9ce629e356f 100644
--- a/portlets/webex-portlet/docroot/meetings/view_account.jsp
+++ b/portlets/webex-portlet/docroot/meetings/view_account.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/view_meeting.jsp b/portlets/webex-portlet/docroot/meetings/view_meeting.jsp
index dd05921a1e6..5f151da94b4 100644
--- a/portlets/webex-portlet/docroot/meetings/view_meeting.jsp
+++ b/portlets/webex-portlet/docroot/meetings/view_meeting.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/webex-portlet/docroot/meetings/view_site.jsp b/portlets/webex-portlet/docroot/meetings/view_site.jsp
index cea903bee07..3685c00db3c 100644
--- a/portlets/webex-portlet/docroot/meetings/view_site.jsp
+++ b/portlets/webex-portlet/docroot/meetings/view_site.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/model/WCEntry.java b/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/model/WCEntry.java
index 5fcb9678160..792ca6ebaae 100644
--- a/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/model/WCEntry.java
+++ b/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/model/WCEntry.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.westminstercatechism.model;
diff --git a/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/util/WCUtil.java b/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/util/WCUtil.java
index 739e7b735b7..ca4458e9b22 100644
--- a/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/util/WCUtil.java
+++ b/portlets/westminster-catechism-portlet/docroot/WEB-INF/src/com/liferay/westminstercatechism/util/WCUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.westminstercatechism.util;
diff --git a/portlets/westminster-catechism-portlet/docroot/view.jsp b/portlets/westminster-catechism-portlet/docroot/view.jsp
index ee8ec6acd14..6a92c2e3fae 100644
--- a/portlets/westminster-catechism-portlet/docroot/view.jsp
+++ b/portlets/westminster-catechism-portlet/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/AMIBuilder.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/AMIBuilder.java
index bc8be102524..33c8c0b6efc 100644
--- a/shared/amazon-tools-shared/src/com/liferay/amazontools/AMIBuilder.java
+++ b/shared/amazon-tools-shared/src/com/liferay/amazontools/AMIBuilder.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.amazontools;
@@ -93,7 +93,7 @@ public class AMIBuilder extends BaseAMITool {
 		runtime.addShutdownHook(
 			new Thread() {
 
-				@Override
+
 				public void run() {
 					amiBuilder.destroy();
 				}
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/AMICleaner.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/AMICleaner.java
index 68fa6038d7a..9414903bcf6 100644
--- a/shared/amazon-tools-shared/src/com/liferay/amazontools/AMICleaner.java
+++ b/shared/amazon-tools-shared/src/com/liferay/amazontools/AMICleaner.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.amazontools;
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/AlarmCleaner.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/AlarmCleaner.java
index 48147852a6e..8738e1a92f0 100644
--- a/shared/amazon-tools-shared/src/com/liferay/amazontools/AlarmCleaner.java
+++ b/shared/amazon-tools-shared/src/com/liferay/amazontools/AlarmCleaner.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.amazontools;
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/AsgardAMIDeployer.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/AsgardAMIDeployer.java
index 3bf2f9da860..2fc71587e3b 100644
--- a/shared/amazon-tools-shared/src/com/liferay/amazontools/AsgardAMIDeployer.java
+++ b/shared/amazon-tools-shared/src/com/liferay/amazontools/AsgardAMIDeployer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.amazontools;
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/BaseAMITool.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/BaseAMITool.java
index 48b61741887..a284358facd 100644
--- a/shared/amazon-tools-shared/src/com/liferay/amazontools/BaseAMITool.java
+++ b/shared/amazon-tools-shared/src/com/liferay/amazontools/BaseAMITool.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.amazontools;
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/S3Cleaner.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/S3Cleaner.java
index f8df5fb2feb..88948792c6f 100644
--- a/shared/amazon-tools-shared/src/com/liferay/amazontools/S3Cleaner.java
+++ b/shared/amazon-tools-shared/src/com/liferay/amazontools/S3Cleaner.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.amazontools;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequest.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequest.java
index 71fc024eb05..605227dd463 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequest.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequestImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequestImpl.java
index 77a08171b0f..b4f16f2fc66 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequestImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionRequestImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -47,197 +47,197 @@ public class CDIActionRequestImpl extends CDIActionRequest {
 		_httpServletRequestAdapter = httpServletRequestAdapter;
 	}
 
-	@Override
+
 	public boolean authenticate(HttpServletResponse httpServletResponse)
 		throws IOException, ServletException {
 
 		return _httpServletRequestAdapter.authenticate(httpServletResponse);
 	}
 
-	@Override
+
 	public AsyncContext getAsyncContext() {
 		return _httpServletRequestAdapter.getAsyncContext();
 	}
 
-	@Override
+
 	public long getDateHeader(String name) {
 		return _httpServletRequestAdapter.getDateHeader(name);
 	}
 
-	@Override
+
 	public DispatcherType getDispatcherType() {
 		return _httpServletRequestAdapter.getDispatcherType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletRequestAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaderNames() {
 		return _httpServletRequestAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaders(String name) {
 		return _httpServletRequestAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletInputStream getInputStream() throws IOException {
 		return _httpServletRequestAdapter.getInputStream();
 	}
 
-	@Override
+
 	public int getIntHeader(String name) {
 		return _httpServletRequestAdapter.getIntHeader(name);
 	}
 
-	@Override
+
 	public String getLocalAddr() {
 		return _httpServletRequestAdapter.getLocalAddr();
 	}
 
-	@Override
+
 	public String getLocalName() {
 		return _httpServletRequestAdapter.getLocalName();
 	}
 
-	@Override
+
 	public int getLocalPort() {
 		return _httpServletRequestAdapter.getLocalPort();
 	}
 
-	@Override
+
 	public Part getPart(String name) throws IOException, ServletException {
 		return _httpServletRequestAdapter.getPart(name);
 	}
 
-	@Override
+
 	public Collection<Part> getParts() throws IOException, ServletException {
 		return _httpServletRequestAdapter.getParts();
 	}
 
-	@Override
+
 	public String getPathInfo() {
 		return _httpServletRequestAdapter.getPathInfo();
 	}
 
-	@Override
+
 	public String getPathTranslated() {
 		return _httpServletRequestAdapter.getPathTranslated();
 	}
 
-	@Override
+
 	public String getProtocol() {
 		return _httpServletRequestAdapter.getProtocol();
 	}
 
-	@Override
+
 	public String getQueryString() {
 		return _httpServletRequestAdapter.getQueryString();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String getRealPath(String path) {
 		return _httpServletRequestAdapter.getRealPath(path);
 	}
 
-	@Override
+
 	public String getRemoteAddr() {
 		return _httpServletRequestAdapter.getRemoteAddr();
 	}
 
-	@Override
+
 	public String getRemoteHost() {
 		return _httpServletRequestAdapter.getRemoteHost();
 	}
 
-	@Override
+
 	public int getRemotePort() {
 		return _httpServletRequestAdapter.getRemotePort();
 	}
 
-	@Override
+
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return _httpServletRequestAdapter.getRequestDispatcher(path);
 	}
 
-	@Override
+
 	public String getRequestURI() {
 		return _httpServletRequestAdapter.getRequestURI();
 	}
 
-	@Override
+
 	public StringBuffer getRequestURL() {
 		return _httpServletRequestAdapter.getRequestURL();
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		return _httpServletRequestAdapter.getServletContext();
 	}
 
-	@Override
+
 	public String getServletPath() {
 		return _httpServletRequestAdapter.getServletPath();
 	}
 
-	@Override
+
 	public HttpSession getSession() {
 		return _httpServletRequestAdapter.getSession();
 	}
 
-	@Override
+
 	public HttpSession getSession(boolean create) {
 		return _httpServletRequestAdapter.getSession(create);
 	}
 
-	@Override
+
 	public boolean isAsyncStarted() {
 		return _httpServletRequestAdapter.isAsyncStarted();
 	}
 
-	@Override
+
 	public boolean isAsyncSupported() {
 		return _httpServletRequestAdapter.isAsyncSupported();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromCookie() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromCookie();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromUrl() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromURL();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromURL() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromURL();
 	}
 
-	@Override
+
 	public void login(String username, String password)
 		throws ServletException {
 
 		_httpServletRequestAdapter.login(username, password);
 	}
 
-	@Override
+
 	public void logout() throws ServletException {
 		_httpServletRequestAdapter.logout();
 	}
 
-	@Override
+
 	public AsyncContext startAsync() throws IllegalStateException {
 		return _httpServletRequestAdapter.startAsync();
 	}
 
-	@Override
+
 	public AsyncContext startAsync(
 			ServletRequest servletRequest, ServletResponse servletResponse)
 		throws IllegalStateException {
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponse.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponse.java
index 3b9e3c1d910..c16850f7da0 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponse.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponse.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponseImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponseImpl.java
index 2c7a546bd95..90982397987 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponseImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIActionResponseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -39,174 +39,174 @@ public class CDIActionResponseImpl extends CDIActionResponse {
 		_httpServletResponseAdapter = httpServletResponseAdapter;
 	}
 
-	@Override
+
 	public void addCookie(Cookie cookie) {
 		_httpServletResponseAdapter.addCookie(cookie);
 	}
 
-	@Override
+
 	public void addDateHeader(String name, long value) {
 		_httpServletResponseAdapter.addDateHeader(name, value);
 	}
 
-	@Override
+
 	public void addHeader(String name, String value) {
 		_httpServletResponseAdapter.addHeader(name, value);
 	}
 
-	@Override
+
 	public void addIntHeader(String name, int value) {
 		_httpServletResponseAdapter.addIntHeader(name, value);
 	}
 
-	@Override
+
 	public boolean containsHeader(String name) {
 		return _httpServletResponseAdapter.containsHeader(name);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeRedirectUrl(String url) {
 		return _httpServletResponseAdapter.encodeRedirectUrl(url);
 	}
 
-	@Override
+
 	public String encodeRedirectURL(String url) {
 		return _httpServletResponseAdapter.encodeRedirectURL(url);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeUrl(String url) {
 		return _httpServletResponseAdapter.encodeUrl(url);
 	}
 
-	@Override
+
 	public void flushBuffer() throws IOException {
 		_httpServletResponseAdapter.flushBuffer();
 	}
 
-	@Override
+
 	public int getBufferSize() {
 		return _httpServletResponseAdapter.getBufferSize();
 	}
 
-	@Override
+
 	public String getCharacterEncoding() {
 		return _httpServletResponseAdapter.getCharacterEncoding();
 	}
 
-	@Override
+
 	public String getContentType() {
 		return _httpServletResponseAdapter.getContentType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletResponseAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Collection<String> getHeaderNames() {
 		return _httpServletResponseAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Collection<String> getHeaders(String name) {
 		return _httpServletResponseAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public Locale getLocale() {
 		return _httpServletResponseAdapter.getLocale();
 	}
 
-	@Override
+
 	public ServletOutputStream getOutputStream() throws IOException {
 		return _httpServletResponseAdapter.getOutputStream();
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _httpServletResponseAdapter.getStatus();
 	}
 
-	@Override
+
 	public PrintWriter getWriter() throws IOException {
 		return _httpServletResponseAdapter.getWriter();
 	}
 
-	@Override
+
 	public boolean isCommitted() {
 		return _httpServletResponseAdapter.isCommitted();
 	}
 
-	@Override
+
 	public void reset() {
 		_httpServletResponseAdapter.reset();
 	}
 
-	@Override
+
 	public void resetBuffer() {
 		_httpServletResponseAdapter.resetBuffer();
 	}
 
-	@Override
+
 	public void sendError(int status) throws IOException {
 		_httpServletResponseAdapter.sendError(status);
 	}
 
-	@Override
+
 	public void sendError(int status, String message) throws IOException {
 		_httpServletResponseAdapter.sendError(status, message);
 	}
 
-	@Override
+
 	public void setBufferSize(int bufferSize) {
 		_httpServletResponseAdapter.setBufferSize(bufferSize);
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding) {
 		_httpServletResponseAdapter.setCharacterEncoding(encoding);
 	}
 
-	@Override
+
 	public void setContentLength(int contentLength) {
 		_httpServletResponseAdapter.setContentLength(contentLength);
 	}
 
-	@Override
+
 	public void setContentType(String contentType) {
 		_httpServletResponseAdapter.setContentType(contentType);
 	}
 
-	@Override
+
 	public void setDateHeader(String name, long value) {
 		_httpServletResponseAdapter.setDateHeader(name, value);
 	}
 
-	@Override
+
 	public void setHeader(String name, String value) {
 		_httpServletResponseAdapter.setHeader(name, value);
 	}
 
-	@Override
+
 	public void setIntHeader(String name, int value) {
 		_httpServletResponseAdapter.setIntHeader(name, value);
 	}
 
-	@Override
+
 	public void setLocale(Locale locale) {
 		_httpServletResponseAdapter.setLocale(locale);
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_httpServletResponseAdapter.setStatus(status);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public void setStatus(int status, String message) {
 		_httpServletResponseAdapter.setStatus(status, message);
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIBeanManagerUtil.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIBeanManagerUtil.java
index b1f9f7eeccf..8cd51263c0f 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIBeanManagerUtil.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIBeanManagerUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIContextListener.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIContextListener.java
index 980c44ed6c5..9177db22e32 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIContextListener.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -35,11 +35,11 @@ import javax.servlet.annotation.WebListener;
 @WebListener
 public class CDIContextListener implements ServletContextListener {
 
-	@Override
+
 	public void contextDestroyed(ServletContextEvent servletContextEvent) {
 	}
 
-	@Override
+
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		BeanManager beanManager = CDIBeanManagerUtil.getBeanManager();
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextFilter.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextFilter.java
index 9595006d8f4..6e7af7ef0d5 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextFilter.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextFilter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -29,11 +29,11 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class CDICrossContextFilter implements Filter {
 
-	@Override
+
 	public void destroy() {
 	}
 
-	@Override
+
 	public void doFilter(
 			ServletRequest servletRequest, ServletResponse servletResponse,
 			FilterChain filterChain)
@@ -49,7 +49,7 @@ public class CDICrossContextFilter implements Filter {
 		filterChain.doFilter(servletRequest, servletResponse);
 	}
 
-	@Override
+
 	public void init(FilterConfig filterConfig) {
 	}
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequest.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequest.java
index 40ce960fc49..f78b553b5bf 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequest.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -26,7 +26,7 @@ public class CDICrossContextRequest extends HttpServletRequestWrapper {
 		super(httpServletRequest);
 	}
 
-	@Override
+
 	public HttpServletRequest getRequest() {
 		return (HttpServletRequest)super.getRequest();
 	}
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequestImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequestImpl.java
index 70a0d3dce55..f6d05e1f46a 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequestImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextRequestImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -26,7 +26,7 @@ public class CDICrossContextRequestImpl extends CDICrossContextRequest {
 		super(httpServletRequest);
 	}
 
-	@Override
+
 	public HttpSession getSession(boolean create) {
 		if (_httpSession == null) {
 			HttpServletRequest httpServletRequest = getRequest();
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSession.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSession.java
index 24f6e7bda7d..24c62f58e60 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSession.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSession.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSessionImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSessionImpl.java
index 8070b213811..8b618e86633 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSessionImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDICrossContextSessionImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequest.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequest.java
index 1efddd843cb..ada83246c28 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequest.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequestImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequestImpl.java
index eb7d9f6cffd..38e35b031f4 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequestImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventRequestImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -49,225 +49,225 @@ public class CDIEventRequestImpl extends CDIEventRequest {
 		_httpServletRequestAdapter = httpServletRequestAdapter;
 	}
 
-	@Override
+
 	public boolean authenticate(HttpServletResponse httpServletResponse)
 		throws IOException, ServletException {
 
 		return _httpServletRequestAdapter.authenticate(httpServletResponse);
 	}
 
-	@Override
+
 	public AsyncContext getAsyncContext() {
 		return _httpServletRequestAdapter.getAsyncContext();
 	}
 
-	@Override
+
 	public String getCharacterEncoding() {
 		return _httpServletRequestAdapter.getCharacterEncoding();
 	}
 
-	@Override
+
 	public int getContentLength() {
 		return _httpServletRequestAdapter.getContentLength();
 	}
 
-	@Override
+
 	public String getContentType() {
 		return _httpServletRequestAdapter.getContentType();
 	}
 
-	@Override
+
 	public long getDateHeader(String name) {
 		return _httpServletRequestAdapter.getDateHeader(name);
 	}
 
-	@Override
+
 	public DispatcherType getDispatcherType() {
 		return _httpServletRequestAdapter.getDispatcherType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletRequestAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaderNames() {
 		return _httpServletRequestAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaders(String name) {
 		return _httpServletRequestAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletInputStream getInputStream() throws IOException {
 		return _httpServletRequestAdapter.getInputStream();
 	}
 
-	@Override
+
 	public int getIntHeader(String name) {
 		return _httpServletRequestAdapter.getIntHeader(name);
 	}
 
-	@Override
+
 	public String getLocalAddr() {
 		return _httpServletRequestAdapter.getLocalAddr();
 	}
 
-	@Override
+
 	public String getLocalName() {
 		return _httpServletRequestAdapter.getLocalName();
 	}
 
-	@Override
+
 	public int getLocalPort() {
 		return _httpServletRequestAdapter.getLocalPort();
 	}
 
-	@Override
+
 	public Part getPart(String name) throws IOException, ServletException {
 		return _httpServletRequestAdapter.getPart(name);
 	}
 
-	@Override
+
 	public Collection<Part> getParts() throws IOException, ServletException {
 		return _httpServletRequestAdapter.getParts();
 	}
 
-	@Override
+
 	public String getPathInfo() {
 		return _httpServletRequestAdapter.getPathInfo();
 	}
 
-	@Override
+
 	public String getPathTranslated() {
 		return _httpServletRequestAdapter.getPathTranslated();
 	}
 
-	@Override
+
 	public String getProtocol() {
 		return _httpServletRequestAdapter.getProtocol();
 	}
 
-	@Override
+
 	public String getQueryString() {
 		return _httpServletRequestAdapter.getQueryString();
 	}
 
-	@Override
+
 	public BufferedReader getReader() throws IOException {
 		return _httpServletRequestAdapter.getReader();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String getRealPath(String path) {
 		return _httpServletRequestAdapter.getRealPath(path);
 	}
 
-	@Override
+
 	public String getRemoteAddr() {
 		return _httpServletRequestAdapter.getRemoteAddr();
 	}
 
-	@Override
+
 	public String getRemoteHost() {
 		return _httpServletRequestAdapter.getRemoteHost();
 	}
 
-	@Override
+
 	public int getRemotePort() {
 		return _httpServletRequestAdapter.getRemotePort();
 	}
 
-	@Override
+
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return _httpServletRequestAdapter.getRequestDispatcher(path);
 	}
 
-	@Override
+
 	public String getRequestURI() {
 		return _httpServletRequestAdapter.getRequestURI();
 	}
 
-	@Override
+
 	public StringBuffer getRequestURL() {
 		return _httpServletRequestAdapter.getRequestURL();
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		return _httpServletRequestAdapter.getServletContext();
 	}
 
-	@Override
+
 	public String getServletPath() {
 		return _httpServletRequestAdapter.getServletPath();
 	}
 
-	@Override
+
 	public HttpSession getSession() {
 		return _httpServletRequestAdapter.getSession();
 	}
 
-	@Override
+
 	public HttpSession getSession(boolean create) {
 		return _httpServletRequestAdapter.getSession(create);
 	}
 
-	@Override
+
 	public boolean isAsyncStarted() {
 		return _httpServletRequestAdapter.isAsyncStarted();
 	}
 
-	@Override
+
 	public boolean isAsyncSupported() {
 		return _httpServletRequestAdapter.isAsyncSupported();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromCookie() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromCookie();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public boolean isRequestedSessionIdFromUrl() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromUrl();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromURL() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromURL();
 	}
 
-	@Override
+
 	public void login(String username, String password)
 		throws ServletException {
 
 		_httpServletRequestAdapter.login(username, password);
 	}
 
-	@Override
+
 	public void logout() throws ServletException {
 		_httpServletRequestAdapter.logout();
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding)
 		throws UnsupportedEncodingException {
 
 		_httpServletRequestAdapter.setCharacterEncoding(encoding);
 	}
 
-	@Override
+
 	public AsyncContext startAsync() throws IllegalStateException {
 		return _httpServletRequestAdapter.startAsync();
 	}
 
-	@Override
+
 	public AsyncContext startAsync(
 			ServletRequest servletRequest, ServletResponse servletResponse)
 		throws IllegalStateException {
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponse.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponse.java
index cd300673fe8..81ccc097297 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponse.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponse.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponseImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponseImpl.java
index cffc4b8134b..abeb3f2c9d5 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponseImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIEventResponseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -39,179 +39,179 @@ public class CDIEventResponseImpl extends CDIEventResponse {
 		_httpServletResponseAdapter = httpServletResponseAdapter;
 	}
 
-	@Override
+
 	public void addCookie(Cookie cookie) {
 		_httpServletResponseAdapter.addCookie(cookie);
 	}
 
-	@Override
+
 	public void addDateHeader(String name, long value) {
 		_httpServletResponseAdapter.addDateHeader(name, value);
 	}
 
-	@Override
+
 	public void addHeader(String name, String value) {
 		_httpServletResponseAdapter.addHeader(name, value);
 	}
 
-	@Override
+
 	public void addIntHeader(String name, int value) {
 		_httpServletResponseAdapter.addIntHeader(name, value);
 	}
 
-	@Override
+
 	public boolean containsHeader(String name) {
 		return _httpServletResponseAdapter.containsHeader(name);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeRedirectUrl(String url) {
 		return _httpServletResponseAdapter.encodeRedirectUrl(url);
 	}
 
-	@Override
+
 	public String encodeRedirectURL(String url) {
 		return _httpServletResponseAdapter.encodeRedirectURL(url);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeUrl(String url) {
 		return _httpServletResponseAdapter.encodeUrl(url);
 	}
 
-	@Override
+
 	public void flushBuffer() throws IOException {
 		_httpServletResponseAdapter.flushBuffer();
 	}
 
-	@Override
+
 	public int getBufferSize() {
 		return _httpServletResponseAdapter.getBufferSize();
 	}
 
-	@Override
+
 	public String getCharacterEncoding() {
 		return _httpServletResponseAdapter.getCharacterEncoding();
 	}
 
-	@Override
+
 	public String getContentType() {
 		return _httpServletResponseAdapter.getContentType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletResponseAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Collection<String> getHeaderNames() {
 		return _httpServletResponseAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Collection<String> getHeaders(String name) {
 		return _httpServletResponseAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public Locale getLocale() {
 		return _httpServletResponseAdapter.getLocale();
 	}
 
-	@Override
+
 	public ServletOutputStream getOutputStream() throws IOException {
 		return _httpServletResponseAdapter.getOutputStream();
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _httpServletResponseAdapter.getStatus();
 	}
 
-	@Override
+
 	public PrintWriter getWriter() throws IOException {
 		return _httpServletResponseAdapter.getWriter();
 	}
 
-	@Override
+
 	public boolean isCommitted() {
 		return _httpServletResponseAdapter.isCommitted();
 	}
 
-	@Override
+
 	public void reset() {
 		_httpServletResponseAdapter.reset();
 	}
 
-	@Override
+
 	public void resetBuffer() {
 		_httpServletResponseAdapter.resetBuffer();
 	}
 
-	@Override
+
 	public void sendError(int status) throws IOException {
 		_httpServletResponseAdapter.sendError(status);
 	}
 
-	@Override
+
 	public void sendError(int status, String message) throws IOException {
 		_httpServletResponseAdapter.sendError(status, message);
 	}
 
-	@Override
+
 	public void sendRedirect(String location) throws IOException {
 		_httpServletResponseAdapter.sendRedirect(location);
 	}
 
-	@Override
+
 	public void setBufferSize(int bufferSize) {
 		_httpServletResponseAdapter.setBufferSize(bufferSize);
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding) {
 		_httpServletResponseAdapter.setCharacterEncoding(encoding);
 	}
 
-	@Override
+
 	public void setContentLength(int contentLength) {
 		_httpServletResponseAdapter.setContentLength(contentLength);
 	}
 
-	@Override
+
 	public void setContentType(String contentType) {
 		_httpServletResponseAdapter.setContentType(contentType);
 	}
 
-	@Override
+
 	public void setDateHeader(String name, long value) {
 		_httpServletResponseAdapter.setDateHeader(name, value);
 	}
 
-	@Override
+
 	public void setHeader(String name, String value) {
 		_httpServletResponseAdapter.setHeader(name, value);
 	}
 
-	@Override
+
 	public void setIntHeader(String name, int value) {
 		_httpServletResponseAdapter.setIntHeader(name, value);
 	}
 
-	@Override
+
 	public void setLocale(Locale locale) {
 		_httpServletResponseAdapter.setLocale(locale);
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_httpServletResponseAdapter.setStatus(status);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public void setStatus(int status, String message) {
 		_httpServletResponseAdapter.setStatus(status, message);
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIPortletFilter.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIPortletFilter.java
index 2d1a3e6c716..9c303a19829 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIPortletFilter.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIPortletFilter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -38,11 +38,11 @@ import javax.portlet.filter.ResourceFilter;
 public class CDIPortletFilter
 	implements ActionFilter, EventFilter, RenderFilter, ResourceFilter {
 
-	@Override
+
 	public void destroy() {
 	}
 
-	@Override
+
 	public void doFilter(
 			ActionRequest actionRequest, ActionResponse actionResponse,
 			FilterChain filterChain)
@@ -60,7 +60,7 @@ public class CDIPortletFilter
 		filterChain.doFilter(actionRequest, actionResponse);
 	}
 
-	@Override
+
 	public void doFilter(
 			EventRequest eventRequest, EventResponse eventResponse,
 			FilterChain filterChain)
@@ -78,7 +78,7 @@ public class CDIPortletFilter
 		filterChain.doFilter(eventRequest, eventResponse);
 	}
 
-	@Override
+
 	public void doFilter(
 			RenderRequest renderRequest, RenderResponse renderResponse,
 			FilterChain filterChain)
@@ -96,7 +96,7 @@ public class CDIPortletFilter
 		filterChain.doFilter(renderRequest, renderResponse);
 	}
 
-	@Override
+
 	public void doFilter(
 			ResourceRequest resourceRequest, ResourceResponse resourceResponse,
 			FilterChain filterChain)
@@ -115,7 +115,7 @@ public class CDIPortletFilter
 		filterChain.doFilter(resourceRequest, resourceResponse);
 	}
 
-	@Override
+
 	public void init(FilterConfig filterConfig) {
 	}
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequest.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequest.java
index b8f3c8fa57b..34b41f281ab 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequest.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequestImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequestImpl.java
index 32d03415fe2..ba16d1024ba 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequestImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderRequestImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -49,230 +49,230 @@ public class CDIRenderRequestImpl extends CDIRenderRequest {
 		_httpServletRequestAdapter = httpServletRequestAdapter;
 	}
 
-	@Override
+
 	public boolean authenticate(HttpServletResponse httpServletResponse)
 		throws IOException, ServletException {
 
 		return _httpServletRequestAdapter.authenticate(httpServletResponse);
 	}
 
-	@Override
+
 	public AsyncContext getAsyncContext() {
 		return _httpServletRequestAdapter.getAsyncContext();
 	}
 
-	@Override
+
 	public String getCharacterEncoding() {
 		return _httpServletRequestAdapter.getCharacterEncoding();
 	}
 
-	@Override
+
 	public int getContentLength() {
 		return _httpServletRequestAdapter.getContentLength();
 	}
 
-	@Override
+
 	public String getContentType() {
 		return _httpServletRequestAdapter.getContentType();
 	}
 
-	@Override
+
 	public long getDateHeader(String name) {
 		return _httpServletRequestAdapter.getDateHeader(name);
 	}
 
-	@Override
+
 	public DispatcherType getDispatcherType() {
 		return _httpServletRequestAdapter.getDispatcherType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletRequestAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaderNames() {
 		return _httpServletRequestAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaders(String name) {
 		return _httpServletRequestAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletInputStream getInputStream() throws IOException {
 		return _httpServletRequestAdapter.getInputStream();
 	}
 
-	@Override
+
 	public int getIntHeader(String name) {
 		return _httpServletRequestAdapter.getIntHeader(name);
 	}
 
-	@Override
+
 	public String getLocalAddr() {
 		return _httpServletRequestAdapter.getLocalAddr();
 	}
 
-	@Override
+
 	public String getLocalName() {
 		return _httpServletRequestAdapter.getLocalName();
 	}
 
-	@Override
+
 	public int getLocalPort() {
 		return _httpServletRequestAdapter.getLocalPort();
 	}
 
-	@Override
+
 	public String getMethod() {
 		return _httpServletRequestAdapter.getMethod();
 	}
 
-	@Override
+
 	public Part getPart(String name) throws IOException, ServletException {
 		return _httpServletRequestAdapter.getPart(name);
 	}
 
-	@Override
+
 	public Collection<Part> getParts() throws IOException, ServletException {
 		return _httpServletRequestAdapter.getParts();
 	}
 
-	@Override
+
 	public String getPathInfo() {
 		return _httpServletRequestAdapter.getPathInfo();
 	}
 
-	@Override
+
 	public String getPathTranslated() {
 		return _httpServletRequestAdapter.getPathTranslated();
 	}
 
-	@Override
+
 	public String getProtocol() {
 		return _httpServletRequestAdapter.getProtocol();
 	}
 
-	@Override
+
 	public String getQueryString() {
 		return _httpServletRequestAdapter.getQueryString();
 	}
 
-	@Override
+
 	public BufferedReader getReader() throws IOException {
 		return _httpServletRequestAdapter.getReader();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String getRealPath(String path) {
 		return _httpServletRequestAdapter.getRealPath(path);
 	}
 
-	@Override
+
 	public String getRemoteAddr() {
 		return _httpServletRequestAdapter.getRemoteAddr();
 	}
 
-	@Override
+
 	public String getRemoteHost() {
 		return _httpServletRequestAdapter.getRemoteHost();
 	}
 
-	@Override
+
 	public int getRemotePort() {
 		return _httpServletRequestAdapter.getRemotePort();
 	}
 
-	@Override
+
 	public RequestDispatcher getRequestDispatcher(String location) {
 		return _httpServletRequestAdapter.getRequestDispatcher(location);
 	}
 
-	@Override
+
 	public String getRequestURI() {
 		return _httpServletRequestAdapter.getRequestURI();
 	}
 
-	@Override
+
 	public StringBuffer getRequestURL() {
 		return _httpServletRequestAdapter.getRequestURL();
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		return _httpServletRequestAdapter.getServletContext();
 	}
 
-	@Override
+
 	public String getServletPath() {
 		return _httpServletRequestAdapter.getServletPath();
 	}
 
-	@Override
+
 	public HttpSession getSession() {
 		return _httpServletRequestAdapter.getSession();
 	}
 
-	@Override
+
 	public HttpSession getSession(boolean create) {
 		return _httpServletRequestAdapter.getSession(create);
 	}
 
-	@Override
+
 	public boolean isAsyncStarted() {
 		return _httpServletRequestAdapter.isAsyncStarted();
 	}
 
-	@Override
+
 	public boolean isAsyncSupported() {
 		return _httpServletRequestAdapter.isAsyncSupported();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromCookie() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromCookie();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public boolean isRequestedSessionIdFromUrl() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromUrl();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromURL() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromURL();
 	}
 
-	@Override
+
 	public void login(String username, String password)
 		throws ServletException {
 
 		_httpServletRequestAdapter.login(username, password);
 	}
 
-	@Override
+
 	public void logout() throws ServletException {
 		_httpServletRequestAdapter.logout();
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding)
 		throws UnsupportedEncodingException {
 
 		_httpServletRequestAdapter.setCharacterEncoding(encoding);
 	}
 
-	@Override
+
 	public AsyncContext startAsync() throws IllegalStateException {
 		return _httpServletRequestAdapter.startAsync();
 	}
 
-	@Override
+
 	public AsyncContext startAsync(
 			ServletRequest servletRequest, ServletResponse servletResponse)
 		throws IllegalStateException {
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponse.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponse.java
index b4838a11fb0..c0c02171879 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponse.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponse.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponseImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponseImpl.java
index b4302a310aa..607b8a95d19 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponseImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRenderResponseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -38,124 +38,124 @@ public class CDIRenderResponseImpl extends CDIRenderResponse {
 		_httpServletResponseAdapter = httpServletResponseAdapter;
 	}
 
-	@Override
+
 	public void addCookie(Cookie cookie) {
 		_httpServletResponseAdapter.addCookie(cookie);
 	}
 
-	@Override
+
 	public void addDateHeader(String name, long value) {
 		_httpServletResponseAdapter.addDateHeader(name, value);
 	}
 
-	@Override
+
 	public void addHeader(String name, String value) {
 		_httpServletResponseAdapter.addHeader(name, value);
 	}
 
-	@Override
+
 	public void addIntHeader(String name, int value) {
 		_httpServletResponseAdapter.addIntHeader(name, value);
 	}
 
-	@Override
+
 	public boolean containsHeader(String name) {
 		return _httpServletResponseAdapter.containsHeader(name);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeRedirectUrl(String url) {
 		return _httpServletResponseAdapter.encodeRedirectUrl(url);
 	}
 
-	@Override
+
 	public String encodeRedirectURL(String url) {
 		return _httpServletResponseAdapter.encodeRedirectURL(url);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeUrl(String url) {
 		return _httpServletResponseAdapter.encodeUrl(url);
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletResponseAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Collection<String> getHeaderNames() {
 		return _httpServletResponseAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Collection<String> getHeaders(String name) {
 		return _httpServletResponseAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletOutputStream getOutputStream() throws IOException {
 		return _httpServletResponseAdapter.getOutputStream();
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _httpServletResponseAdapter.getStatus();
 	}
 
-	@Override
+
 	public void sendError(int status) throws IOException {
 		_httpServletResponseAdapter.sendError(status);
 	}
 
-	@Override
+
 	public void sendError(int status, String message) throws IOException {
 		_httpServletResponseAdapter.sendError(status, message);
 	}
 
-	@Override
+
 	public void sendRedirect(String location) throws IOException {
 		_httpServletResponseAdapter.sendRedirect(location);
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding) {
 		_httpServletResponseAdapter.setCharacterEncoding(encoding);
 	}
 
-	@Override
+
 	public void setContentLength(int contentLength) {
 		_httpServletResponseAdapter.setContentLength(contentLength);
 	}
 
-	@Override
+
 	public void setDateHeader(String name, long value) {
 		_httpServletResponseAdapter.setDateHeader(name, value);
 	}
 
-	@Override
+
 	public void setHeader(String name, String value) {
 		_httpServletResponseAdapter.setHeader(name, value);
 	}
 
-	@Override
+
 	public void setIntHeader(String name, int value) {
 		_httpServletResponseAdapter.setIntHeader(name, value);
 	}
 
-	@Override
+
 	public void setLocale(Locale locale) {
 		_httpServletResponseAdapter.setLocale(locale);
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_httpServletResponseAdapter.setStatus(status);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public void setStatus(int status, String message) {
 		_httpServletResponseAdapter.setStatus(status, message);
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactory.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactory.java
index 28dd96c20d3..d0f5ecee80c 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactory.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactory.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactoryImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactoryImpl.java
index 84b8c1c7f6e..3e62b8f7a6e 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactoryImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIRequestFactoryImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class CDIRequestFactoryImpl implements CDIRequestFactory {
 
-	@Override
+
 	public CDIActionRequest getCDIActionRequest(ActionRequest actionRequest) {
 		HttpServletRequestAdapter httpServletRequestAdapter =
 			new HttpServletRequestAdapterImpl(actionRequest);
@@ -35,14 +35,14 @@ public class CDIRequestFactoryImpl implements CDIRequestFactory {
 			actionRequest, httpServletRequestAdapter);
 	}
 
-	@Override
+
 	public CDICrossContextRequest getCDICrossContextRequest(
 		HttpServletRequest httpServletRequest) {
 
 		return new CDICrossContextRequestImpl(httpServletRequest);
 	}
 
-	@Override
+
 	public CDIEventRequest getCDIEventRequest(EventRequest eventRequest) {
 		HttpServletRequestAdapter httpServletRequestAdapter =
 			new HttpServletRequestAdapterImpl(eventRequest);
@@ -50,7 +50,7 @@ public class CDIRequestFactoryImpl implements CDIRequestFactory {
 		return new CDIEventRequestImpl(eventRequest, httpServletRequestAdapter);
 	}
 
-	@Override
+
 	public CDIRenderRequest getCDIRenderRequest(RenderRequest renderRequest) {
 		HttpServletRequestAdapter httpServletRequestAdapter =
 			new HttpServletRequestAdapterImpl(renderRequest);
@@ -59,7 +59,7 @@ public class CDIRequestFactoryImpl implements CDIRequestFactory {
 			renderRequest, httpServletRequestAdapter);
 	}
 
-	@Override
+
 	public CDIResourceRequest getCDIResourceRequest(
 		ResourceRequest resourceRequest) {
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequest.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequest.java
index 4b92a1d973e..914094ab475 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequest.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequestImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequestImpl.java
index a97e2f4a89c..86a22e0c87d 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequestImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceRequestImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -47,198 +47,198 @@ public class CDIResourceRequestImpl extends CDIResourceRequest {
 		_httpServletRequestAdapter = httpServletRequestAdapter;
 	}
 
-	@Override
+
 	public boolean authenticate(HttpServletResponse httpServletResponse)
 		throws IOException, ServletException {
 
 		return _httpServletRequestAdapter.authenticate(httpServletResponse);
 	}
 
-	@Override
+
 	public AsyncContext getAsyncContext() {
 		return _httpServletRequestAdapter.getAsyncContext();
 	}
 
-	@Override
+
 	public long getDateHeader(String name) {
 		return _httpServletRequestAdapter.getDateHeader(name);
 	}
 
-	@Override
+
 	public DispatcherType getDispatcherType() {
 		return _httpServletRequestAdapter.getDispatcherType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletRequestAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaderNames() {
 		return _httpServletRequestAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaders(String name) {
 		return _httpServletRequestAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletInputStream getInputStream() throws IOException {
 		return _httpServletRequestAdapter.getInputStream();
 	}
 
-	@Override
+
 	public int getIntHeader(String name) {
 		return _httpServletRequestAdapter.getIntHeader(name);
 	}
 
-	@Override
+
 	public String getLocalAddr() {
 		return _httpServletRequestAdapter.getLocalAddr();
 	}
 
-	@Override
+
 	public String getLocalName() {
 		return _httpServletRequestAdapter.getLocalName();
 	}
 
-	@Override
+
 	public int getLocalPort() {
 		return _httpServletRequestAdapter.getLocalPort();
 	}
 
-	@Override
+
 	public Part getPart(String name) throws IOException, ServletException {
 		return _httpServletRequestAdapter.getPart(name);
 	}
 
-	@Override
+
 	public Collection<Part> getParts() throws IOException, ServletException {
 		return _httpServletRequestAdapter.getParts();
 	}
 
-	@Override
+
 	public String getPathInfo() {
 		return _httpServletRequestAdapter.getPathInfo();
 	}
 
-	@Override
+
 	public String getPathTranslated() {
 		return _httpServletRequestAdapter.getPathTranslated();
 	}
 
-	@Override
+
 	public String getProtocol() {
 		return _httpServletRequestAdapter.getProtocol();
 	}
 
-	@Override
+
 	public String getQueryString() {
 		return _httpServletRequestAdapter.getQueryString();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String getRealPath(String path) {
 		return _httpServletRequestAdapter.getRealPath(path);
 	}
 
-	@Override
+
 	public String getRemoteAddr() {
 		return _httpServletRequestAdapter.getRemoteAddr();
 	}
 
-	@Override
+
 	public String getRemoteHost() {
 		return _httpServletRequestAdapter.getRemoteHost();
 	}
 
-	@Override
+
 	public int getRemotePort() {
 		return _httpServletRequestAdapter.getRemotePort();
 	}
 
-	@Override
+
 	public RequestDispatcher getRequestDispatcher(String location) {
 		return _httpServletRequestAdapter.getRequestDispatcher(location);
 	}
 
-	@Override
+
 	public String getRequestURI() {
 		return _httpServletRequestAdapter.getRequestURI();
 	}
 
-	@Override
+
 	public StringBuffer getRequestURL() {
 		return _httpServletRequestAdapter.getRequestURL();
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		return _httpServletRequestAdapter.getServletContext();
 	}
 
-	@Override
+
 	public String getServletPath() {
 		return _httpServletRequestAdapter.getServletPath();
 	}
 
-	@Override
+
 	public HttpSession getSession() {
 		return _httpServletRequestAdapter.getSession();
 	}
 
-	@Override
+
 	public HttpSession getSession(boolean create) {
 		return _httpServletRequestAdapter.getSession(create);
 	}
 
-	@Override
+
 	public boolean isAsyncStarted() {
 		return _httpServletRequestAdapter.isAsyncStarted();
 	}
 
-	@Override
+
 	public boolean isAsyncSupported() {
 		return _httpServletRequestAdapter.isAsyncSupported();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromCookie() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromCookie();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public boolean isRequestedSessionIdFromUrl() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromUrl();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromURL() {
 		return _httpServletRequestAdapter.isRequestedSessionIdFromURL();
 	}
 
-	@Override
+
 	public void login(String username, String password)
 		throws ServletException {
 
 		_httpServletRequestAdapter.login(username, password);
 	}
 
-	@Override
+
 	public void logout() throws ServletException {
 		_httpServletRequestAdapter.logout();
 	}
 
-	@Override
+
 	public AsyncContext startAsync() throws IllegalStateException {
 		return _httpServletRequestAdapter.startAsync();
 	}
 
-	@Override
+
 	public AsyncContext startAsync(
 			ServletRequest servletRequest, ServletResponse servletResponse)
 		throws IllegalStateException {
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponse.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponse.java
index eb359b105ef..2a33b2fa450 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponse.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponse.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponseImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponseImpl.java
index e05a13152eb..ba8f0ad37bf 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponseImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResourceResponseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -37,109 +37,109 @@ public class CDIResourceResponseImpl extends CDIResourceResponse {
 		_httpServletResponseAdapter = httpServletResponseAdapter;
 	}
 
-	@Override
+
 	public void addCookie(Cookie cookie) {
 		_httpServletResponseAdapter.addCookie(cookie);
 	}
 
-	@Override
+
 	public void addDateHeader(String name, long value) {
 		_httpServletResponseAdapter.addDateHeader(name, value);
 	}
 
-	@Override
+
 	public void addHeader(String name, String value) {
 		_httpServletResponseAdapter.addHeader(name, value);
 	}
 
-	@Override
+
 	public void addIntHeader(String name, int value) {
 		_httpServletResponseAdapter.addIntHeader(name, value);
 	}
 
-	@Override
+
 	public boolean containsHeader(String name) {
 		return _httpServletResponseAdapter.containsHeader(name);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeRedirectUrl(String url) {
 		return _httpServletResponseAdapter.encodeRedirectUrl(url);
 	}
 
-	@Override
+
 	public String encodeRedirectURL(String url) {
 		return _httpServletResponseAdapter.encodeRedirectURL(url);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String encodeUrl(String url) {
 		return _httpServletResponseAdapter.encodeUrl(url);
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletResponseAdapter.getHeader(name);
 	}
 
-	@Override
+
 	public Collection<String> getHeaderNames() {
 		return _httpServletResponseAdapter.getHeaderNames();
 	}
 
-	@Override
+
 	public Collection<String> getHeaders(String name) {
 		return _httpServletResponseAdapter.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletOutputStream getOutputStream() throws IOException {
 		return _httpServletResponseAdapter.getOutputStream();
 	}
 
-	@Override
+
 	public int getStatus() {
 		return _httpServletResponseAdapter.getStatus();
 	}
 
-	@Override
+
 	public void sendError(int status) throws IOException {
 		_httpServletResponseAdapter.sendError(status);
 	}
 
-	@Override
+
 	public void sendError(int status, String message) throws IOException {
 		_httpServletResponseAdapter.sendError(status, message);
 	}
 
-	@Override
+
 	public void sendRedirect(String location) throws IOException {
 		_httpServletResponseAdapter.sendRedirect(location);
 	}
 
-	@Override
+
 	public void setDateHeader(String name, long value) {
 		_httpServletResponseAdapter.setDateHeader(name, value);
 	}
 
-	@Override
+
 	public void setHeader(String name, String value) {
 		_httpServletResponseAdapter.setHeader(name, value);
 	}
 
-	@Override
+
 	public void setIntHeader(String name, int value) {
 		_httpServletResponseAdapter.setIntHeader(name, value);
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		_httpServletResponseAdapter.setStatus(status);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public void setStatus(int status, String message) {
 		_httpServletResponseAdapter.setStatus(status, message);
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactory.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactory.java
index 776f0e39a1f..19f13cef7cc 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactory.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactory.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactoryImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactoryImpl.java
index b0d365b6244..99ba5e53374 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactoryImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDIResponseFactoryImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -26,7 +26,7 @@ import javax.portlet.ResourceResponse;
  */
 public class CDIResponseFactoryImpl implements CDIResponseFactory {
 
-	@Override
+
 	public CDIActionResponse getCDIActionResponse(
 		ActionResponse actionResponse, Locale locale) {
 
@@ -37,7 +37,7 @@ public class CDIResponseFactoryImpl implements CDIResponseFactory {
 			actionResponse, httpServletResponseAdapter);
 	}
 
-	@Override
+
 	public CDIEventResponse getCDIEventResponse(
 		EventResponse eventResponse, Locale locale) {
 
@@ -48,7 +48,7 @@ public class CDIResponseFactoryImpl implements CDIResponseFactory {
 			eventResponse, httpServletResponseAdapter);
 	}
 
-	@Override
+
 	public CDIRenderResponse getCDIRenderResponse(
 		RenderResponse renderResponse, Locale locale) {
 
@@ -59,7 +59,7 @@ public class CDIResponseFactoryImpl implements CDIResponseFactory {
 			renderResponse, httpServletResponseAdapter);
 	}
 
-	@Override
+
 	public CDIResourceResponse getCDIResourceResponse(
 		ResourceResponse resourceResponse, Locale locale) {
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISession.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISession.java
index f48c9324574..c84e28d5f6a 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISession.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISession.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISessionImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISessionImpl.java
index 2b0f1ae8baa..f3dabe1b7ce 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISessionImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/CDISessionImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -31,25 +31,25 @@ public class CDISessionImpl extends CDISession {
 		super(portletSession);
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public javax.servlet.http.HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public Object getValue(String name) {
 		PortletSession portletSession = getPortletSession();
 
 		return portletSession.getAttribute(name);
 	}
 
-	@Override
+
 	public String[] getValueNames() {
 		PortletSession portletSession = getPortletSession();
 
@@ -70,14 +70,14 @@ public class CDISessionImpl extends CDISession {
 		return valueNames.toArray(new String[valueNames.size()]);
 	}
 
-	@Override
+
 	public void putValue(String name, Object value) {
 		PortletSession portletSession = getPortletSession();
 
 		portletSession.setAttribute(name, value);
 	}
 
-	@Override
+
 	public void removeValue(String name) {
 		PortletSession portletSession = getPortletSession();
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapter.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapter.java
index 889e8f0acdb..e59532965bb 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapter.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapterImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapterImpl.java
index bb6935f00b0..212a1223162 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapterImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletRequestAdapterImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -57,32 +57,32 @@ public class HttpServletRequestAdapterImpl
 		_httpServletRequest = PortalUtil.getHttpServletRequest(portletRequest);
 	}
 
-	@Override
+
 	public boolean authenticate(HttpServletResponse httpServletResponse) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public AsyncContext getAsyncContext() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public Object getAttribute(String name) {
 		return _portletRequest.getAttribute(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getAttributeNames() {
 		return _portletRequest.getAttributeNames();
 	}
 
-	@Override
+
 	public String getAuthType() {
 		return _portletRequest.getAuthType();
 	}
 
-	@Override
+
 	public String getCharacterEncoding() {
 		if (!(_portletRequest instanceof ClientDataRequest)) {
 			return _httpServletRequest.getCharacterEncoding();
@@ -94,7 +94,7 @@ public class HttpServletRequestAdapterImpl
 		return clientDataRequest.getCharacterEncoding();
 	}
 
-	@Override
+
 	public int getContentLength() {
 		if (!(_portletRequest instanceof ClientDataRequest)) {
 			return _httpServletRequest.getContentLength();
@@ -106,7 +106,7 @@ public class HttpServletRequestAdapterImpl
 		return clientDataRequest.getContentLength();
 	}
 
-	@Override
+
 	public String getContentType() {
 		if (!(_portletRequest instanceof ClientDataRequest)) {
 			return _httpServletRequest.getContentType();
@@ -118,42 +118,42 @@ public class HttpServletRequestAdapterImpl
 		return clientDataRequest.getContentType();
 	}
 
-	@Override
+
 	public String getContextPath() {
 		return _portletRequest.getContextPath();
 	}
 
-	@Override
+
 	public Cookie[] getCookies() {
 		return _portletRequest.getCookies();
 	}
 
-	@Override
+
 	public long getDateHeader(String name) {
 		return _httpServletRequest.getDateHeader(name);
 	}
 
-	@Override
+
 	public DispatcherType getDispatcherType() {
 		return _httpServletRequest.getDispatcherType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		return _httpServletRequest.getHeader(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaderNames() {
 		return _httpServletRequest.getHeaderNames();
 	}
 
-	@Override
+
 	public Enumeration<String> getHeaders(String name) {
 		return _httpServletRequest.getHeaders(name);
 	}
 
-	@Override
+
 	public ServletInputStream getInputStream() throws IOException {
 		if (_servletInputStream == null) {
 			if (!(_portletRequest instanceof ClientDataRequest)) {
@@ -170,39 +170,39 @@ public class HttpServletRequestAdapterImpl
 		return _servletInputStream;
 	}
 
-	@Override
+
 	public int getIntHeader(String name) {
 		return _httpServletRequest.getIntHeader(name);
 	}
 
-	@Override
+
 	public String getLocalAddr() {
 		return _httpServletRequest.getLocalAddr();
 	}
 
-	@Override
+
 	public Locale getLocale() {
 		return _portletRequest.getLocale();
 	}
 
-	@Override
+
 	public Enumeration<Locale> getLocales() {
 		return _portletRequest.getLocales();
 	}
 
-	@Override
+
 	public String getLocalName() {
 		Locale locale = _portletRequest.getLocale();
 
 		return locale.getDisplayName();
 	}
 
-	@Override
+
 	public int getLocalPort() {
 		return _portletRequest.getServerPort();
 	}
 
-	@Override
+
 	public String getMethod() {
 		if (!(_portletRequest instanceof ClientDataRequest)) {
 			return _httpServletRequest.getMethod();
@@ -214,62 +214,62 @@ public class HttpServletRequestAdapterImpl
 		return clientDataRequest.getMethod();
 	}
 
-	@Override
+
 	public String getParameter(String name) {
 		return _portletRequest.getParameter(name);
 	}
 
-	@Override
+
 	public Map<String, String[]> getParameterMap() {
 		return _portletRequest.getParameterMap();
 	}
 
-	@Override
+
 	public Enumeration<String> getParameterNames() {
 		return _portletRequest.getParameterNames();
 	}
 
-	@Override
+
 	public String[] getParameterValues(String name) {
 		return _portletRequest.getParameterValues(name);
 	}
 
-	@Override
+
 	public Part getPart(String name) throws IOException, ServletException {
 		return _httpServletRequest.getPart(name);
 	}
 
-	@Override
+
 	public Collection<Part> getParts() throws IOException, ServletException {
 		return _httpServletRequest.getParts();
 	}
 
-	@Override
+
 	public String getPathInfo() {
 		return _httpServletRequest.getPathInfo();
 	}
 
-	@Override
+
 	public String getPathTranslated() {
 		return _httpServletRequest.getPathTranslated();
 	}
 
-	@Override
+
 	public PortletRequest getPortletRequest() {
 		return _portletRequest;
 	}
 
-	@Override
+
 	public String getProtocol() {
 		return _httpServletRequest.getProtocol();
 	}
 
-	@Override
+
 	public String getQueryString() {
 		return _httpServletRequest.getQueryString();
 	}
 
-	@Override
+
 	public BufferedReader getReader() throws IOException {
 		if (!(_portletRequest instanceof ClientDataRequest)) {
 			return _httpServletRequest.getReader();
@@ -285,77 +285,77 @@ public class HttpServletRequestAdapterImpl
 	 * @deprecated As of 6.2.0
 	 */
 	@Deprecated
-	@Override
+
 	public String getRealPath(String path) {
 		return _httpServletRequest.getRealPath(path);
 	}
 
-	@Override
+
 	public String getRemoteAddr() {
 		return _httpServletRequest.getRemoteAddr();
 	}
 
-	@Override
+
 	public String getRemoteHost() {
 		return _httpServletRequest.getRemoteHost();
 	}
 
-	@Override
+
 	public int getRemotePort() {
 		return _httpServletRequest.getRemotePort();
 	}
 
-	@Override
+
 	public String getRemoteUser() {
 		return _portletRequest.getRemoteUser();
 	}
 
-	@Override
+
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return _httpServletRequest.getRequestDispatcher(path);
 	}
 
-	@Override
+
 	public String getRequestedSessionId() {
 		return _portletRequest.getRequestedSessionId();
 	}
 
-	@Override
+
 	public String getRequestURI() {
 		return _httpServletRequest.getRequestURI();
 	}
 
-	@Override
+
 	public StringBuffer getRequestURL() {
 		return _httpServletRequest.getRequestURL();
 	}
 
-	@Override
+
 	public String getScheme() {
 		return _portletRequest.getScheme();
 	}
 
-	@Override
+
 	public String getServerName() {
 		return _portletRequest.getServerName();
 	}
 
-	@Override
+
 	public int getServerPort() {
 		return _portletRequest.getServerPort();
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		return _httpServletRequest.getServletContext();
 	}
 
-	@Override
+
 	public String getServletPath() {
 		return _httpServletRequest.getServletPath();
 	}
 
-	@Override
+
 	public HttpSession getSession() {
 		if (_portletSession == null) {
 			_portletSession = new CDISessionImpl(
@@ -365,7 +365,7 @@ public class HttpServletRequestAdapterImpl
 		return _portletSession;
 	}
 
-	@Override
+
 	public HttpSession getSession(boolean create) {
 		if (_portletSession == null) {
 			PortletSession portletSession = _portletRequest.getPortletSession(
@@ -379,22 +379,22 @@ public class HttpServletRequestAdapterImpl
 		return _portletSession;
 	}
 
-	@Override
+
 	public Principal getUserPrincipal() {
 		return _portletRequest.getUserPrincipal();
 	}
 
-	@Override
+
 	public boolean isAsyncStarted() {
 		return false;
 	}
 
-	@Override
+
 	public boolean isAsyncSupported() {
 		return false;
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromCookie() {
 		return _httpServletRequest.isRequestedSessionIdFromCookie();
 	}
@@ -403,52 +403,52 @@ public class HttpServletRequestAdapterImpl
 	 * @deprecated As of 6.2.0
 	 */
 	@Deprecated
-	@Override
+
 	public boolean isRequestedSessionIdFromUrl() {
 		return _httpServletRequest.isRequestedSessionIdFromUrl();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdFromURL() {
 		return _httpServletRequest.isRequestedSessionIdFromURL();
 	}
 
-	@Override
+
 	public boolean isRequestedSessionIdValid() {
 		return _httpServletRequest.isRequestedSessionIdValid();
 	}
 
-	@Override
+
 	public boolean isSecure() {
 		return _portletRequest.isSecure();
 	}
 
-	@Override
+
 	public boolean isUserInRole(String role) {
 		return _portletRequest.isUserInRole(role);
 	}
 
-	@Override
+
 	public void login(String username, String password) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void logout() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void removeAttribute(String name) {
 		_portletRequest.removeAttribute(name);
 	}
 
-	@Override
+
 	public void setAttribute(String name, Object value) {
 		_portletRequest.setAttribute(name, value);
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding)
 		throws UnsupportedEncodingException {
 
@@ -462,12 +462,12 @@ public class HttpServletRequestAdapterImpl
 		clientDataRequest.setCharacterEncoding(encoding);
 	}
 
-	@Override
+
 	public AsyncContext startAsync() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public AsyncContext startAsync(
 		ServletRequest servletRequest, ServletResponse servletResponse) {
 
@@ -485,7 +485,7 @@ public class HttpServletRequestAdapterImpl
 			_clientDataRequest = clientDataRequest;
 		}
 
-		@Override
+
 		public int read() throws IOException {
 			return _clientDataRequest.getPortletInputStream().read();
 		}
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapter.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapter.java
index d8df743ca19..c7f5ac9fcb5 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapter.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapter.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapterImpl.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapterImpl.java
index 95c3183395f..cfaf4491f80 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapterImpl.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpServletResponseAdapterImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -42,52 +42,52 @@ public class HttpServletResponseAdapterImpl
 		_locale = locale;
 	}
 
-	@Override
+
 	public void addCookie(Cookie cookie) {
 		_portletResponse.addProperty(cookie);
 	}
 
-	@Override
+
 	public void addDateHeader(String name, long value) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void addHeader(String name, String value) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void addIntHeader(String name, int value) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public boolean containsHeader(String name) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public String encodeRedirectUrl(String url) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public String encodeRedirectURL(String url) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public String encodeUrl(String url) {
 		return getPortletResponse().encodeURL(url);
 	}
 
-	@Override
+
 	public String encodeURL(String url) {
 		return getPortletResponse().encodeURL(url);
 	}
 
-	@Override
+
 	public void flushBuffer() throws IOException {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			throw new UnsupportedOperationException();
@@ -98,7 +98,7 @@ public class HttpServletResponseAdapterImpl
 		mimeResponse.flushBuffer();
 	}
 
-	@Override
+
 	public int getBufferSize() {
 		if (!(_portletResponse instanceof ClientDataRequest)) {
 			return 0;
@@ -109,7 +109,7 @@ public class HttpServletResponseAdapterImpl
 		return mimeResponse.getBufferSize();
 	}
 
-	@Override
+
 	public String getCharacterEncoding() {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			return null;
@@ -120,7 +120,7 @@ public class HttpServletResponseAdapterImpl
 		return mimeResponse.getCharacterEncoding();
 	}
 
-	@Override
+
 	public String getContentType() {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			return null;
@@ -131,27 +131,27 @@ public class HttpServletResponseAdapterImpl
 		return mimeResponse.getContentType();
 	}
 
-	@Override
+
 	public String getHeader(String name) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public Collection<String> getHeaderNames() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public Collection<String> getHeaders(String name) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public Locale getLocale() {
 		return _locale;
 	}
 
-	@Override
+
 	public ServletOutputStream getOutputStream() {
 		if (_servletOutputStream == null) {
 			if (!(_portletResponse instanceof MimeResponse)) {
@@ -165,17 +165,17 @@ public class HttpServletResponseAdapterImpl
 		return _servletOutputStream;
 	}
 
-	@Override
+
 	public PortletResponse getPortletResponse() {
 		return _portletResponse;
 	}
 
-	@Override
+
 	public int getStatus() {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public PrintWriter getWriter() throws IOException {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			throw new UnsupportedOperationException();
@@ -186,7 +186,7 @@ public class HttpServletResponseAdapterImpl
 		return mimeResponse.getWriter();
 	}
 
-	@Override
+
 	public boolean isCommitted() {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			return true;
@@ -197,7 +197,7 @@ public class HttpServletResponseAdapterImpl
 		return mimeResponse.isCommitted();
 	}
 
-	@Override
+
 	public void reset() {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			throw new UnsupportedOperationException();
@@ -208,7 +208,7 @@ public class HttpServletResponseAdapterImpl
 		mimeResponse.reset();
 	}
 
-	@Override
+
 	public void resetBuffer() {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			throw new UnsupportedOperationException();
@@ -219,37 +219,37 @@ public class HttpServletResponseAdapterImpl
 		mimeResponse.resetBuffer();
 	}
 
-	@Override
+
 	public void sendError(int status) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void sendError(int status, String message) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void sendRedirect(String location) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setBufferSize(int bufferSize) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setCharacterEncoding(String encoding) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setContentLength(int contentLength) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setContentType(String contentType) {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			throw new UnsupportedOperationException();
@@ -260,22 +260,22 @@ public class HttpServletResponseAdapterImpl
 		mimeResponse.setContentType(contentType);
 	}
 
-	@Override
+
 	public void setDateHeader(String name, long date) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setHeader(String name, String value) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setIntHeader(String name, int value) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setLocale(Locale locale) {
 		if (!(_portletResponse instanceof MimeResponse)) {
 			return;
@@ -286,12 +286,12 @@ public class HttpServletResponseAdapterImpl
 		resourceResponse.setLocale(locale);
 	}
 
-	@Override
+
 	public void setStatus(int status) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public void setStatus(int status, String message) {
 		throw new UnsupportedOperationException();
 	}
@@ -306,7 +306,7 @@ public class HttpServletResponseAdapterImpl
 			_mimeResponse = mimeResponse;
 		}
 
-		@Override
+
 		public void write(int b) throws IOException {
 			OutputStream outputStream = _mimeResponse.getPortletOutputStream();
 
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpSessionWrapper.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpSessionWrapper.java
index 6c85afba29a..b533835eddb 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpSessionWrapper.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/HttpSessionWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -28,17 +28,17 @@ public class HttpSessionWrapper implements HttpSession {
 		_httpSession = httpSession;
 	}
 
-	@Override
+
 	public Object getAttribute(String name) {
 		return _httpSession.getAttribute(name);
 	}
 
-	@Override
+
 	public Enumeration<String> getAttributeNames() {
 		return _httpSession.getAttributeNames();
 	}
 
-	@Override
+
 	public long getCreationTime() {
 		return _httpSession.getCreationTime();
 	}
@@ -47,74 +47,74 @@ public class HttpSessionWrapper implements HttpSession {
 		return _httpSession;
 	}
 
-	@Override
+
 	public String getId() {
 		return _httpSession.getId();
 	}
 
-	@Override
+
 	public long getLastAccessedTime() {
 		return _httpSession.getLastAccessedTime();
 	}
 
-	@Override
+
 	public int getMaxInactiveInterval() {
 		return _httpSession.getMaxInactiveInterval();
 	}
 
-	@Override
+
 	public ServletContext getServletContext() {
 		return _httpSession.getServletContext();
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public javax.servlet.http.HttpSessionContext getSessionContext() {
 		return _httpSession.getSessionContext();
 	}
 
-	@Override
+
 	public Object getValue(String name) {
 		return _httpSession.getAttribute(name);
 	}
 
-	@Override
+
 	@SuppressWarnings("deprecation")
 	public String[] getValueNames() {
 		return _httpSession.getValueNames();
 	}
 
-	@Override
+
 	public void invalidate() {
 		_httpSession.invalidate();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _httpSession.isNew();
 	}
 
-	@Override
+
 	public void putValue(String name, Object value) {
 		_httpSession.setAttribute(name, value);
 	}
 
-	@Override
+
 	public void removeAttribute(String name) {
 		_httpSession.removeAttribute(name);
 	}
 
-	@Override
+
 	public void removeValue(String name) {
 		_httpSession.removeAttribute(name);
 	}
 
-	@Override
+
 	public void setAttribute(String name, Object value) {
 		_httpSession.setAttribute(name, value);
 	}
 
-	@Override
+
 	public void setMaxInactiveInterval(int maxInactiveInterval) {
 		_httpSession.setMaxInactiveInterval(maxInactiveInterval);
 	}
diff --git a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/PortletSessionWrapper.java b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/PortletSessionWrapper.java
index 08d6cf1f491..a7d3d64ba81 100644
--- a/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/PortletSessionWrapper.java
+++ b/shared/cdi-portlet-bridge-shared/src/com/liferay/cdi/portlet/bridge/PortletSessionWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.cdi.portlet.bridge;
@@ -29,57 +29,57 @@ public class PortletSessionWrapper implements PortletSession {
 		_portletSession = portletSession;
 	}
 
-	@Override
+
 	public Object getAttribute(String name) {
 		return _portletSession.getAttribute(name);
 	}
 
-	@Override
+
 	public Object getAttribute(String name, int value) {
 		return _portletSession.getAttribute(name, value);
 	}
 
-	@Override
+
 	public Map<String, Object> getAttributeMap() {
 		return _portletSession.getAttributeMap();
 	}
 
-	@Override
+
 	public Map<String, Object> getAttributeMap(int scope) {
 		return _portletSession.getAttributeMap(scope);
 	}
 
-	@Override
+
 	public Enumeration<String> getAttributeNames() {
 		return _portletSession.getAttributeNames();
 	}
 
-	@Override
+
 	public Enumeration<String> getAttributeNames(int scope) {
 		return _portletSession.getAttributeNames(scope);
 	}
 
-	@Override
+
 	public long getCreationTime() {
 		return _portletSession.getCreationTime();
 	}
 
-	@Override
+
 	public String getId() {
 		return _portletSession.getId();
 	}
 
-	@Override
+
 	public long getLastAccessedTime() {
 		return _portletSession.getLastAccessedTime();
 	}
 
-	@Override
+
 	public int getMaxInactiveInterval() {
 		return _portletSession.getMaxInactiveInterval();
 	}
 
-	@Override
+
 	public PortletContext getPortletContext() {
 		return _portletSession.getPortletContext();
 	}
@@ -88,37 +88,37 @@ public class PortletSessionWrapper implements PortletSession {
 		return _portletSession;
 	}
 
-	@Override
+
 	public void invalidate() {
 		_portletSession.invalidate();
 	}
 
-	@Override
+
 	public boolean isNew() {
 		return _portletSession.isNew();
 	}
 
-	@Override
+
 	public void removeAttribute(String name) {
 		_portletSession.removeAttribute(name);
 	}
 
-	@Override
+
 	public void removeAttribute(String name, int value) {
 		_portletSession.removeAttribute(name, value);
 	}
 
-	@Override
+
 	public void setAttribute(String name, Object value) {
 		_portletSession.setAttribute(name, value);
 	}
 
-	@Override
+
 	public void setAttribute(String name, Object value, int scope) {
 		_portletSession.setAttribute(name, value, scope);
 	}
 
-	@Override
+
 	public void setMaxInactiveInterval(int maxInactiveInterval) {
 		_portletSession.setMaxInactiveInterval(maxInactiveInterval);
 	}
diff --git a/shared/contacts-shared/copyright.txt b/shared/contacts-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/contacts-shared/copyright.txt
+++ b/shared/contacts-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/contacts-shared/src/com/liferay/contacts/util/PortletKeys.java b/shared/contacts-shared/src/com/liferay/contacts/util/PortletKeys.java
index 4b6722e1a9a..c3b5c1809f2 100644
--- a/shared/contacts-shared/src/com/liferay/contacts/util/PortletKeys.java
+++ b/shared/contacts-shared/src/com/liferay/contacts/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.contacts.util;
 
 /**
diff --git a/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/BaseDeployListenerMessageListener.java b/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/BaseDeployListenerMessageListener.java
index beed76365c4..b53c2dbf399 100644
--- a/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/BaseDeployListenerMessageListener.java
+++ b/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/BaseDeployListenerMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.messaging;
@@ -76,7 +76,7 @@ public abstract class BaseDeployListenerMessageListener
 			message.getResponseDestinationName(), message);
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString(MESSAGE_KEY_COMMAND);
 
@@ -96,7 +96,7 @@ public abstract class BaseDeployListenerMessageListener
 
 	protected class ProcessThread extends Thread {
 
-		@Override
+
 		public void run() {
 			try {
 				if (_command.equals(COMMAND_ON_AFTER_DEPLOY)) {
diff --git a/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/DeployListenerMessageListener.java b/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/DeployListenerMessageListener.java
index 1f8ac6c512a..5e8bd3d1b2a 100644
--- a/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/DeployListenerMessageListener.java
+++ b/shared/deploy-listener-shared/src/com/liferay/deploylistener/messaging/DeployListenerMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.messaging;
diff --git a/shared/deploy-listener-shared/src/com/liferay/deploylistener/util/DeployListenerConstants.java b/shared/deploy-listener-shared/src/com/liferay/deploylistener/util/DeployListenerConstants.java
index 81f1001c1a4..d77a3aa9ade 100644
--- a/shared/deploy-listener-shared/src/com/liferay/deploylistener/util/DeployListenerConstants.java
+++ b/shared/deploy-listener-shared/src/com/liferay/deploylistener/util/DeployListenerConstants.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.deploylistener.util;
diff --git a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/auth/GoogleCredentialUtil.java b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/auth/GoogleCredentialUtil.java
index 7e49545dc6b..4f408dcb946 100644
--- a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/auth/GoogleCredentialUtil.java
+++ b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/auth/GoogleCredentialUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.apps.connector.auth;
diff --git a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleDirectoryUtil.java b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleDirectoryUtil.java
index ad00d0f3c30..56ba1b66045 100644
--- a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleDirectoryUtil.java
+++ b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleDirectoryUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.apps.connector.util;
diff --git a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGmailSettingsUtil.java b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGmailSettingsUtil.java
index ae6b8dbef7e..6cc57bd024f 100644
--- a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGmailSettingsUtil.java
+++ b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGmailSettingsUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.apps.connector.util;
@@ -59,7 +59,7 @@ public class GoogleGmailSettingsUtil {
 			StringPool.BLANK, company.getMx(), StringPool.BLANK,
 			StringPool.BLANK) {
 
-			@Override
+
 			public void setUserCredentials(String username, String password)
 				throws AuthenticationException {
 			}
diff --git a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGroupssettingsUtil.java b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGroupssettingsUtil.java
index 56560fe0fe5..fe5be43ab44 100644
--- a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGroupssettingsUtil.java
+++ b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/GoogleGroupssettingsUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.apps.connector.util;
diff --git a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsKeys.java b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsKeys.java
index 2b02bb60ff6..8a18a8d9900 100644
--- a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsKeys.java
+++ b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.apps.connector.util;
diff --git a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsValues.java b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsValues.java
index 0ae70830207..f825ce9217a 100644
--- a/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsValues.java
+++ b/shared/google-apps-connector-shared/src/com/liferay/google/apps/connector/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.google.apps.connector.util;
diff --git a/shared/localization-shared/src/com/liferay/localization/hook/service/impl/LocalizationCompanyLocalServiceImpl.java b/shared/localization-shared/src/com/liferay/localization/hook/service/impl/LocalizationCompanyLocalServiceImpl.java
index 060e87eae4e..72a09003883 100644
--- a/shared/localization-shared/src/com/liferay/localization/hook/service/impl/LocalizationCompanyLocalServiceImpl.java
+++ b/shared/localization-shared/src/com/liferay/localization/hook/service/impl/LocalizationCompanyLocalServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.hook.service.impl;
@@ -32,7 +32,7 @@ public class LocalizationCompanyLocalServiceImpl
 		super(companyLocalService);
 	}
 
-	@Override
+
 	public Company checkCompany(String webId, String mx)
 		throws PortalException {
 
diff --git a/shared/localization-shared/src/com/liferay/localization/servlet/LocalizationServletContextListener.java b/shared/localization-shared/src/com/liferay/localization/servlet/LocalizationServletContextListener.java
index a1d180ed69c..84c9bcd956f 100644
--- a/shared/localization-shared/src/com/liferay/localization/servlet/LocalizationServletContextListener.java
+++ b/shared/localization-shared/src/com/liferay/localization/servlet/LocalizationServletContextListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.servlet;
@@ -52,11 +52,11 @@ public class LocalizationServletContextListener
 		registerPortalLifecycle();
 	}
 
-	@Override
+
 	protected void doPortalDestroy() throws Exception {
 	}
 
-	@Override
+
 	protected void doPortalInit() throws Exception {
 		importSQL();
 
diff --git a/shared/localization-shared/src/com/liferay/localization/util/InstanceUtil.java b/shared/localization-shared/src/com/liferay/localization/util/InstanceUtil.java
index b5c1a9dae71..d25e9da7b6c 100644
--- a/shared/localization-shared/src/com/liferay/localization/util/InstanceUtil.java
+++ b/shared/localization-shared/src/com/liferay/localization/util/InstanceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.util;
@@ -202,7 +202,7 @@ public class InstanceUtil implements PortletPropsKeys {
 		actionableDynamicQuery.setAddCriteriaMethod(
 			new ActionableDynamicQuery.AddCriteriaMethod() {
 
-				@Override
+
 				public void addCriteria(DynamicQuery dynamicQuery) {
 					Property property = PropertyFactoryUtil.forName(
 						"createDate");
@@ -215,7 +215,7 @@ public class InstanceUtil implements PortletPropsKeys {
 		actionableDynamicQuery.setPerformActionMethod(
 			new ActionableDynamicQuery.PerformActionMethod<User>() {
 
-				@Override
+
 				public void performAction(User user) throws PortalException {
 					user.setModifiedDate(new Date());
 					user.setLanguageId(
diff --git a/shared/localization-shared/src/com/liferay/localization/util/PortletPropsKeys.java b/shared/localization-shared/src/com/liferay/localization/util/PortletPropsKeys.java
index 0eac941507e..d484b6934c6 100644
--- a/shared/localization-shared/src/com/liferay/localization/util/PortletPropsKeys.java
+++ b/shared/localization-shared/src/com/liferay/localization/util/PortletPropsKeys.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.util;
diff --git a/shared/localization-shared/src/com/liferay/localization/util/PortletPropsValues.java b/shared/localization-shared/src/com/liferay/localization/util/PortletPropsValues.java
index 71dc768542c..9bcab5728ca 100644
--- a/shared/localization-shared/src/com/liferay/localization/util/PortletPropsValues.java
+++ b/shared/localization-shared/src/com/liferay/localization/util/PortletPropsValues.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.util;
diff --git a/shared/localization-shared/src/com/liferay/localization/zh/util/LocalizationZHUtil.java b/shared/localization-shared/src/com/liferay/localization/zh/util/LocalizationZHUtil.java
index af7697fe69d..37dffdb7690 100644
--- a/shared/localization-shared/src/com/liferay/localization/zh/util/LocalizationZHUtil.java
+++ b/shared/localization-shared/src/com/liferay/localization/zh/util/LocalizationZHUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.zh.util;
diff --git a/shared/localization-shared/test/unit/com/liferay/localization/zh/util/LocalizationZHUtilTest.java b/shared/localization-shared/test/unit/com/liferay/localization/zh/util/LocalizationZHUtilTest.java
index 03f084d87f3..9a0f3dfdc42 100644
--- a/shared/localization-shared/test/unit/com/liferay/localization/zh/util/LocalizationZHUtilTest.java
+++ b/shared/localization-shared/test/unit/com/liferay/localization/zh/util/LocalizationZHUtilTest.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.localization.zh.util;
diff --git a/shared/microblogs-shared/copyright.txt b/shared/microblogs-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/microblogs-shared/copyright.txt
+++ b/shared/microblogs-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/microblogs-shared/src/com/liferay/microblogs/util/PortletKeys.java b/shared/microblogs-shared/src/com/liferay/microblogs/util/PortletKeys.java
index 40dc80debe5..848282df969 100644
--- a/shared/microblogs-shared/src/com/liferay/microblogs/util/PortletKeys.java
+++ b/shared/microblogs-shared/src/com/liferay/microblogs/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.microblogs.util;
 
 /**
diff --git a/shared/notifications-shared/copyright.txt b/shared/notifications-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/notifications-shared/copyright.txt
+++ b/shared/notifications-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/notifications-shared/src/com/liferay/notifications/util/PortletKeys.java b/shared/notifications-shared/src/com/liferay/notifications/util/PortletKeys.java
index 4914202d3d4..ab95dee964f 100644
--- a/shared/notifications-shared/src/com/liferay/notifications/util/PortletKeys.java
+++ b/shared/notifications-shared/src/com/liferay/notifications/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.notifications.util;
 
 /**
diff --git a/shared/private-messaging-shared/copyright.txt b/shared/private-messaging-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/private-messaging-shared/copyright.txt
+++ b/shared/private-messaging-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/private-messaging-shared/src/com/liferay/privatemessaging/util/PortletKeys.java b/shared/private-messaging-shared/src/com/liferay/privatemessaging/util/PortletKeys.java
index 9f28648e145..6a871d305f5 100644
--- a/shared/private-messaging-shared/src/com/liferay/privatemessaging/util/PortletKeys.java
+++ b/shared/private-messaging-shared/src/com/liferay/privatemessaging/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.privatemessaging.util;
 
 /**
diff --git a/shared/so-activities-shared/copyright.txt b/shared/so-activities-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/so-activities-shared/copyright.txt
+++ b/shared/so-activities-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/so-activities-shared/src/com/liferay/so/activities/util/SocialActivityKeyConstants.java b/shared/so-activities-shared/src/com/liferay/so/activities/util/SocialActivityKeyConstants.java
index 02fec6f8e06..75e377cb4d8 100644
--- a/shared/so-activities-shared/src/com/liferay/so/activities/util/SocialActivityKeyConstants.java
+++ b/shared/so-activities-shared/src/com/liferay/so/activities/util/SocialActivityKeyConstants.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.so.activities.util;
 
 /**
diff --git a/shared/so-announcements-shared/copyright.txt b/shared/so-announcements-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/so-announcements-shared/copyright.txt
+++ b/shared/so-announcements-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/so-announcements-shared/src/com/liferay/so/announcements/util/PortletKeys.java b/shared/so-announcements-shared/src/com/liferay/so/announcements/util/PortletKeys.java
index 542f51bb548..c76c965265f 100644
--- a/shared/so-announcements-shared/src/com/liferay/so/announcements/util/PortletKeys.java
+++ b/shared/so-announcements-shared/src/com/liferay/so/announcements/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.so.announcements.util;
 
 /**
diff --git a/shared/so-configurations-shared/copyright.txt b/shared/so-configurations-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/so-configurations-shared/copyright.txt
+++ b/shared/so-configurations-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/so-configurations-shared/src/com/liferay/so/configurations/util/PortletKeys.java b/shared/so-configurations-shared/src/com/liferay/so/configurations/util/PortletKeys.java
index bc17b13a508..e1910fe34f5 100644
--- a/shared/so-configurations-shared/src/com/liferay/so/configurations/util/PortletKeys.java
+++ b/shared/so-configurations-shared/src/com/liferay/so/configurations/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.so.configurations.util;
 
 /**
diff --git a/shared/so-shared/copyright.txt b/shared/so-shared/copyright.txt
index b218b052d37..a5ea82cacc8 100644
--- a/shared/so-shared/copyright.txt
+++ b/shared/so-shared/copyright.txt
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
- */
\ No newline at end of file
+ *
+ *
+ */
diff --git a/shared/so-shared/src/com/liferay/so/util/PortletKeys.java b/shared/so-shared/src/com/liferay/so/util/PortletKeys.java
index a13dbd83af4..b8bfe98da78 100644
--- a/shared/so-shared/src/com/liferay/so/util/PortletKeys.java
+++ b/shared/so-shared/src/com/liferay/so/util/PortletKeys.java
@@ -1,20 +1,21 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This file is part of Liferay Social Office. Liferay Social Office is free
- * software: you can redistribute it and/or modify it under the terms of the GNU
- * Affero General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
+ *
+ *
  *
- * Liferay Social Office is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
- * for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * Liferay Social Office. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
  */
 
+
 package com.liferay.so.util;
 
 /**
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp
index 9b667012aba..2da3135659f 100644
--- a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 --%>
 
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java
index 58ccfba8554..952ef5de462 100644
--- a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package @portlet.java.package.name@;
diff --git a/tools/templates/portlet_tmpl/docroot/view.jsp b/tools/templates/portlet_tmpl/docroot/view.jsp
old mode 100755
new mode 100644
index 1b3ecefb201..2a9a9f9a767
--- a/tools/templates/portlet_tmpl/docroot/view.jsp
+++ b/tools/templates/portlet_tmpl/docroot/view.jsp
@@ -2,15 +2,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 %>
 
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyBaseModel.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyBaseModel.java
index c6877e2d014..a5a4d1810cc 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyBaseModel.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyBaseModel.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.model;
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyDDLRecord.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyDDLRecord.java
index a3c2b2d14eb..4923129c371 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyDDLRecord.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyDDLRecord.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.model;
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyJournalArticle.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyJournalArticle.java
index 0a9c08f94c1..7a56a35ee2d 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyJournalArticle.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/model/SkinnyJournalArticle.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.model;
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/ClpSerializer.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/ClpSerializer.java
index 4bb45afe93f..391899bb382 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/ClpSerializer.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service;
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyService.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyService.java
index f7e272e6b91..e669cae46f5 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyService.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service;
@@ -53,7 +53,7 @@ public interface SkinnyService extends BaseService, InvokableService {
 	 *
 	 * Never modify or reference this interface directly. Always use {@link SkinnyServiceUtil} to access the skinny remote service. Add custom service methods to {@link com.liferay.skinny.service.impl.SkinnyServiceImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceClp.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceClp.java
index 20d049a14ab..0420a5ef971 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceClp.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service;
@@ -42,14 +42,14 @@ public class SkinnyServiceClp implements SkinnyService {
 			};
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -72,7 +72,7 @@ public class SkinnyServiceClp implements SkinnyService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.skinny.model.SkinnyDDLRecord> getSkinnyDDLRecords(
 		long ddlRecordSetId) throws java.lang.Exception {
 		Object returnObj = null;
@@ -100,7 +100,7 @@ public class SkinnyServiceClp implements SkinnyService {
 		return (java.util.List<com.liferay.skinny.model.SkinnyDDLRecord>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.skinny.model.SkinnyJournalArticle> getSkinnyJournalArticles(
 		long companyId, java.lang.String groupName, long ddmStructureId,
 		java.lang.String locale) throws java.lang.Exception {
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceUtil.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceUtil.java
index c1b13eaacd0..e66d49863ad 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceUtil.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service;
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceWrapper.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceWrapper.java
index d7f51601b35..ea1a8ce0736 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceWrapper.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/SkinnyServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service;
@@ -32,7 +32,7 @@ public class SkinnyServiceWrapper implements SkinnyService,
 		_skinnyService = skinnyService;
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -44,18 +44,18 @@ public class SkinnyServiceWrapper implements SkinnyService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _skinnyService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.skinny.model.SkinnyDDLRecord> getSkinnyDDLRecords(
 		long ddlRecordSetId) throws java.lang.Exception {
 		return _skinnyService.getSkinnyDDLRecords(ddlRecordSetId);
 	}
 
-	@Override
+
 	public java.util.List<com.liferay.skinny.model.SkinnyJournalArticle> getSkinnyJournalArticles(
 		long companyId, java.lang.String groupName, long ddmStructureId,
 		java.lang.String locale) throws java.lang.Exception {
@@ -63,12 +63,12 @@ public class SkinnyServiceWrapper implements SkinnyService,
 			ddmStructureId, locale);
 	}
 
-	@Override
+
 	public SkinnyService getWrappedService() {
 		return _skinnyService;
 	}
 
-	@Override
+
 	public void setWrappedService(SkinnyService skinnyService) {
 		_skinnyService = skinnyService;
 	}
diff --git a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/messaging/ClpMessageListener.java b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/messaging/ClpMessageListener.java
index c952e92c4fb..c385ec40b62 100644
--- a/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/messaging/ClpMessageListener.java
+++ b/webs/skinny-web/docroot/WEB-INF/service/com/liferay/skinny/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceBaseImpl.java b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceBaseImpl.java
index 137c7af9d0b..60b5951c7eb 100644
--- a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceBaseImpl.java
+++ b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service.base;
@@ -467,12 +467,12 @@ public abstract class SkinnyServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return SkinnyService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceClpInvoker.java b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceClpInvoker.java
index 804cd2ee96c..bda1adf0548 100644
--- a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceClpInvoker.java
+++ b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/base/SkinnyServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service.base;
diff --git a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceHttp.java b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceHttp.java
index f10a3978c23..089350ee6d3 100644
--- a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceHttp.java
+++ b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service.http;
diff --git a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceSoap.java b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceSoap.java
index 44b43e4ed34..b8845c9e4cf 100644
--- a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceSoap.java
+++ b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/http/SkinnyServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service.http;
diff --git a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/impl/SkinnyServiceImpl.java b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/impl/SkinnyServiceImpl.java
index 3eefe17d8de..4537a644b4a 100644
--- a/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/impl/SkinnyServiceImpl.java
+++ b/webs/skinny-web/docroot/WEB-INF/src/com/liferay/skinny/service/impl/SkinnyServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.skinny.service.impl;
@@ -51,7 +51,7 @@ import java.util.Set;
 public class SkinnyServiceImpl extends SkinnyServiceBaseImpl {
 
 	@AccessControlled(guestAccessEnabled = true)
-	@Override
+
 	public List<SkinnyDDLRecord> getSkinnyDDLRecords(long ddlRecordSetId)
 		throws Exception {
 
@@ -77,7 +77,7 @@ public class SkinnyServiceImpl extends SkinnyServiceBaseImpl {
 	}
 
 	@AccessControlled(guestAccessEnabled = true)
-	@Override
+
 	public List<SkinnyJournalArticle> getSkinnyJournalArticles(
 			long companyId, String groupName, long ddmStructureId,
 			String locale)
diff --git a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/ClpSerializer.java b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/ClpSerializer.java
index ced4851eb98..214b300f3f2 100644
--- a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/ClpSerializer.java
+++ b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/ClpSerializer.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service;
diff --git a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsService.java b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsService.java
index 6554ce620e7..d824b7ccc8b 100644
--- a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsService.java
+++ b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsService.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service;
@@ -50,7 +50,7 @@ public interface WordsService extends BaseService, InvokableService {
 	 *
 	 * Never modify or reference this interface directly. Always use {@link WordsServiceUtil} to access the words remote service. Add custom service methods to {@link com.liferay.words.service.impl.WordsServiceImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable;
diff --git a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceClp.java b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceClp.java
index 2ae239f1494..d935e1699ae 100644
--- a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceClp.java
+++ b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceClp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service;
@@ -40,14 +40,14 @@ public class WordsServiceClp implements WordsService {
 		_methodParameterTypes3 = new String[] { "java.lang.String" };
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		Object returnObj = null;
 
@@ -70,7 +70,7 @@ public class WordsServiceClp implements WordsService {
 		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.String> checkSpelling(java.lang.String text)
 		throws java.lang.Exception {
 		Object returnObj = null;
@@ -99,7 +99,7 @@ public class WordsServiceClp implements WordsService {
 		return (java.util.List<java.lang.String>)ClpSerializer.translateOutput(returnObj);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.String> getSuggestions(
 		java.lang.String word) throws java.lang.Exception {
 		Object returnObj = null;
diff --git a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceUtil.java b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceUtil.java
index db03ff7f80b..a33d0f9114c 100644
--- a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceUtil.java
+++ b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceUtil.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service;
diff --git a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceWrapper.java b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceWrapper.java
index 7781b7d5507..2b4a22e1b19 100644
--- a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceWrapper.java
+++ b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/WordsServiceWrapper.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service;
@@ -32,7 +32,7 @@ public class WordsServiceWrapper implements WordsService,
 		_wordsService = wordsService;
 	}
 
-	@Override
+
 	public java.lang.Object invokeMethod(java.lang.String name,
 		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
 		throws java.lang.Throwable {
@@ -44,29 +44,29 @@ public class WordsServiceWrapper implements WordsService,
 	*
 	* @return the OSGi service identifier
 	*/
-	@Override
+
 	public java.lang.String getOSGiServiceIdentifier() {
 		return _wordsService.getOSGiServiceIdentifier();
 	}
 
-	@Override
+
 	public java.util.List<java.lang.String> checkSpelling(java.lang.String text)
 		throws java.lang.Exception {
 		return _wordsService.checkSpelling(text);
 	}
 
-	@Override
+
 	public java.util.List<java.lang.String> getSuggestions(
 		java.lang.String word) throws java.lang.Exception {
 		return _wordsService.getSuggestions(word);
 	}
 
-	@Override
+
 	public WordsService getWrappedService() {
 		return _wordsService;
 	}
 
-	@Override
+
 	public void setWrappedService(WordsService wordsService) {
 		_wordsService = wordsService;
 	}
diff --git a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/messaging/ClpMessageListener.java b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/messaging/ClpMessageListener.java
index dd2a64518e0..677ab1bab9b 100644
--- a/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/messaging/ClpMessageListener.java
+++ b/webs/words-web/docroot/WEB-INF/service/com/liferay/words/service/messaging/ClpMessageListener.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service.messaging;
@@ -31,7 +31,7 @@ public class ClpMessageListener extends BaseMessageListener {
 		return ClpSerializer.getServletContextName();
 	}
 
-	@Override
+
 	protected void doReceive(Message message) throws Exception {
 		String command = message.getString("command");
 		String servletContextName = message.getString("servletContextName");
diff --git a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceBaseImpl.java b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceBaseImpl.java
index 5063a841eb3..75ed7ea6188 100644
--- a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceBaseImpl.java
+++ b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceBaseImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service.base;
@@ -234,12 +234,12 @@ public abstract class WordsServiceBaseImpl extends BaseServiceImpl
 	 *
 	 * @return the OSGi service identifier
 	 */
-	@Override
+
 	public String getOSGiServiceIdentifier() {
 		return WordsService.class.getName();
 	}
 
-	@Override
+
 	public Object invokeMethod(String name, String[] parameterTypes,
 		Object[] arguments) throws Throwable {
 		Thread currentThread = Thread.currentThread();
diff --git a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceClpInvoker.java b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceClpInvoker.java
index 3f9012ecbbe..ec05d63953d 100644
--- a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceClpInvoker.java
+++ b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/base/WordsServiceClpInvoker.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service.base;
diff --git a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceHttp.java b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceHttp.java
index acaa6744683..48d8c62c304 100644
--- a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceHttp.java
+++ b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceHttp.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service.http;
diff --git a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceSoap.java b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceSoap.java
index 17fb3ac6cd4..943153b8544 100644
--- a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceSoap.java
+++ b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/http/WordsServiceSoap.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service.http;
diff --git a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/impl/WordsServiceImpl.java b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/impl/WordsServiceImpl.java
index 6d1f5cf2248..dde01ebe79c 100644
--- a/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/impl/WordsServiceImpl.java
+++ b/webs/words-web/docroot/WEB-INF/src/com/liferay/words/service/impl/WordsServiceImpl.java
@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
+ * The contents of this file are subject to the terms of the applicable 
+ * Liferay software end user license agreement ("License Agreement")
+ * found on www.liferay.com/legal/eulas. You may also contact Liferay, Inc.
+ * for a copy of the License Agreement. You may not use this file except in
+ * compliance with the License Agreement. 
+ * See the License Agreement for the specific language governing
+ * permissions and limitations under the License Agreement, including 
+ * but not limited to distribution rights of the Software.
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
  */
 
 package com.liferay.words.service.impl;
@@ -28,7 +28,7 @@ import java.util.List;
  */
 public class WordsServiceImpl extends WordsServiceBaseImpl {
 
-	@Override
+
 	public List<String> checkSpelling(String text) throws Exception {
 		List<String> invalidWords = new ArrayList<>();
 
@@ -39,7 +39,7 @@ public class WordsServiceImpl extends WordsServiceBaseImpl {
 		return invalidWords;
 	}
 
-	@Override
+
 	public List<String> getSuggestions(String word) throws Exception {
 		List<InvalidWord> invalidWords = WordsUtil.checkSpelling(word);
 
