LEP-6872

git-svn-id: svn://svn.liferay.com/repos/public/plugins/trunk@18573 05bdf26c-840f-0410-9ced-eb539d925f36
artman328 · Jul 25, 2008 · 54f5d39 · 54f5d39
1 parent 6e6b485
commit 54f5d39
Show file tree

Hide file tree

Showing 61 changed files with 366 additions and 586 deletions.
diff --git a/build-common-plugin.xml b/build-common-plugin.xml
@@ -342,6 +342,7 @@
 			<jvmarg value="-Dservice.model.hints.file=docroot/WEB-INF/src/META-INF/portlet-model-hints.xml" />
 			<jvmarg value="-Dservice.spring.file=docroot/WEB-INF/src/META-INF/portlet-spring.xml" />
 			<jvmarg value="-Dservice.spring.data.source.file=docroot/WEB-INF/src/META-INF/data-source-spring.xml" />
+			<jvmarg value="-Dservice.spring.misc.file=docroot/WEB-INF/src/META-INF/misc-spring.xml" />
 			<jvmarg value="-Dservice.api.dir=docroot/WEB-INF/src" />
 			<jvmarg value="-Dservice.impl.dir=docroot/WEB-INF/src" />
 			<!--<jvmarg value="-Dservice.json.file=docroot/js/service_unpacked.js" />-->

diff --git a/build-common-plugins.xml b/build-common-plugins.xml
@@ -43,6 +43,28 @@
 		<ant dir="${module.name}" target="deploy" inheritAll="false" />
 	</target>
 
+	<target name="build-services">
+		<for param="service.file">
+			<path>
+				<fileset
+					dir="."
+					includes="*/docroot/WEB-INF/service.xml"
+				/>
+			</path>
+			<sequential>
+				<antelope:stringutil string="@{service.file}" property="service.file.index">
+					<indexof string="docroot" fromindex="0" />
+				</antelope:stringutil>
+
+				<antelope:stringutil string="@{service.file}" property="portlet.dir">
+					<substring beginindex="0" endindex="${service.file.index}" />
+				</antelope:stringutil>
+
+				<ant dir="${portlet.dir}" target="build-service" inheritAll="false" />
+			</sequential>
+		</for>
+	</target>
+
 	<target name="loop-modules">
 		<for param="module.name">
 			<path>

diff --git a/webs/iweb-web/docroot/WEB-INF/src/META-INF/data-source-spring.xml b/webs/iweb-web/docroot/WEB-INF/src/META-INF/data-source-spring.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
-	<bean id="portletBeanFactoryPostProcessor" class="com.liferay.portal.spring.context.PortletBeanFactoryPostProcessor" />
 	<bean id="liferayDataSourceTarget" class="com.liferay.portal.kernel.jndi.PortalJNDIUtil" lazy-init="true" factory-method="getDataSource" />
 	<bean id="liferayDataSource" class="org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy" lazy-init="true">
 		<property name="targetDataSource">

