LPS-55355 updated SB metadata to latest

juliocamarero · Aug 17, 2015 · 6d8c40a · 6d8c40a
1 parent f0442ea
commit 6d8c40a
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 306 deletions.
diff --git a/modules/apps/shopping/shopping-service/.classpath b/modules/apps/shopping/shopping-service/.classpath
@@ -13,7 +13,6 @@
 	<classpathentry kind="lib" path="/portal-master/lib/portal/bnd.jar" />
 	<classpathentry kind="lib" path="/portal-master/lib/portal/commons-logging.jar" />
 	<classpathentry kind="lib" path="/portal-master/lib/portal/log4j.jar" />
-	<classpathentry kind="lib" path="/portal-master/lib/portal/spring-context.jar" />
 	<classpathentry kind="lib" path="/portal-master/portal-service/portal-service.jar" />
 	<classpathentry kind="lib" path="/portal-master/util-bridges/util-bridges.jar" />
 	<classpathentry kind="lib" path="/portal-master/util-java/util-java.jar" />

diff --git a/modules/apps/shopping/shopping-service/bnd.bnd b/modules/apps/shopping/shopping-service/bnd.bnd
@@ -5,7 +5,6 @@ Export-Package:	\
 	com.liferay.shopping.lar,\
 	com.liferay.shopping.model.impl,\
 	com.liferay.shopping.service.base,\
-	com.liferay.shopping.service.configuration.configurator,\
 	com.liferay.shopping.service.http,\
 	com.liferay.shopping.service.impl,\
 	com.liferay.shopping.service.permission,\
@@ -22,9 +21,9 @@ Include-Resource:\
 	@../../../../util-java/util-java.jar!/com/liferay/util/CreditCard.class,\
 	@../../../../util-java/util-java.jar!/com/liferay/util/dao/orm/CustomSQL.class,\
 	@../../../../util-java/util-java.jar!/com/liferay/util/dao/orm/CustomSQLUtil.class
-
 Liferay-Service: true
 Require-Capability:\
 	liferay.extender;\
 	filter:="(&(liferay.extender=spring.extender)(version>=1.0)(!(version>=2.0)))"
