LPS-27238 Rollback changes to ServiceBuilder that remove cluster-spri…

…ng.xml from plugins, it is needed after all
mhan810 · May 12, 2012 · 2fb11f0 · 2fb11f0
1 parent 9189c30
commit 2fb11f0
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 19 deletions.
diff --git a/portal-impl/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java b/portal-impl/src/com/liferay/portal/tools/servicebuilder/ServiceBuilder.java
@@ -124,6 +124,7 @@ public static void main(String[] args) {
 		String modelHintsFileName = arguments.get("service.model.hints.file");
 		String springFileName = arguments.get("service.spring.file");
 		String springBaseFileName = arguments.get("service.spring.base.file");
+		String springClusterFileName = arguments.get("service.spring.cluster.file");
 		String springDynamicDataSourceFileName = arguments.get("service.spring.dynamic.data.source.file");
 		String springHibernateFileName = arguments.get("service.spring.hibernate.file");
 		String springInfrastructureFileName = arguments.get("service.spring.infrastructure.file");
@@ -146,7 +147,7 @@ public static void main(String[] args) {
 		try {
 			new ServiceBuilder(
 				fileName, hbmFileName, ormFileName, modelHintsFileName,
-				springFileName, springBaseFileName,
+				springFileName, springBaseFileName, springClusterFileName,
 				springDynamicDataSourceFileName, springHibernateFileName,
 				springInfrastructureFileName, springShardDataSourceFileName,
 				apiDir, implDir, jsonFileName, remotingFileName, sqlDir,
@@ -412,8 +413,9 @@ public static void writeFileRaw(File file, String content)
 	public ServiceBuilder(
 		String fileName, String hbmFileName, String ormFileName,
 		String modelHintsFileName, String springFileName,
-		String springBaseFileName, String springDynamicDataSourceFileName,
-		String springHibernateFileName, String springInfrastructureFileName,
+		String springBaseFileName, String springClusterFileName,
+		String springDynamicDataSourceFileName, String springHibernateFileName,
+		String springInfrastructureFileName,
 		String springShardDataSourceFileName, String apiDir, String implDir,
 		String jsonFileName, String remotingFileName, String sqlDir,
 		String sqlFileName, String sqlIndexesFileName,
@@ -423,20 +425,21 @@ public ServiceBuilder(
 
 		this(
 			fileName, hbmFileName, ormFileName, modelHintsFileName,
-			springFileName, springBaseFileName, springDynamicDataSourceFileName,
-			springHibernateFileName, springInfrastructureFileName,
-			springShardDataSourceFileName, apiDir, implDir, jsonFileName,
-			remotingFileName, sqlDir, sqlFileName, sqlIndexesFileName,
-			sqlIndexesPropertiesFileName, sqlSequencesFileName,
-			autoNamespaceTables, beanLocatorUtil, propsUtil, pluginName,
-			testDir, true);
+			springFileName, springBaseFileName, springClusterFileName,
+			springDynamicDataSourceFileName, springHibernateFileName,
+			springInfrastructureFileName, springShardDataSourceFileName, apiDir,
+			implDir, jsonFileName, remotingFileName, sqlDir, sqlFileName,
+			sqlIndexesFileName, sqlIndexesPropertiesFileName,
+			sqlSequencesFileName, autoNamespaceTables, beanLocatorUtil,
+			propsUtil, pluginName, testDir, true);
 	}
 
 	public ServiceBuilder(
 		String fileName, String hbmFileName, String ormFileName,
 		String modelHintsFileName, String springFileName,
-		String springBaseFileName, String springDynamicDataSourceFileName,
-		String springHibernateFileName, String springInfrastructureFileName,
+		String springBaseFileName, String springClusterFileName,
+		String springDynamicDataSourceFileName, String springHibernateFileName,
+		String springInfrastructureFileName,
 		String springShardDataSourceFileName, String apiDir, String implDir,
 		String jsonFileName, String remotingFileName, String sqlDir,
 		String sqlFileName, String sqlIndexesFileName,
@@ -499,6 +502,8 @@ public ServiceBuilder(
 			"service_wrapper", _tplServiceWrapper);
 		_tplSpringBaseXml = _getTplProperty(
 			"spring_base_xml", _tplSpringBaseXml);
+		_tplSpringClusterXml = _getTplProperty(
+			"spring_cluster_xml", _tplSpringClusterXml);
 		_tplSpringDynamicDataSourceXml = _getTplProperty(
 			"spring_dynamic_data_source_xml", _tplSpringDynamicDataSourceXml);
 		_tplSpringHibernateXml = _getTplProperty(
@@ -519,6 +524,7 @@ public ServiceBuilder(
 			_modelHintsFileName = modelHintsFileName;
 			_springFileName = springFileName;
 			_springBaseFileName = springBaseFileName;
+			_springClusterFileName = springClusterFileName;
 			_springDynamicDataSourceFileName = springDynamicDataSourceFileName;
 			_springHibernateFileName = springHibernateFileName;
 			_springInfrastructureFileName = springInfrastructureFileName;
@@ -915,7 +921,7 @@ public Entity getEntity(String name) throws IOException {
 
 			ServiceBuilder serviceBuilder = new ServiceBuilder(
 				refFileName, _hbmFileName, _ormFileName, _modelHintsFileName,
-				_springFileName, _springBaseFileName,
+				_springFileName, _springBaseFileName, _springClusterFileName,
 				_springDynamicDataSourceFileName, _springHibernateFileName,
 				_springInfrastructureFileName, _springShardDataSourceFileName,
 				_apiDir, _implDir, _jsonFileName, _remotingFileName, _sqlDir,
@@ -3093,13 +3099,19 @@ private void _createSpringBaseXml() throws Exception {
 	}
 
 	private void _createSpringClusterXml() throws Exception {
-		File ejbFile = new File(_implDir + "/META-INF/cluster-spring.xml");
+		if (Validator.isNull(_springClusterFileName)) {
+			return;
+		}
 
-		if (ejbFile.exists()) {
-			System.out.println("Removing deprecated " + ejbFile);
+		// Content
 
-			ejbFile.delete();
-		}
+		String content = _processTemplate(_tplSpringClusterXml);
+
+		// Write file
+
+		File ejbFile = new File(_springClusterFileName);
+
+		FileUtil.write(ejbFile, content, true);
 	}
 
 	private void _createSpringDynamicDataSourceXml() throws Exception {
@@ -4968,6 +4980,7 @@ private void _updateSQLFile(
 	private String _remotingFileName;
 	private String _serviceOutputPath;
 	private String _springBaseFileName;
+	private String _springClusterFileName;
 	private String _springDynamicDataSourceFileName;
 	private String _springFileName;
 	private String _springHibernateFileName;
@@ -5026,6 +5039,7 @@ private void _updateSQLFile(
 	private String _tplServiceUtil = _TPL_ROOT + "service_util.ftl";
 	private String _tplServiceWrapper = _TPL_ROOT + "service_wrapper.ftl";
 	private String _tplSpringBaseXml = _TPL_ROOT + "spring_base_xml.ftl";
+	private String _tplSpringClusterXml = _TPL_ROOT + "spring_cluster_xml.ftl";
 	private String _tplSpringDynamicDataSourceXml =
 		_TPL_ROOT + "spring_dynamic_data_source_xml.ftl";
 	private String _tplSpringHibernateXml =

diff --git a/portal-impl/src/com/liferay/portal/tools/servicebuilder/dependencies/props.ftl b/portal-impl/src/com/liferay/portal/tools/servicebuilder/dependencies/props.ftl
@@ -32,7 +32,9 @@
         WEB-INF/classes/META-INF/hibernate-spring.xml,\
         WEB-INF/classes/META-INF/infrastructure-spring.xml,\
         \
-        WEB-INF/classes/META-INF/portlet-spring.xml,\
+        WEB-INF/classes/META-INF/cluster-spring.xml,\
+        \
+		WEB-INF/classes/META-INF/portlet-spring.xml,\
         \
         WEB-INF/classes/META-INF/dynamic-data-source-spring.xml,\
         WEB-INF/classes/META-INF/shard-data-source-spring.xml,\

diff --git a/portal-impl/src/com/liferay/portal/tools/servicebuilder/dependencies/spring_cluster_xml.ftl b/portal-impl/src/com/liferay/portal/tools/servicebuilder/dependencies/spring_cluster_xml.ftl
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+>
+	<bean id="com.liferay.portal.spring.aop.ChainableMethodAdviceInjector" class="com.liferay.portal.spring.aop.ChainableMethodAdviceInjector">
+		<property name="injectCondition">
+			<util:constant static-field="com.liferay.portal.util.PropsValues.CLUSTER_LINK_ENABLED" />
+		</property>
+		<property name="newChainableMethodAdvice">
+			<bean class="com.liferay.portal.cluster.ClusterableAdvice">
+				<property name="servletContextName" ref="servletContextName" />
+			</bean>
+		</property>
+		<property name="parentChainableMethodAdvice" ref="serviceAdvice" />
+	</bean>
+</beans>