diff --git a/webs/iweb-web/docroot/WEB-INF/src/META-INF/misc-spring.xml b/webs/iweb-web/docroot/WEB-INF/src/META-INF/misc-spring.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+	<bean id="portletBeanFactoryPostProcessor" class="com.liferay.portal.spring.context.PortletBeanFactoryPostProcessor" />
+	<bean id="portletClassLoader" class="com.liferay.portal.kernel.portlet.PortletClassLoaderUtil" lazy-init="true" factory-method="getClassLoader" />
+	<bean id="velocityServiceInterceptor" class="com.liferay.portal.spring.aop.ServiceInterceptor" lazy-init="true">
+		<property name="classLoader">
+			<ref bean="portletClassLoader" />
+		</property>
+		<property name="exceptionSafe">
+			<value>true</value>
+		</property>
+	</bean>
+</beans>
diff --git a/webs/iweb-web/docroot/WEB-INF/src/META-INF/portlet-spring.xml b/webs/iweb-web/docroot/WEB-INF/src/META-INF/portlet-spring.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
-	<bean id="com.liferay.iweb.service.CallBackLocalService.impl" class="com.liferay.iweb.service.impl.CallBackLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.CallBackLocalService.impl" class="com.liferay.iweb.service.impl.CallBackLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.CallBackLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -22,12 +22,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.CallBackLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.CallBackLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.CallBackLocalServiceFactory" class="com.liferay.iweb.service.CallBackLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.CallBackLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.CrossContainerLocalService.impl" class="com.liferay.iweb.service.impl.CrossContainerLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.CrossContainerLocalService.impl" class="com.liferay.iweb.service.impl.CrossContainerLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.CrossContainerLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -47,12 +57,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.CrossContainerLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.CrossContainerLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.CrossContainerLocalServiceFactory" class="com.liferay.iweb.service.CrossContainerLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.CrossContainerLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.InterestGroupLocalService.impl" class="com.liferay.iweb.service.impl.InterestGroupLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.InterestGroupLocalService.impl" class="com.liferay.iweb.service.impl.InterestGroupLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.InterestGroupLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -72,12 +92,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.InterestGroupLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.InterestGroupLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.InterestGroupLocalServiceFactory" class="com.liferay.iweb.service.InterestGroupLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.InterestGroupLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.persistence.InterestGroupPersistence.impl" class="com.liferay.iweb.service.persistence.InterestGroupPersistenceImpl" lazy-init="true" init-method="init">
+	<bean id="com.liferay.iweb.service.persistence.InterestGroupPersistence.impl" class="com.liferay.iweb.service.persistence.InterestGroupPersistenceImpl" lazy-init="true">
 		<property name="dataSource">
 			<ref bean="liferayDataSource" />
 		</property>
@@ -106,7 +136,7 @@
 			<ref bean="com.liferay.iweb.service.persistence.InterestGroupPersistence.impl" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.IWebLocalService.impl" class="com.liferay.iweb.service.impl.IWebLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.IWebLocalService.impl" class="com.liferay.iweb.service.impl.IWebLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.IWebLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -126,12 +156,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.IWebLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.IWebLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.IWebLocalServiceFactory" class="com.liferay.iweb.service.IWebLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.IWebLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.PostEntryLocalService.impl" class="com.liferay.iweb.service.impl.PostEntryLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.PostEntryLocalService.impl" class="com.liferay.iweb.service.impl.PostEntryLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.PostEntryLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -151,12 +191,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.PostEntryLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.PostEntryLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.PostEntryLocalServiceFactory" class="com.liferay.iweb.service.PostEntryLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.PostEntryLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.persistence.PostEntryPersistence.impl" class="com.liferay.iweb.service.persistence.PostEntryPersistenceImpl" lazy-init="true" init-method="init">
+	<bean id="com.liferay.iweb.service.persistence.PostEntryPersistence.impl" class="com.liferay.iweb.service.persistence.PostEntryPersistenceImpl" lazy-init="true">
 		<property name="dataSource">
 			<ref bean="liferayDataSource" />
 		</property>
@@ -185,7 +235,7 @@
 			<ref bean="com.liferay.iweb.service.persistence.PostEntryPersistence.impl" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.SemanticsElementLocalService.impl" class="com.liferay.iweb.service.impl.SemanticsElementLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.SemanticsElementLocalService.impl" class="com.liferay.iweb.service.impl.SemanticsElementLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.SemanticsElementLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -205,12 +255,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.SemanticsElementLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.SemanticsElementLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.SemanticsElementLocalServiceFactory" class="com.liferay.iweb.service.SemanticsElementLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.SemanticsElementLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.persistence.SemanticsElementPersistence.impl" class="com.liferay.iweb.service.persistence.SemanticsElementPersistenceImpl" lazy-init="true" init-method="init">
+	<bean id="com.liferay.iweb.service.persistence.SemanticsElementPersistence.impl" class="com.liferay.iweb.service.persistence.SemanticsElementPersistenceImpl" lazy-init="true">
 		<property name="dataSource">
 			<ref bean="liferayDataSource" />
 		</property>
@@ -239,7 +299,7 @@
 			<ref bean="com.liferay.iweb.service.persistence.SemanticsElementPersistence.impl" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.SemanticsFileLocalService.impl" class="com.liferay.iweb.service.impl.SemanticsFileLocalServiceImpl" lazy-init="true" init-method="init" />