-Spring-Context: META-INF/*-spring.xml;timeout:=${spring.extender.time.to.wait}
+Spring-Context: META-INF/spring
+-spring-dependency: com.liferay.portal.spring.extender.service.ServiceReference
diff --git a/modules/apps/shopping/shopping-service/build.xml b/modules/apps/shopping/shopping-service/build.xml
@@ -3,7 +3,6 @@
 
 <project>
 	<property name="import.shared" value="shopping-api" />
-	<property name="osgi.ide.dependencies" value="spring-context.jar" />
 	<property name="service.input.file" value="service.xml" />
 
 	<import file="../../../../tools/sdk/build-common-osgi-plugin.xml" />

diff --git a/modules/apps/shopping/shopping-service/ivy.xml b/modules/apps/shopping/shopping-service/ivy.xml
@@ -17,7 +17,7 @@
 	</publications>
 
 	<dependencies defaultconf="default">
-		<dependency name="com.liferay.portal.spring.extender" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+		<dependency conf="default->master" name="com.liferay.portal.spring.extender" org="com.liferay" rev="1.0.2" />
 		<dependency name="org.osgi.core" org="org.osgi" rev="5.0.0" />
 		<dependency name="org.osgi.compendium" org="org.osgi" rev="5.0.0" />
 	</dependencies>

diff --git a/modules/apps/shopping/shopping-service/service.xml b/modules/apps/shopping/shopping-service/service.xml
@@ -389,7 +389,6 @@
 		<reference package-path="com.liferay.portal" entity="Company" />
 		<reference package-path="com.liferay.portal" entity="Subscription" />
 		<reference package-path="com.liferay.portal" entity="User" />
-		<reference package-path="com.liferay.portlet.messageboards" entity="MBMessage" />
 		<reference package-path="com.liferay.shopping" entity="ShoppingItem" />
 		<reference package-path="com.liferay.shopping" entity="ShoppingItemField" />
 		<reference package-path="com.liferay.shopping" entity="ShoppingOrderItem" />

diff --git a/...ng-service/src/META-INF/module-spring.xml → ...ice/src/META-INF/spring/module-spring.xml b/...ng-service/src/META-INF/module-spring.xml → ...ice/src/META-INF/spring/module-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:osgi="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-destroy-method="destroy" default-init-method="afterPropertiesSet" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-destroy-method="destroy" default-init-method="afterPropertiesSet" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 	<bean id="com.liferay.shopping.service.ShoppingCartLocalService" class="com.liferay.shopping.service.impl.ShoppingCartLocalServiceImpl" />
 	<bean id="com.liferay.shopping.service.persistence.ShoppingCartPersistence" class="com.liferay.shopping.service.persistence.impl.ShoppingCartPersistenceImpl" parent="basePersistence" />
 	<bean id="com.liferay.shopping.service.ShoppingCategoryLocalService" class="com.liferay.shopping.service.impl.ShoppingCategoryLocalServiceImpl" />

diff --git a/.../com/liferay/shopping/service/configuration/configurator/ShoppingServiceConfigurator.java b/.../com/liferay/shopping/service/configuration/configurator/ShoppingServiceConfigurator.java
diff --git a/...shopping-service/src/com/liferay/shopping/service/impl/ShoppingOrderLocalServiceImpl.java b/...shopping-service/src/com/liferay/shopping/service/impl/ShoppingOrderLocalServiceImpl.java
@@ -14,6 +14,7 @@
 
 package com.liferay.shopping.service.impl;
 
+import com.liferay.portal.kernel.comment.CommentManagerUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.settings.GroupServiceSettingsLocator;
 import com.liferay.portal.kernel.settings.LocalizedValuesMap;
@@ -23,7 +24,6 @@
 import com.liferay.portal.kernel.util.LocalizationUtil;
 import com.liferay.portal.kernel.util.PwdGenerator;
 import com.liferay.portal.kernel.util.Validator;
-import com.liferay.portal.kernel.workflow.WorkflowConstants;
 import com.liferay.portal.model.User;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.util.PortletKeys;
@@ -139,13 +139,12 @@ public ShoppingOrder addLatestOrder(long userId, long groupId)
 
 		shoppingOrderPersistence.update(order);
 
-		// Message boards
+		// Comments
 
 		if (PropsValues.SHOPPING_ORDER_COMMENTS_ENABLED) {
-			mbMessageLocalService.addDiscussionMessage(
-				userId, order.getUserName(), groupId,
-				ShoppingOrder.class.getName(), orderId,
-				WorkflowConstants.ACTION_PUBLISH);
+			CommentManagerUtil.addDiscussion(
+				userId, groupId, ShoppingOrder.class.getName(), orderId,
+				order.getUserName());
 		}
 
 		return order;
@@ -255,9 +254,9 @@ public void deleteOrder(ShoppingOrder order) throws PortalException {
 
 		shoppingOrderItemPersistence.removeByOrderId(order.getOrderId());
 
-		// Message boards
+		// Comments
 
-		mbMessageLocalService.deleteDiscussionMessages(
+		CommentManagerUtil.deleteDiscussion(
 			ShoppingOrder.class.getName(), order.getOrderId());
 	}
 

diff --git a/modules/apps/shopping/shopping-web/bnd.bnd b/modules/apps/shopping/shopping-web/bnd.bnd
@@ -29,7 +29,6 @@ Import-Package:\
 	com.liferay.shopping.settings,\
 	com.liferay.shopping.service,\
 	com.liferay.shopping.service.base,\
-	com.liferay.shopping.service.configuration.configurator,\
 	com.liferay.shopping.service.http,\
 	com.liferay.shopping.service.impl,\
 	com.liferay.shopping.service.permission,\

diff --git a/...shopping-web/docroot/WEB-INF/src/com/liferay/shopping/web/upgrade/ShoppingWebUpgrade.java b/...shopping-web/docroot/WEB-INF/src/com/liferay/shopping/web/upgrade/ShoppingWebUpgrade.java
@@ -17,7 +17,6 @@
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.upgrade.UpgradeProcess;
 import com.liferay.portal.service.ReleaseLocalService;
-import com.liferay.shopping.service.configuration.configurator.ShoppingServiceConfigurator;
 import com.liferay.shopping.web.upgrade.v1_0_0.UpgradeAdminPortlets;
 
 import java.util.ArrayList;
@@ -40,11 +39,6 @@ protected void setReleaseLocalService(
 		_releaseLocalService = releaseLocalService;
 	}
 
-	@Reference(unbind = "-")
-	protected void setShoppingServiceConfigurator(
-		ShoppingServiceConfigurator shoppingServiceConfigurator) {
-	}
-
 	@Activate
 	protected void upgrade() throws PortalException {
 		List<UpgradeProcess> upgradeProcesses = new ArrayList<>();

diff --git a/portal-client/namespace-mapping.properties b/portal-client/namespace-mapping.properties
@@ -45,8 +45,6 @@ com.liferay.client.soap.portlet.polls.model=http://model.polls.portlet.liferay.c
 com.liferay.client.soap.portlet.polls.service.http=urn:http.service.polls.portlet.liferay.com
 com.liferay.client.soap.portlet.ratings.model=http://model.ratings.portlet.liferay.com
 com.liferay.client.soap.portlet.ratings.service.http=urn:http.service.ratings.portlet.liferay.com
-com.liferay.client.soap.portlet.shopping.model=http://model.shopping.portlet.liferay.com
-com.liferay.client.soap.portlet.shopping.service.http=urn:http.service.shopping.portlet.liferay.com
 com.liferay.client.soap.portlet.social.model=http://model.social.portlet.liferay.com
 com.liferay.client.soap.portlet.social.service.http=urn:http.service.social.portlet.liferay.com
 com.liferay.client.soap.portlet.softwarecatalog.model=http://model.softwarecatalog.portlet.liferay.com

diff --git a/portal-impl/src/custom-sql/default.xml b/portal-impl/src/custom-sql/default.xml
@@ -11,6 +11,5 @@
 	<sql file="custom-sql/messageboards.xml" />
 	<sql file="custom-sql/mobiledevicerules.xml" />
 	<sql file="custom-sql/ratings.xml" />
-	<sql file="custom-sql/shopping.xml" />
 	<sql file="custom-sql/social.xml" />
 </custom-sql>
diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
@@ -3602,9 +3602,7 @@
         /portal/session_click,\
         /portal/session_tree_js_click,\
         /portal/sitemap,\
-        /portal/status,\
-        \
-        /shopping/notify
+        /portal/status
 
 ##
 ## Authentication Verifier

diff --git a/portal-service/src/com/liferay/portal/kernel/bean/AutoEscapeBeanHandler.java b/portal-service/src/com/liferay/portal/kernel/bean/AutoEscapeBeanHandler.java
@@ -26,13 +26,6 @@
  * Wraps a bean so that all strings returned from <code>@AutoEscape</code>
  * annotated methods are automatically HTML escaped.
  *
- * <p>
- * For a usage example see {@link
- * com.liferay.portlet.shopping.util.ShoppingUtil#getBreadcrumbs(
- * com.liferay.portlet.shopping.model.ShoppingCategory,
- * javax.portlet.RenderRequest, javax.portlet.RenderResponse)}.
- * </p>
- *
  * @author Shuyang Zhou
  * @see    AutoEscape
  */