+	<bean id="com.liferay.iweb.service.SemanticsFileLocalService.impl" class="com.liferay.iweb.service.impl.SemanticsFileLocalServiceImpl" lazy-init="true" />
 	<bean id="com.liferay.iweb.service.SemanticsFileLocalService.transaction" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" lazy-init="true">
 		<property name="transactionManager">
 			<ref bean="liferayTransactionManager" />
@@ -259,12 +319,22 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="com.liferay.iweb.service.SemanticsFileLocalService.velocity" class="org.springframework.aop.framework.ProxyFactoryBean" lazy-init="true">
+		<property name="interceptorNames">
+			<list>
+				<value>velocityServiceInterceptor</value>
+			</list>
+		</property>
+		<property name="target">
+			<ref bean="com.liferay.iweb.service.SemanticsFileLocalService.transaction" />
+		</property>
+	</bean>
 	<bean id="com.liferay.iweb.service.SemanticsFileLocalServiceFactory" class="com.liferay.iweb.service.SemanticsFileLocalServiceFactory" lazy-init="true">
 		<property name="service">
 			<ref bean="com.liferay.iweb.service.SemanticsFileLocalService.transaction" />
 		</property>
 	</bean>
-	<bean id="com.liferay.iweb.service.persistence.SemanticsFilePersistence.impl" class="com.liferay.iweb.service.persistence.SemanticsFilePersistenceImpl" lazy-init="true" init-method="init">
+	<bean id="com.liferay.iweb.service.persistence.SemanticsFilePersistence.impl" class="com.liferay.iweb.service.persistence.SemanticsFilePersistenceImpl" lazy-init="true">
 		<property name="dataSource">
 			<ref bean="liferayDataSource" />
 		</property>

diff --git a/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/InterestGroupLocalService.java b/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/InterestGroupLocalService.java
@@ -53,6 +53,12 @@ public com.liferay.iweb.model.InterestGroup getInterestGroup(long cid)
 		throws com.liferay.portal.SystemException,
 			com.liferay.portal.PortalException;
 
+	public java.util.List<com.liferay.iweb.model.InterestGroup> getInterestGroups(
+		int start, int end) throws com.liferay.portal.SystemException;
+
+	public int getInterestGroupsCount()
+		throws com.liferay.portal.SystemException;
+
 	public com.liferay.iweb.model.InterestGroup updateInterestGroup(
 		com.liferay.iweb.model.InterestGroup interestGroup)
 		throws com.liferay.portal.SystemException;

diff --git a/.../iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/InterestGroupLocalServiceUtil.java b/.../iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/InterestGroupLocalServiceUtil.java
@@ -78,6 +78,20 @@ public static com.liferay.iweb.model.InterestGroup getInterestGroup(
 		return interestGroupLocalService.getInterestGroup(cid);
 	}
 
+	public static java.util.List<com.liferay.iweb.model.InterestGroup> getInterestGroups(
+		int start, int end) throws com.liferay.portal.SystemException {
+		InterestGroupLocalService interestGroupLocalService = InterestGroupLocalServiceFactory.getService();
+
+		return interestGroupLocalService.getInterestGroups(start, end);
+	}
+
+	public static int getInterestGroupsCount()
+		throws com.liferay.portal.SystemException {
+		InterestGroupLocalService interestGroupLocalService = InterestGroupLocalServiceFactory.getService();
+
+		return interestGroupLocalService.getInterestGroupsCount();
+	}
+
 	public static com.liferay.iweb.model.InterestGroup updateInterestGroup(
 		com.liferay.iweb.model.InterestGroup interestGroup)
 		throws com.liferay.portal.SystemException {

diff --git a/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/PostEntryLocalService.java b/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/PostEntryLocalService.java
@@ -52,6 +52,11 @@ public com.liferay.iweb.model.PostEntry getPostEntry(long uid)
 		throws com.liferay.portal.SystemException,
 			com.liferay.portal.PortalException;
 
+	public java.util.List<com.liferay.iweb.model.PostEntry> getPostEntries(
+		int start, int end) throws com.liferay.portal.SystemException;
+
+	public int getPostEntriesCount() throws com.liferay.portal.SystemException;
+
 	public com.liferay.iweb.model.PostEntry updatePostEntry(
 		com.liferay.iweb.model.PostEntry postEntry)
 		throws com.liferay.portal.SystemException;

diff --git a/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/PostEntryLocalServiceUtil.java b/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/PostEntryLocalServiceUtil.java
@@ -77,6 +77,20 @@ public static com.liferay.iweb.model.PostEntry getPostEntry(long uid)
 		return postEntryLocalService.getPostEntry(uid);
 	}
 