diff --git a/sql/indexes.sql b/sql/indexes.sql
@@ -417,31 +417,6 @@ create index IX_8377A211 on SCProductVersion (productEntryId);
 
 create unique index IX_4F0315B8 on ServiceComponent (buildNamespace, buildNumber);
 
-create unique index IX_FC46FE16 on ShoppingCart (groupId, userId);
-create index IX_54101CC8 on ShoppingCart (userId);
-
-create index IX_6A84467D on ShoppingCategory (groupId, name);
-create index IX_1E6464F5 on ShoppingCategory (groupId, parentCategoryId);
-
-create unique index IX_DC60CFAE on ShoppingCoupon (code_);
-create index IX_3251AF16 on ShoppingCoupon (groupId);
-
-create unique index IX_1C717CA6 on ShoppingItem (companyId, sku);
-create index IX_FEFE7D76 on ShoppingItem (groupId, categoryId);
-create index IX_903DC750 on ShoppingItem (largeImageId);
-create index IX_D217AB30 on ShoppingItem (mediumImageId);
-create index IX_FF203304 on ShoppingItem (smallImageId);
-
-create index IX_6D5F9B87 on ShoppingItemField (itemId);
-
-create index IX_EA6FD516 on ShoppingItemPrice (itemId);
-
-create index IX_119B5630 on ShoppingOrder (groupId, userId, ppPaymentStatus);
-create unique index IX_D7D6E87A on ShoppingOrder (number_);
-create index IX_F474FD89 on ShoppingOrder (ppTxnId);
-
-create index IX_B5F82C7A on ShoppingOrderItem (orderId);
-
 create index IX_F542E9BC on SocialActivity (activitySetId);
 create index IX_D0E9029E on SocialActivity (classNameId, classPK, type_);
 create index IX_64B1BC66 on SocialActivity (companyId);