+	public static java.util.List<com.liferay.iweb.model.PostEntry> getPostEntries(
+		int start, int end) throws com.liferay.portal.SystemException {
+		PostEntryLocalService postEntryLocalService = PostEntryLocalServiceFactory.getService();
+
+		return postEntryLocalService.getPostEntries(start, end);
+	}
+
+	public static int getPostEntriesCount()
+		throws com.liferay.portal.SystemException {
+		PostEntryLocalService postEntryLocalService = PostEntryLocalServiceFactory.getService();
+
+		return postEntryLocalService.getPostEntriesCount();
+	}
+
 	public static com.liferay.iweb.model.PostEntry updatePostEntry(
 		com.liferay.iweb.model.PostEntry postEntry)
 		throws com.liferay.portal.SystemException {

diff --git a/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/SemanticsElementLocalService.java b/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/SemanticsElementLocalService.java
@@ -54,6 +54,12 @@ public com.liferay.iweb.model.SemanticsElement getSemanticsElement(
 		throws com.liferay.portal.SystemException,
 			com.liferay.portal.PortalException;
 
+	public java.util.List<com.liferay.iweb.model.SemanticsElement> getSemanticsElements(
+		int start, int end) throws com.liferay.portal.SystemException;
+
+	public int getSemanticsElementsCount()
+		throws com.liferay.portal.SystemException;
+
 	public com.liferay.iweb.model.SemanticsElement updateSemanticsElement(
 		com.liferay.iweb.model.SemanticsElement semanticsElement)
 		throws com.liferay.portal.SystemException;

diff --git a/...eb-web/docroot/WEB-INF/src/com/liferay/iweb/service/SemanticsElementLocalServiceUtil.java b/...eb-web/docroot/WEB-INF/src/com/liferay/iweb/service/SemanticsElementLocalServiceUtil.java
@@ -79,6 +79,20 @@ public static com.liferay.iweb.model.SemanticsElement getSemanticsElement(
 		return semanticsElementLocalService.getSemanticsElement(elementURI);
 	}
 
+	public static java.util.List<com.liferay.iweb.model.SemanticsElement> getSemanticsElements(
+		int start, int end) throws com.liferay.portal.SystemException {
+		SemanticsElementLocalService semanticsElementLocalService = SemanticsElementLocalServiceFactory.getService();
+
+		return semanticsElementLocalService.getSemanticsElements(start, end);
+	}
+
+	public static int getSemanticsElementsCount()
+		throws com.liferay.portal.SystemException {
+		SemanticsElementLocalService semanticsElementLocalService = SemanticsElementLocalServiceFactory.getService();
+
+		return semanticsElementLocalService.getSemanticsElementsCount();
+	}
+
 	public static com.liferay.iweb.model.SemanticsElement updateSemanticsElement(
 		com.liferay.iweb.model.SemanticsElement semanticsElement)
 		throws com.liferay.portal.SystemException {

diff --git a/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/SemanticsFileLocalService.java b/webs/iweb-web/docroot/WEB-INF/src/com/liferay/iweb/service/SemanticsFileLocalService.java
@@ -54,6 +54,12 @@ public com.liferay.iweb.model.SemanticsFile getSemanticsFile(
 		throws com.liferay.portal.SystemException,
 			com.liferay.portal.PortalException;
 
+	public java.util.List<com.liferay.iweb.model.SemanticsFile> getSemanticsFiles(
+		int start, int end) throws com.liferay.portal.SystemException;
+
+	public int getSemanticsFilesCount()
+		throws com.liferay.portal.SystemException;
+
 	public com.liferay.iweb.model.SemanticsFile updateSemanticsFile(
 		com.liferay.iweb.model.SemanticsFile semanticsFile)
 		throws com.liferay.portal.SystemException;