Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mol...@us...> - 2007-11-05 17:49:57
|
Revision: 493
http://openutils.svn.sourceforge.net/openutils/?rev=493&view=rev
Author: molaschi
Date: 2007-11-05 08:38:53 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-spring-1.0.3
Modified Paths:
--------------
trunk/openutils-spring/pom.xml
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2007-11-05 16:36:06 UTC (rev 492)
+++ trunk/openutils-spring/pom.xml 2007-11-05 16:38:53 UTC (rev 493)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-spring</artifactId>
<name>openutils spring tools</name>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
<description />
<properties>
<spring.version>2.0.6</spring.version>
@@ -98,4 +97,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.3</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2007-11-05 17:49:01
|
Revision: 494
http://openutils.svn.sourceforge.net/openutils/?rev=494&view=rev
Author: molaschi
Date: 2007-11-05 08:39:02 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-spring-1.0.3
Added Paths:
-----------
tags/openutils-spring-1.0.3/
tags/openutils-spring-1.0.3/pom.xml
Removed Paths:
-------------
tags/openutils-spring-1.0.3/pom.xml
Copied: tags/openutils-spring-1.0.3 (from rev 492, trunk/openutils-spring)
Deleted: tags/openutils-spring-1.0.3/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2007-11-05 16:36:06 UTC (rev 492)
+++ tags/openutils-spring-1.0.3/pom.xml 2007-11-05 16:39:02 UTC (rev 494)
@@ -1,101 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring</artifactId>
- <name>openutils spring tools</name>
- <version>1.0.3-SNAPSHOT</version>
- <description />
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl:jar</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>1.1</version>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-spring-1.0.3/pom.xml (from rev 493, trunk/openutils-spring/pom.xml)
===================================================================
--- tags/openutils-spring-1.0.3/pom.xml (rev 0)
+++ tags/openutils-spring-1.0.3/pom.xml 2007-11-05 16:39:02 UTC (rev 494)
@@ -0,0 +1,106 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring</artifactId>
+ <name>openutils spring tools</name>
+ <version>1.0.3</version>
+ <description />
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl:jar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>1.1</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.3</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2007-11-05 17:48:03
|
Revision: 492
http://openutils.svn.sourceforge.net/openutils/?rev=492&view=rev
Author: molaschi
Date: 2007-11-05 08:36:06 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
jsonexporter
Modified Paths:
--------------
trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java 2007-10-31 18:00:39 UTC (rev 491)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java 2007-11-05 16:36:06 UTC (rev 492)
@@ -1,112 +1,253 @@
package it.openutils.spring.remoting.exporters;
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.TypeVariable;
+import java.util.Collection;
import java.util.Enumeration;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.json.JSON;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONNull;
import net.sf.json.JSONObject;
import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
-import org.springframework.beans.factory.InitializingBean;
+import org.hibernate.Hibernate;
import org.springframework.remoting.support.RemoteInvocation;
import org.springframework.remoting.support.RemoteInvocationBasedExporter;
import org.springframework.remoting.support.RemoteInvocationResult;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.Controller;
-
/**
* @author mmolaschi
* @version $Id: $
*/
-public class JSONServiceExporter extends RemoteInvocationBasedExporter implements Controller
-{
- private static final String METHOD = "__method__";
+public class JSONServiceExporter extends RemoteInvocationBasedExporter
+ implements Controller {
+ private static final String METHOD = "__method__";
- private static final String PARAM_PREFIX = "param";
+ private static final String PARAM_PREFIX = "param";
- private static final String CONTENT_TYPE = "text/x-json";
+ private static final String CONTENT_TYPE = "text/x-json";
- /**
- * {@inheritDoc}
- */
- public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception
- {
- if (request.getParameter(METHOD) != null)
- {
- String methodRequest = request.getParameter(METHOD);
- Method[] methods = this.getServiceInterface().getMethods();
- for (Method method : methods)
- {
- if (method.getName().equals(methodRequest))
- {
- Class[] types = method.getParameterTypes();
- Object[] values = new Object[types.length];
- if (values.length > 0)
- {
- int i = 0;
- Enumeration<String> names = request.getParameterNames();
- while (names.hasMoreElements())
- {
- String name = names.nextElement();
- if (name != null && name.startsWith(PARAM_PREFIX))
- {
- String posStr = StringUtils.substringAfter(name, PARAM_PREFIX);
- int pos = NumberUtils.toInt(posStr);
+ /**
+ * {@inheritDoc}
+ */
+ public ModelAndView handleRequest(HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ if (request.getParameter(METHOD) != null) {
+ String methodRequest = request.getParameter(METHOD);
+ Method[] methods = this.getServiceInterface().getMethods();
+ for (Method method : methods) {
+ if (method.getName().equals(methodRequest)) {
+ Class[] types = method.getParameterTypes();
+ Object[] values = new Object[types.length];
+ if (values.length > 0) {
+ int i = 0;
+ Enumeration<String> names = request.getParameterNames();
+ while (names.hasMoreElements()) {
+ String name = names.nextElement();
+ if (name != null && name.startsWith(PARAM_PREFIX)) {
+ String posStr = StringUtils.substringAfter(
+ name, PARAM_PREFIX);
+ int pos = NumberUtils.toInt(posStr);
- String[] reqValues = request.getParameterValues(name);
- if (reqValues != null && reqValues.length > 0)
- {
- if (types[pos].isArray())
- {
- values[pos] = ConvertUtils.convert(reqValues, types[pos]);
- }
- else
- {
- values[pos] = ConvertUtils.convert(reqValues[0], types[pos]);
- }
- }
- else
- {
- values[pos] = null;
- }
+ String[] reqValues = request
+ .getParameterValues(name);
+ if (reqValues != null && reqValues.length > 0) {
+ if (types[pos].isArray()) {
+ values[pos] = ConvertUtils.convert(
+ reqValues, types[pos]);
+ } else {
+ values[pos] = ConvertUtils.convert(
+ reqValues[0], types[pos]);
+ }
+ } else {
+ values[pos] = null;
+ }
- }
- }
- }
+ }
+ }
+ }
- RemoteInvocation invocation = new RemoteInvocation();
- invocation.setArguments(values);
- invocation.setParameterTypes(types);
- invocation.setMethodName(methodRequest);
+ RemoteInvocation invocation = new RemoteInvocation();
+ invocation.setArguments(values);
+ invocation.setParameterTypes(types);
+ invocation.setMethodName(methodRequest);
- RemoteInvocationResult result = invokeAndCreateResult(invocation, this.getProxyForService());
+ RemoteInvocationResult result = invokeAndCreateResult(
+ invocation, this.getProxyForService());
- JSONObject obj = null;
- if (result.hasException())
- {
- obj = JSONObject.fromBean(result.getException());
- obj.put("exception", true);
- }
- else
- {
- obj = JSONObject.fromBean(result.getValue());
- obj.put("exception", false);
- }
+ response.setContentType(CONTENT_TYPE);
+ JSON json;
+ if (result.hasException()) {
+ JSONObject obj = JSONObject.fromBean(result
+ .getException());
+ obj.put("exception", true);
- response.setContentType(CONTENT_TYPE);
- obj.write(response.getWriter());
+ json = obj;
+ } else {
+ Object value = cleanLazy(result.getValue());
+ if (value != null) {
+ if (ClassUtils.getAllInterfaces(value.getClass())
+ .contains(Collection.class)) {
+ json = JSONArray
+ .fromCollection((Collection) value);
+ } else if (ClassUtils.getAllInterfaces(
+ value.getClass()).contains(Map.class)) {
+ json = JSONObject.fromMap((Map) value);
+ } else if (value.getClass().isArray()) {
+ json = JSONArray.fromArray((Object[]) value);
+ } else {
+ JSONObject obj = JSONObject.fromBean(value);
+ json = obj;
+ }
+ } else {
+ json = JSONNull.getInstance();
+ }
+ }
+ json.write(response.getWriter());
- break;
- }
- }
+ break;
+ }
+ }
- }
- return null;
- }
+ }
+ return null;
+ }
+
+ public Object cleanLazy(Object bean) throws IllegalAccessException,
+ InstantiationException, IntrospectionException,
+ InvocationTargetException {
+ if (bean == null) {
+ return null;
+ }
+ Class<?> clazz = bean.getClass();
+ if (bean instanceof Collection) {
+ Collection collection = (Collection) bean;
+
+ Collection newCollection;
+ newCollection = collection.getClass().newInstance();
+ for (Object myObject : collection) {
+ newCollection.add(cleanLazy(myObject));
+ }
+ collection.clear();
+ collection.addAll(newCollection);
+ }
+ if (bean instanceof Map) {
+ Map<Object, Object> map = (Map<Object, Object>) bean;
+ Map<Object, Object> newMap = map.getClass().newInstance();
+ for (Map.Entry entry : map.entrySet()) {
+ Object key = cleanLazy(entry.getKey());
+ Object value = cleanLazy(entry.getValue());
+ newMap.put(key, value);
+ }
+ map.clear();
+ map.putAll(newMap);
+ }
+ if (clazz.isArray()) {
+ Object[] array = (Object[]) bean;
+ for (int i = 0; i < array.length; i++) {
+ array[i] = cleanLazy(array[i]);
+ }
+ }
+ boolean isHibernate = !clazz.equals(Hibernate.getClass(bean));
+ if (isHibernate) {
+ Class<?> noProxyClass = Hibernate.getClass(bean);
+ Object noHibernateBean = noProxyClass.newInstance();
+ BeanInfo info = Introspector.getBeanInfo(noProxyClass);
+ PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
+ for (PropertyDescriptor descriptor : descriptors) {
+ String name = descriptor.getName();
+
+ if ("class".equals(name)) {
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { null });
+ continue;
+ }
+
+ if ("hibernateLazyInitializer".equals(name)) {
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { null });
+ continue;
+ }
+
+ if (descriptor.getReadMethod() == null
+ || descriptor.getWriteMethod() == null) {
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { null });
+ continue;
+ }
+
+ Method method = findGetter(bean, name);
+
+ if (method == null) {
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { null });
+ continue;
+ }
+
+ if (!Hibernate.isPropertyInitialized(bean, name)) {
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { null });
+ continue;
+ }
+
+ // This might be a lazy-collection so we need to double check
+ Object retval = method.invoke(bean);
+ if (!Hibernate.isInitialized(retval)) {
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { null });
+ continue;
+ }
+ descriptor.getWriteMethod().invoke(noHibernateBean,
+ new Object[] { cleanLazy(bean) });
+
+ }
+
+ bean = noHibernateBean;
+ } else {
+ BeanInfo info = Introspector.getBeanInfo(clazz);
+ PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
+ for (PropertyDescriptor descriptor : descriptors) {
+ Object value = descriptor.getReadMethod().invoke(bean, null);
+ descriptor.getWriteMethod().invoke(bean,
+ new Object[] { cleanLazy(bean) });
+ }
+ }
+ return bean;
+ }
+
+ protected Method findGetter(Object bean, String name)
+ throws IntrospectionException {
+ Class<?> clazz = Hibernate.getClass(bean);
+ // String key = clazz.getName() + ":" + property;
+
+ Method method = null; // methods.get(key);
+ // if (method == null)
+ // {
+ PropertyDescriptor[] props = Introspector.getBeanInfo(clazz)
+ .getPropertyDescriptors();
+ for (PropertyDescriptor prop : props) {
+ if (prop.getName().equalsIgnoreCase(name)) {
+ method = prop.getReadMethod();
+ }
+ }
+
+ // methods.put(key, method);
+ // }
+
+ return method;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2007-11-05 16:48:34
|
Revision: 495
http://openutils.svn.sourceforge.net/openutils/?rev=495&view=rev
Author: molaschi
Date: 2007-11-05 08:39:12 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-spring/pom.xml
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2007-11-05 16:39:02 UTC (rev 494)
+++ trunk/openutils-spring/pom.xml 2007-11-05 16:39:12 UTC (rev 495)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring</artifactId>
<name>openutils spring tools</name>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<description />
<properties>
<spring.version>2.0.6</spring.version>
@@ -97,10 +97,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.3</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.3</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-31 18:00:34
|
Revision: 491
http://openutils.svn.sourceforge.net/openutils/?rev=491&view=rev
Author: fcarone
Date: 2007-10-31 11:00:39 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-31 18:00:30 UTC (rev 490)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-31 18:00:39 UTC (rev 491)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
<name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<properties>
<spring.version>2.0.6</spring.version>
@@ -119,10 +119,4 @@
<version>2.2.3</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.3</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.3</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-31 18:00:26
|
Revision: 490
http://openutils.svn.sourceforge.net/openutils/?rev=490&view=rev
Author: fcarone
Date: 2007-10-31 11:00:30 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-spring-rmibernate-1.0.3
Added Paths:
-----------
tags/openutils-spring-rmibernate-1.0.3/
tags/openutils-spring-rmibernate-1.0.3/pom.xml
tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
Removed Paths:
-------------
tags/openutils-spring-rmibernate-1.0.3/pom.xml
tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
Copied: tags/openutils-spring-rmibernate-1.0.3 (from rev 487, trunk/openutils-spring-rmibernate)
Deleted: tags/openutils-spring-rmibernate-1.0.3/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-31 11:05:02 UTC (rev 487)
+++ tags/openutils-spring-rmibernate-1.0.3/pom.xml 2007-10-31 18:00:30 UTC (rev 490)
@@ -1,122 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring-rmibernate</artifactId>
- <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.3-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <!-- replaces commons-logging -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.ga</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-spring-rmibernate-1.0.3/pom.xml (from rev 489, trunk/openutils-spring-rmibernate/pom.xml)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.3/pom.xml (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.3/pom.xml 2007-10-31 18:00:30 UTC (rev 490)
@@ -0,0 +1,128 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring-rmibernate</artifactId>
+ <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <version>1.0.3</version>
+ <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.3</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-31 11:05:02 UTC (rev 487)
+++ tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-31 18:00:30 UTC (rev 490)
@@ -1,374 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
-import it.openutils.spring.rmibernate.shared.LazyReference;
-import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-import net.sf.cglib.proxy.NoOp;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.collections.SetUtils;
-import org.apache.commons.collections.Transformer;
-import org.hibernate.EntityMode;
-import org.hibernate.SessionFactory;
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.collection.PersistentSet;
-import org.hibernate.proxy.HibernateProxy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.ReflectionUtils;
-
-
-/**
- * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
- * @author mmolaschi
- * @version $Id$
- */
-public class SerializationInterceptor implements MethodInterceptor
-{
-
- private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
-
- private static ThreadLocal<HibernateLazyService> hibernateLazyService = new ThreadLocal<HibernateLazyService>();
-
- private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
-
- /**
- * log
- */
- private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
-
- /**
- * non proxied object
- */
- private Object original;
-
- /**
- * hibernate sessionfactory
- */
- private SessionFactory sessionFactory;
-
- /**
- * Constructor
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- */
- private SerializationInterceptor(Object o, SessionFactory sessionFactory)
- {
- this.original = o;
- this.sessionFactory = sessionFactory;
- }
-
- /**
- * Cleans the processed beans cache
- */
- public static void clean()
- {
- processed.set(null);
- }
-
- /**
- * Get proxy object intercepting writeReplace calls
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- * @return proxied object
- */
- public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
- {
- return getEnhancedObject(o, sessionFactory, null);
- }
-
- /**
- * Get proxy object intercepting writeReplace calls
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- * @param lazyRef reference to a lazy field
- * @return proxied object
- */
- public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
- {
- if (o == null)
- {
- return null;
- }
-
- if (!(o instanceof HibernateProxy)
- && !(o instanceof PersistentSet)
- && processed.get() != null
- && processed.get().contains(o))
- {
- return o;
- }
-
- if (o.getClass().getName().startsWith("java.") && !((o instanceof Collection) || (o instanceof Map)))
- {
- return o;
- }
-
- // check if there is an empty constructor
- try
- {
- o.getClass().getConstructor(new Class[]{});
- }
- catch (NoSuchMethodException ex)
- {
- return o;
- }
-
- // check if object can be subclassed
- if (Modifier.isFinal(o.getClass().getModifiers()))
- {
- return o;
- }
-
- try
- {
- // get class
- Class clazz = o.getClass();
-
- // if it is an hibernateproxy get superclass
- if (o instanceof HibernateProxy)
- {
- clazz = o.getClass().getSuperclass();
- if (clazz == null)
- {
- clazz = o.getClass().getInterfaces()[0];
- }
- }
-
- Callback callback = null;
-
- // if this is a lazy field user lazyreferenceaspect
- if (lazyRef != null)
- {
- LazyReferenceAspect lra = new LazyReferenceAspect();
- lra.setLazyReference(lazyRef);
- callback = lra;
- }
- else
- {
- // user default interceptor
- callback = new SerializationInterceptor(o, sessionFactory);
- }
-
- synchronized (proxies)
- {
- if (proxies.containsKey(clazz))
- {
- Factory proxy = (Factory) proxies.get(clazz);
- return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
- }
- }
- // create proxy to listen on writeReplace method calls
- Object proxy = Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
- {
-
- public int accept(Method method)
- {
- if (method.getName().equals("writeReplace"))
- {
- return 0;
- }
- else
- {
- return 1;
- }
- }
-
- }, new Callback[]{callback, NoOp.INSTANCE });
-
- // store proxy
- proxies.put(clazz, ((Factory) proxy).newInstance(new Callback[]{
- EmptyMethodInterceptor.INSTANCE,
- NoOp.INSTANCE }));
- return proxy;
- }
- catch (Throwable t)
- {
- log.warn(t.getMessage(), t);
- return o;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
- {
- try
- {
- if (original == null)
- {
- return null;
- }
-
- if (original.getClass().getName().startsWith("java.")
- && !(original instanceof Collection)
- || (original instanceof Map))
- {
- return original;
- }
-
- if (processed.get() == null)
- {
- processed.set(new ArrayList<Object>());
- }
-
- // add to processed objects
- processed.get().add(original);
-
- if (original.getClass().isPrimitive())
- {
- log.debug("Non enhancing primitive type: {}", original.getClass().getName());
- return original;
- }
- else if (original.getClass().isArray())
- {
- // replace array entries with proxied ones
- Object[] array = (Object[]) original;
- for (int i = 0; i < array.length; i++)
- {
- array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
- }
- return array;
- }
- else if (original instanceof Set)
- {
- // replace set entries with proxied ones
- Set set = (Set) original;
- Set transformed = SetUtils.transformedSet(new HashSet(), transformer(sessionFactory));
- transformed.addAll(set);
- return transformed;
- }
- else if (original instanceof Collection)
- {
- // replace collection entries with proxied ones
- Collection collection = (Collection) original;
- CollectionUtils.transform(collection, transformer(sessionFactory));
- return collection;
- }
- else if (original instanceof Map)
- {
- // replace map entries with proxied ones
- Map map = (Map) original;
- Map transformed = MapUtils.transformedMap(new HashMap(), transformer(sessionFactory), transformer(sessionFactory));
- transformed.putAll(map);
- return transformed;
- }
- else
- {
- // cycle on bean fields
- ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
- {
-
- /**
- * {@inheritDoc}
- */
- public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
- {
- // set field accessible
- field.setAccessible(true);
-
- // get original value
- Object oldValue = field.get(original);
-
- // get new value
- Object newValue = null;
-
- if (oldValue instanceof HibernateProxy || oldValue instanceof PersistentCollection)
- {
- // if this field is a hibernate proxy or a persistent collection store reference
- LazyReference lazyRef = new LazyReference();
- lazyRef.setFieldClassName(field.getType().getName());
- lazyRef.setClassName(original.getClass().getName());
- lazyRef.setFieldName(field.getName());
- // load id
- lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(
- original,
- EntityMode.POJO));
-
- // get proxy for lazy
- newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory, lazyRef);
- }
- else
- {
- // get default proxy
- newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory);
- }
-
- // if there is a variation store it
- if (newValue != oldValue)
- {
- field.set(original, newValue);
- }
- }
-
- });
- }
-
- return original;
-
- }
- catch (Throwable t)
- {
- log.error(t.getMessage(), t);
- return original;
- }
- }
-
- /**
- * Get transformer for collection, map or set injection of proxied objects
- * @param factory hibernate session factory
- * @return transformer
- */
- private Transformer transformer(SessionFactory factory)
- {
- return new Transformer()
- {
-
- public Object transform(Object input)
- {
- return SerializationInterceptor.getEnhancedObject(input, sessionFactory);
- }
-
- };
- }
-
- /**
- * Sets the hibernateLazyService.
- * @param hibernateLazyService the hibernateLazyService to set
- */
- public static void setHibernateLazyService(HibernateLazyService hibernateLazyService)
- {
- SerializationInterceptor.hibernateLazyService.set(hibernateLazyService);
- }
-
- /**
- * Returns the hibernateLazyService.
- * @return the hibernateLazyService
- */
- public static HibernateLazyService getHibernateLazyService()
- {
- return hibernateLazyService.get();
- }
-}
Copied: tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (from rev 488, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.3/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-31 18:00:30 UTC (rev 490)
@@ -0,0 +1,413 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
+import it.openutils.spring.rmibernate.shared.LazyReference;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.CallbackFilter;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.Factory;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+import net.sf.cglib.proxy.NoOp;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections.SetUtils;
+import org.apache.commons.collections.Transformer;
+import org.hibernate.EntityMode;
+import org.hibernate.SessionFactory;
+import org.hibernate.collection.PersistentCollection;
+import org.hibernate.collection.PersistentSet;
+import org.hibernate.proxy.HibernateProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+
+/**
+ * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class SerializationInterceptor implements MethodInterceptor
+{
+
+ private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
+
+ private static ThreadLocal<HibernateLazyService> hibernateLazyService = new ThreadLocal<HibernateLazyService>();
+
+ private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
+
+ /**
+ * log
+ */
+ private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
+
+ /**
+ * non proxied object
+ */
+ private Object original;
+
+ /**
+ * hibernate sessionfactory
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * Constructor
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ */
+ private SerializationInterceptor(Object o, SessionFactory sessionFactory)
+ {
+ this.original = o;
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * Cleans the processed beans cache
+ */
+ public static void clean()
+ {
+ processed.set(null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
+ {
+ return getEnhancedObject(o, sessionFactory, null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @param lazyRef reference to a lazy field
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
+ {
+ if (o == null)
+ {
+ return null;
+ }
+
+ if (!(o instanceof HibernateProxy)
+ && !(o instanceof PersistentSet)
+ && processed.get() != null
+ && processed.get().contains(o))
+ {
+ return o;
+ }
+
+ if (o.getClass().getName().startsWith("java.") && !((o instanceof Collection) || (o instanceof Map)))
+ {
+ return o;
+ }
+
+ // check if there is an empty constructor
+ try
+ {
+ o.getClass().getConstructor(new Class[]{});
+ }
+ catch (NoSuchMethodException ex)
+ {
+ return o;
+ }
+
+ // check if object can be subclassed
+ if (Modifier.isFinal(o.getClass().getModifiers()))
+ {
+ return o;
+ }
+
+ try
+ {
+ // get class
+ Class clazz = o.getClass();
+
+ // if it is an hibernateproxy get superclass
+ if (o instanceof HibernateProxy)
+ {
+ clazz = o.getClass().getSuperclass();
+ if (clazz == null)
+ {
+ clazz = o.getClass().getInterfaces()[0];
+ }
+ }
+
+ Callback callback = null;
+
+ // if this is a lazy field user lazyreferenceaspect
+ if (lazyRef != null)
+ {
+ LazyReferenceAspect lra = new LazyReferenceAspect();
+ lra.setLazyReference(lazyRef);
+ callback = lra;
+ }
+ else
+ {
+ // user default interceptor
+ callback = new SerializationInterceptor(o, sessionFactory);
+ }
+
+ synchronized (proxies)
+ {
+ if (proxies.containsKey(clazz))
+ {
+ Factory proxy = (Factory) proxies.get(clazz);
+ return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
+ }
+ }
+ // create proxy to listen on writeReplace method calls
+ Object proxy = Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
+ {
+
+ public int accept(Method method)
+ {
+ if (method.getName().equals("writeReplace"))
+ {
+ return 0;
+ }
+ if (method.getName().equals("hashCode"))
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+
+ }, new Callback[]{callback, NoOp.INSTANCE });
+
+ // store proxy
+ proxies.put(clazz, ((Factory) proxy).newInstance(new Callback[]{
+ EmptyMethodInterceptor.INSTANCE,
+ NoOp.INSTANCE }));
+ return proxy;
+ }
+ catch (Throwable t)
+ {
+ log.warn(t.getMessage(), t);
+ return o;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ if (method.getName().equals("hashCode"))
+ {
+ return hashCode();
+ }
+ try
+ {
+ if (original == null)
+ {
+ return null;
+ }
+
+ if (original.getClass().getName().startsWith("java.")
+ && !(original instanceof Collection)
+ || (original instanceof Map))
+ {
+ return original;
+ }
+
+ if (processed.get() == null)
+ {
+ processed.set(new ArrayList<Object>());
+ }
+
+ // add to processed objects
+ processed.get().add(original);
+
+ if (original.getClass().isPrimitive())
+ {
+ log.debug("Non enhancing primitive type: {}", original.getClass().getName());
+ return original;
+ }
+ else if (original.getClass().isArray())
+ {
+ // replace array entries with proxied ones
+ Object[] array = (Object[]) original;
+ for (int i = 0; i < array.length; i++)
+ {
+ array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
+ }
+ return array;
+ }
+ else if (original instanceof Set)
+ {
+ // replace set entries with proxied ones
+ Set set = (Set) original;
+ Set transformed = SetUtils.transformedSet(new HashSet(), transformer(sessionFactory));
+ transformed.addAll(set);
+ Set result = new HashSet();
+ result.addAll(transformed);
+ return result;
+ }
+ else if (original instanceof List)
+ {
+ List list = (List) original;
+ List transformed = ListUtils.transformedList(new ArrayList(), transformer(sessionFactory));
+ transformed.addAll(list);
+ List result = new ArrayList();
+ result.addAll(transformed);
+ return result;
+ }
+ else if (original instanceof Collection)
+ {
+ // replace collection entries with proxied ones
+ Collection collection = (Collection) original;
+ CollectionUtils.transform(collection, transformer(sessionFactory));
+ return collection;
+ }
+ else if (original instanceof Map)
+ {
+ // replace map entries with proxied ones
+ Map map = (Map) original;
+ Map transformed = MapUtils.transformedMap(
+ new HashMap(),
+ transformer(sessionFactory),
+ transformer(sessionFactory));
+ transformed.putAll(map);
+ Map result = new HashMap();
+ result.putAll(transformed);
+ return result;
+ }
+ else
+ {
+ // cycle on bean fields
+ ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
+ {
+ // set field accessible
+ field.setAccessible(true);
+
+ // get original value
+ Object oldValue = field.get(original);
+
+ // get new value
+ Object newValue = null;
+
+ if (oldValue instanceof HibernateProxy || oldValue instanceof PersistentCollection)
+ {
+ // if this field is a hibernate proxy or a persistent collection store reference
+ LazyReference lazyRef = new LazyReference();
+ lazyRef.setFieldClassName(field.getType().getName());
+ lazyRef.setClassName(original.getClass().getName());
+ lazyRef.setFieldName(field.getName());
+ // load id
+ lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(
+ original,
+ EntityMode.POJO));
+
+ // get proxy for lazy
+ newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory, lazyRef);
+ }
+ else
+ {
+ // get default proxy
+ newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory);
+ }
+
+ // if there is a variation store it
+ if (newValue != oldValue)
+ {
+ field.set(original, newValue);
+ }
+ }
+
+ });
+ }
+
+ return original;
+
+ }
+ catch (Throwable t)
+ {
+ log.error(t.getMessage(), t);
+ return original;
+ }
+ }
+
+ /**
+ * Get transformer for collection, map or set injection of proxied objects
+ * @param factory hibernate session factory
+ * @return transformer
+ */
+ private Transformer transformer(SessionFactory factory)
+ {
+ return new Transformer()
+ {
+
+ public Object transform(Object input)
+ {
+ return SerializationInterceptor.getEnhancedObject(input, sessionFactory);
+ }
+
+ };
+ }
+
+ /**
+ * Sets the hibernateLazyService.
+ * @param hibernateLazyService the hibernateLazyService to set
+ */
+ public static void setHibernateLazyService(HibernateLazyService hibernateLazyService)
+ {
+ SerializationInterceptor.hibernateLazyService.set(hibernateLazyService);
+ }
+
+ /**
+ * Returns the hibernateLazyService.
+ * @return the hibernateLazyService
+ */
+ public static HibernateLazyService getHibernateLazyService()
+ {
+ return hibernateLazyService.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder(-469032761, 855711273)
+ .appendSuper(super.hashCode())
+ .append(this.original)
+ .toHashCode();
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-31 18:00:16
|
Revision: 489
http://openutils.svn.sourceforge.net/openutils/?rev=489&view=rev
Author: fcarone
Date: 2007-10-31 11:00:20 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-spring-rmibernate-1.0.3
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-31 17:58:48 UTC (rev 488)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-31 18:00:20 UTC (rev 489)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
<name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<properties>
<spring.version>2.0.6</spring.version>
@@ -119,4 +119,10 @@
<version>2.2.3</version>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.3</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 488
http://openutils.svn.sourceforge.net/openutils/?rev=488&view=rev
Author: fcarone
Date: 2007-10-31 10:58:48 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
- return a plain set/list/map instead of the transformed ones
- handle hashCode to avoid object annihilation in set and maps
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-31 11:05:02 UTC (rev 487)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-31 17:58:48 UTC (rev 488)
@@ -25,6 +25,7 @@
import net.sf.cglib.proxy.NoOp;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.collections.SetUtils;
import org.apache.commons.collections.Transformer;
@@ -36,6 +37,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.ReflectionUtils;
+import org.apache.commons.lang.builder.HashCodeBuilder;
/**
@@ -188,6 +190,10 @@
{
return 0;
}
+ if (method.getName().equals("hashCode"))
+ {
+ return 0;
+ }
else
{
return 1;
@@ -215,6 +221,10 @@
@SuppressWarnings("unchecked")
public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
{
+ if (method.getName().equals("hashCode"))
+ {
+ return hashCode();
+ }
try
{
if (original == null)
@@ -258,8 +268,19 @@
Set set = (Set) original;
Set transformed = SetUtils.transformedSet(new HashSet(), transformer(sessionFactory));
transformed.addAll(set);
- return transformed;
+ Set result = new HashSet();
+ result.addAll(transformed);
+ return result;
}
+ else if (original instanceof List)
+ {
+ List list = (List) original;
+ List transformed = ListUtils.transformedList(new ArrayList(), transformer(sessionFactory));
+ transformed.addAll(list);
+ List result = new ArrayList();
+ result.addAll(transformed);
+ return result;
+ }
else if (original instanceof Collection)
{
// replace collection entries with proxied ones
@@ -271,9 +292,14 @@
{
// replace map entries with proxied ones
Map map = (Map) original;
- Map transformed = MapUtils.transformedMap(new HashMap(), transformer(sessionFactory), transformer(sessionFactory));
+ Map transformed = MapUtils.transformedMap(
+ new HashMap(),
+ transformer(sessionFactory),
+ transformer(sessionFactory));
transformed.putAll(map);
- return transformed;
+ Map result = new HashMap();
+ result.putAll(transformed);
+ return result;
}
else
{
@@ -371,4 +397,17 @@
{
return hibernateLazyService.get();
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder(-469032761, 855711273)
+ .appendSuper(super.hashCode())
+ .append(this.original)
+ .toHashCode();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2007-10-31 11:05:07
|
Revision: 487
http://openutils.svn.sourceforge.net/openutils/?rev=487&view=rev
Author: molaschi
Date: 2007-10-31 04:05:02 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
bug on Set and Map transformation for Enhancer injection
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-26 11:06:59 UTC (rev 486)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-31 11:05:02 UTC (rev 487)
@@ -11,6 +11,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -255,8 +256,9 @@
{
// replace set entries with proxied ones
Set set = (Set) original;
- SetUtils.transformedSet(set, transformer(sessionFactory));
- return set;
+ Set transformed = SetUtils.transformedSet(new HashSet(), transformer(sessionFactory));
+ transformed.addAll(set);
+ return transformed;
}
else if (original instanceof Collection)
{
@@ -269,8 +271,9 @@
{
// replace map entries with proxied ones
Map map = (Map) original;
- MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
- return map;
+ Map transformed = MapUtils.transformedMap(new HashMap(), transformer(sessionFactory), transformer(sessionFactory));
+ transformed.putAll(map);
+ return transformed;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-26 11:06:55
|
Revision: 486
http://openutils.svn.sourceforge.net/openutils/?rev=486&view=rev
Author: fcarone
Date: 2007-10-26 04:06:59 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-26 11:06:52 UTC (rev 485)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-26 11:06:59 UTC (rev 486)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
<name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<properties>
<spring.version>2.0.6</spring.version>
@@ -119,10 +119,4 @@
<version>2.2.3</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.2</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-26 11:06:48
|
Revision: 485
http://openutils.svn.sourceforge.net/openutils/?rev=485&view=rev
Author: fcarone
Date: 2007-10-26 04:06:52 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-spring-rmibernate-1.0.2
Added Paths:
-----------
tags/openutils-spring-rmibernate-1.0.2/
tags/openutils-spring-rmibernate-1.0.2/pom.xml
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/shared/HibernateLazyLoaderCallbackFilter.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
Removed Paths:
-------------
tags/openutils-spring-rmibernate-1.0.2/pom.xml
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
Copied: tags/openutils-spring-rmibernate-1.0.2 (from rev 475, trunk/openutils-spring-rmibernate)
Deleted: tags/openutils-spring-rmibernate-1.0.2/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/pom.xml 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,122 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring-rmibernate</artifactId>
- <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.1-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <!-- replaces commons-logging -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.ga</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-spring-rmibernate-1.0.2/pom.xml (from rev 484, trunk/openutils-spring-rmibernate/pom.xml)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/pom.xml (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/pom.xml 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,128 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring-rmibernate</artifactId>
+ <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <version>1.0.2</version>
+ <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.2</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,54 +0,0 @@
-package it.openutils.spring.rmibernate.client;
-
-import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
-
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.remoting.rmi.RmiProxyFactoryBean;
-
-
-/**
- * ProxyFactoryBean for automatic injection of remote lazy loading proxies
- * @author mmolaschi
- * @version $Id: $
- */
-public class HibernateRmiProxyFactoryBean extends RmiProxyFactoryBean
-{
-
- /**
- * Store the hibernate lazy service to be used by remote lazy loading
- */
- public static ThreadLocal<HibernateLazyService> hibernateLazyServiceTL = new ThreadLocal<HibernateLazyService>();
-
- private HibernateLazyService hibernateLazyService;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Object invoke(MethodInvocation invocation) throws Throwable
- {
- // store the lazy service for this thread
- if (hibernateLazyService == null)
- {
- // if hibernateLazyService is null this means that this service IS hibernateLazyService
- hibernateLazyServiceTL.set((HibernateLazyService)this.getObject());
- }
- else
- {
- hibernateLazyServiceTL.set(hibernateLazyService);
- }
-
- // proceed with rmi call
- return super.invoke(invocation);
- }
-
- /**
- * Sets the hibernateLazyService.
- * @param hibernateLazyService the hibernateLazyService to set
- */
- public void setHibernateLazyService(HibernateLazyService hibernateLazyService)
- {
- this.hibernateLazyService = hibernateLazyService;
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,59 @@
+package it.openutils.spring.rmibernate.client;
+
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.remoting.rmi.RmiProxyFactoryBean;
+
+
+/**
+ * ProxyFactoryBean for automatic injection of remote lazy loading proxies
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class HibernateRmiProxyFactoryBean extends RmiProxyFactoryBean
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6545259150454309616L;
+
+ /**
+ * Store the hibernate lazy service to be used by remote lazy loading
+ */
+ public static ThreadLocal<HibernateLazyService> hibernateLazyServiceTL = new ThreadLocal<HibernateLazyService>();
+
+ private HibernateLazyService hibernateLazyService;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object invoke(MethodInvocation invocation) throws Throwable
+ {
+ // store the lazy service for this thread
+ if (hibernateLazyService == null)
+ {
+ // if hibernateLazyService is null this means that this service IS hibernateLazyService
+ hibernateLazyServiceTL.set((HibernateLazyService)this.getObject());
+ }
+ else
+ {
+ hibernateLazyServiceTL.set(hibernateLazyService);
+ }
+
+ // proceed with rmi call
+ return super.invoke(invocation);
+ }
+
+ /**
+ * Sets the hibernateLazyService.
+ * @param hibernateLazyService the hibernateLazyService to set
+ */
+ public void setHibernateLazyService(HibernateLazyService hibernateLazyService)
+ {
+ this.hibernateLazyService = hibernateLazyService;
+ }
+
+}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.spring.rmibernate.client.aspects;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class ClientSerializationInterceptor implements MethodInterceptor, Serializable
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2694751376173790718L;
+
+ private HibernateLazyLoaderAspect hibernateLazyLoaderAspect;
+
+ /**
+ * @param hlla
+ */
+ public ClientSerializationInterceptor(HibernateLazyLoaderAspect hibernateLazyLoaderAspect)
+ {
+ this.hibernateLazyLoaderAspect = hibernateLazyLoaderAspect;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ return hibernateLazyLoaderAspect.loadObject();
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,75 +0,0 @@
-package it.openutils.spring.rmibernate.client.aspects;
-
-import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
-import it.openutils.spring.rmibernate.client.pagination.Paginator;
-import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
-
-import java.io.Serializable;
-
-import net.sf.cglib.proxy.LazyLoader;
-
-
-/**
- * Aspect that does remote lazy loading on cglib proxy
- * @author mmolaschi
- * @version $Id: $
- */
-public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
-{
-
- private static ThreadLocal<Paginator> paginator = new ThreadLocal<Paginator>();
-
- private String className;
-
- private String fieldName;
-
- private Serializable id;
-
- /**
- * Constructor
- * @param className parent class name
- * @param fieldName field to be lazy loaded
- * @param id id of current entity
- */
- public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id)
- {
- this.className = className;
- this.fieldName = fieldName;
- this.id = id;
- }
-
- /**
- * Set pagination for next calls in current thread
- * @param from starting row number
- * @param size max number of rows
- */
- public static void setPagination(int from, int size)
- {
- paginator.set(new Paginator(from, size));
- }
-
- /**
- * Disable pagination for next calls in current thread
- */
- public static void resetPagination()
- {
- paginator.set(null);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object loadObject() throws Exception
- {
- // Load from remote
- HibernateLazyService hls = HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get();
-
- if (paginator.get() != null)
- {
- return hls.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
- }
-
- return hls.invoke(className, fieldName, id);
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,86 @@
+package it.openutils.spring.rmibernate.client.aspects;
+
+import it.openutils.spring.rmibernate.client.pagination.Paginator;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.io.Serializable;
+
+import net.sf.cglib.proxy.LazyLoader;
+
+
+/**
+ * Aspect that does remote lazy loading on cglib proxy
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
+{
+
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = -365731708075101363L;
+
+ private static ThreadLocal<Paginator> paginator = new ThreadLocal<Paginator>();
+
+ private String className;
+
+ private String fieldName;
+
+ private Serializable id;
+
+ private Object localReference;
+
+ private HibernateLazyService hibernateLazyService;
+
+ /**
+ * Constructor
+ * @param className parent class name
+ * @param fieldName field to be lazy loaded
+ * @param id id of current entity
+ */
+ public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id, HibernateLazyService hibernateLazyService)
+ {
+ this.className = className;
+ this.fieldName = fieldName;
+ this.id = id;
+ this.hibernateLazyService = hibernateLazyService;
+ }
+
+ /**
+ * Set pagination for next calls in current thread
+ * @param from starting row number
+ * @param size max number of rows
+ */
+ public static void setPagination(int from, int size)
+ {
+ paginator.set(new Paginator(from, size));
+ }
+
+ /**
+ * Disable pagination for next calls in current thread
+ */
+ public static void resetPagination()
+ {
+ paginator.set(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object loadObject() throws Exception
+ {
+ // @todo handle localreference with paginator
+ // Load from remote
+ if (paginator.get() != null)
+ {
+ return hibernateLazyService.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
+ }
+ if (localReference == null)
+ {
+ localReference = hibernateLazyService.invoke(className, fieldName, id);
+ }
+ return localReference;
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,68 +0,0 @@
-package it.openutils.spring.rmibernate.client.pagination;
-
-/**
- * @author mmolaschi
- * @version $Id: $
- */
-public class Paginator
-{
-
- private int from;
-
- private int size;
-
- /**
- *
- */
- public Paginator()
- {
-
- }
-
- /**
- * @param from starting row number
- * @param size max rows
- */
- public Paginator(int from, int size)
- {
- this.from = from;
- this.size = size;
- }
-
- /**
- * Get starting row number
- * @return starting row number
- */
- public int getFrom()
- {
- return from;
- }
-
- /**
- * Set starting row number
- * @param from starting row number
- */
- public void setFrom(int from)
- {
- this.from = from;
- }
-
- /**
- * Get max number of rows
- * @return max number of rows
- */
- public int getSize()
- {
- return size;
- }
-
- /**
- * Set max number of rows
- * @param size max number of rows
- */
- public void setSize(int size)
- {
- this.size = size;
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,68 @@
+package it.openutils.spring.rmibernate.client.pagination;
+
+/**
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class Paginator
+{
+
+ private int from;
+
+ private int size;
+
+ /**
+ *
+ */
+ public Paginator()
+ {
+
+ }
+
+ /**
+ * @param from starting row number
+ * @param size max rows
+ */
+ public Paginator(int from, int size)
+ {
+ this.from = from;
+ this.size = size;
+ }
+
+ /**
+ * Get starting row number
+ * @return starting row number
+ */
+ public int getFrom()
+ {
+ return from;
+ }
+
+ /**
+ * Set starting row number
+ * @param from starting row number
+ */
+ public void setFrom(int from)
+ {
+ this.from = from;
+ }
+
+ /**
+ * Get max number of rows
+ * @return max number of rows
+ */
+ public int getSize()
+ {
+ return size;
+ }
+
+ /**
+ * Set max number of rows
+ * @param size max number of rows
+ */
+ public void setSize(int size)
+ {
+ this.size = size;
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,27 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import java.lang.reflect.Method;
-
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-
-/**
- * @author mmolaschi
- * @version $Id: $
- */
-public class EmptyMethodInterceptor implements MethodInterceptor
-{
-
- public static final MethodInterceptor INSTANCE = new EmptyMethodInterceptor();
-
- /**
- * {@inheritDoc}
- */
- public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
- {
- // TODO Auto-generated method stub
- return proxy.invokeSuper(obj, args);
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,27 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+
+/**
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class EmptyMethodInterceptor implements MethodInterceptor
+{
+
+ public static final MethodInterceptor INSTANCE = new EmptyMethodInterceptor();
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ // TODO Auto-generated method stub
+ return proxy.invokeSuper(obj, args);
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,58 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.hibernate.SessionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Main server interceptor on rmi calls
- * @author mmolaschi
- * @version $Id: $
- */
-public class HibernateLazyRmiInterceptor implements MethodInterceptor
-{
-
- /**
- * log
- */
- protected static final Logger logger = LoggerFactory.getLogger(HibernateLazyRmiInterceptor.class);
-
- private SessionFactory sessionFactory;
-
- /**
- * Contructor
- * @param sessionFactory hibernate session factory
- */
- public HibernateLazyRmiInterceptor(SessionFactory sessionFactory)
- {
- this.sessionFactory = sessionFactory;
- }
-
- /**
- * {@inheritDoc}
- */
- public Object invoke(MethodInvocation invocation) throws Throwable
- {
- try
- {
- Object retVal = invocation.proceed();
-
- SerializationInterceptor.clean();
- // Proxy class for serialization work
- return SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
- }
- catch (Throwable ex)
- {
- if (logger.isInfoEnabled())
- {
- logger.info("Processing of " + " remote call resulted in exception: ", ex);
- }
-
- throw ex;
- }
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,61 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.hibernate.SessionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Main server interceptor on rmi calls
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class HibernateLazyRmiInterceptor implements MethodInterceptor
+{
+
+ /**
+ * log
+ */
+ protected static final Logger logger = LoggerFactory.getLogger(HibernateLazyRmiInterceptor.class);
+
+ private SessionFactory sessionFactory;
+
+ /**
+ * Contructor
+ * @param sessionFactory hibernate session factory
+ */
+ public HibernateLazyRmiInterceptor(SessionFactory sessionFactory)
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object invoke(MethodInvocation invocation) throws Throwable
+ {
+ logger.debug("Catched invocation: {}", invocation);
+ try
+ {
+ Object retVal = invocation.proceed();
+
+ SerializationInterceptor.clean();
+ // Proxy class for serialization work
+ Object result = SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
+ logger.debug("Returning enhanced object {}", result);
+ return result;
+ }
+ catch (Throwable ex)
+ {
+ if (logger.isInfoEnabled())
+ {
+ logger.info("Processing of " + " remote call resulted in exception: ", ex);
+ }
+
+ throw ex;
+ }
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,40 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import it.openutils.spring.rmibernate.shared.LazyReference;
-
-import java.lang.reflect.Method;
-
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-
-/**
- * Aspect on lazy fields to intercept writeReplace
- * @author mmolaschi
- * @version $Id: $
- */
-public class LazyReferenceAspect implements MethodInterceptor
-{
-
- private LazyReference lazyReference;
-
- public LazyReference getLazyReference()
- {
- return lazyReference;
- }
-
- public void setLazyReference(LazyReference lazyReference)
- {
- this.lazyReference = lazyReference;
- }
-
- /**
- * {@inheritDoc}
- */
- public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
- {
- // TODO Auto-generated method stub
- return lazyReference;
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java (from rev 481, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,39 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.shared.LazyReference;
+
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+
+/**
+ * Aspect on lazy fields to intercept writeReplace
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class LazyReferenceAspect implements MethodInterceptor
+{
+
+ private LazyReference lazyReference;
+
+ public LazyReference getLazyReference()
+ {
+ return lazyReference;
+ }
+
+ public void setLazyReference(LazyReference lazyReference)
+ {
+ this.lazyReference = lazyReference;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ return lazyReference;
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -1,334 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
-import it.openutils.spring.rmibernate.shared.LazyReference;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-import net.sf.cglib.proxy.NoOp;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.collections.SetUtils;
-import org.apache.commons.collections.Transformer;
-import org.hibernate.EntityMode;
-import org.hibernate.SessionFactory;
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.collection.PersistentSet;
-import org.hibernate.proxy.HibernateProxy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.ReflectionUtils;
-
-
-/**
- * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
- * @author mmolaschi
- * @version $Id: $
- */
-public class SerializationInterceptor implements MethodInterceptor
-{
-
- private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
-
- private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
-
- /**
- * log
- */
- private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
-
- /**
- * non proxied object
- */
- private Object original;
-
- /**
- * hibernate sessionfactory
- */
- private SessionFactory sessionFactory;
-
- /**
- * Constructor
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- */
- private SerializationInterceptor(Object o, SessionFactory sessionFactory)
- {
- this.original = o;
- this.sessionFactory = sessionFactory;
- }
-
- public static void clean()
- {
- processed.set(null);
- }
-
- /**
- * Get proxy object intercepting writeReplace calls
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- * @return proxied object
- */
- public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
- {
- return getEnhancedObject(o, sessionFactory, null);
- }
-
- /**
- * Get proxy object intercepting writeReplace calls
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- * @param lazyRef reference to a lazy field
- * @return proxied object
- */
- public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
- {
- if (o == null)
- {
- return null;
- }
-
- if (!(o instanceof HibernateProxy)
- && !(o instanceof PersistentSet)
- && processed.get() != null
- && processed.get().contains(o))
- {
- return o;
- }
-
- // check if there is an empty constructor
- try
- {
- o.getClass().getConstructor(new Class[]{});
- }
- catch (NoSuchMethodException ex)
- {
- return o;
- }
-
- // check if object can be subclassed
- if (Modifier.isFinal(o.getClass().getModifiers()))
- {
- return o;
- }
-
- try
- {
- // get class
- Class clazz = o.getClass();
-
- // if it is an hibernateproxy get superclass
- if (o instanceof HibernateProxy)
- {
- clazz = o.getClass().getSuperclass();
- if (clazz == null)
- {
- clazz = o.getClass().getInterfaces()[0];
- }
- }
-
- Callback callback = null;
-
- // if this is a lazy field user lazyreferenceaspect
- if (lazyRef != null)
- {
- LazyReferenceAspect lra = new LazyReferenceAspect();
- lra.setLazyReference(lazyRef);
- callback = lra;
- }
- else
- {
- // user default interceptor
- callback = new SerializationInterceptor(o, sessionFactory);
- }
-
- synchronized (proxies)
- {
- if (proxies.containsKey(clazz))
- {
- Factory proxy = (Factory)proxies.get(clazz);
- return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
- }
- }
- // create proxy to listen on writeReplace method calls
- Object proxy = Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
- {
-
- public int accept(Method method)
- {
- if (method.getName().equals("writeReplace"))
- {
- return 0;
- }
- else
- {
- return 1;
- }
- }
-
- }, new Callback[]{callback, NoOp.INSTANCE });
-
- // store proxy
- proxies.put(clazz, ((Factory)proxy).newInstance(new Callback[]{EmptyMethodInterceptor.INSTANCE, NoOp.INSTANCE }));
- return proxy;
- }
- catch (Throwable t)
- {
- log.warn(t.getMessage(), t);
- return o;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
- {
-
- try
- {
- if (original == null)
- {
- return null;
- }
-
- if (processed.get() == null)
- {
- processed.set(new ArrayList<Object>());
- }
-
- // add to processed objects
- processed.get().add(original);
-
- if (original.getClass().isPrimitive())
- {
- return original;
- }
- else if (original.getClass().isArray())
- {
- // replace array entries with proxied ones
- Object[] array = (Object[]) original;
- for (int i = 0; i < array.length; i++)
- {
- array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
- }
- return array;
- }
- else if (original instanceof Collection)
- {
- // replace collection entries with proxied ones
- Collection collection = (Collection) original;
- CollectionUtils.transform(collection, transformer(sessionFactory));
- return collection;
- }
- else if (original instanceof Map)
- {
- // replace map entries with proxied ones
- Map map = (Map) original;
- MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
- return map;
- }
- else if (original instanceof Set)
- {
- // replace set entries with proxied ones
- Set set = (Set) original;
- SetUtils.transformedSet(set, transformer(sessionFactory));
- return set;
- }
- else
- {
- // cycle on bean fields
- ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
- {
-
- /**
- * {@inheritDoc}
- */
- public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
- {
- // set field accessible
- field.setAccessible(true);
-
- // get original value
- Object oldValue = field.get(original);
-
- // get new value
- Object newValue = null;
-
- if (oldValue instanceof HibernateProxy || oldValue instanceof PersistentCollection)
- {
- // if this field is a hibernate proxy or a persistent collection store reference
- LazyReference lazyRef = new LazyReference();
- lazyRef.setFieldClassName(field.getType().getName());
- lazyRef.setClassName(original.getClass().getName());
- lazyRef.setFieldName(field.getName());
- // load id
- lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(
- original,
- EntityMode.POJO));
-
- // get proxy for lazy
- newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory, lazyRef);
- }
- else
- {
- // get default proxy
- newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory);
- }
-
- // if there is a variation store it
- if (newValue != oldValue)
- {
- field.set(original, newValue);
- }
- }
-
- });
- }
-
- return original;
-
- }
- catch (Throwable t)
- {
- log.error(t.getMessage(), t);
- return original;
- }
- }
-
- /**
- * Get transformer for collection, map or set injection of proxied objects
- * @param factory hibernate session factory
- * @return transformer
- */
- private Transformer transformer(SessionFactory factory)
- {
- return new Transformer()
- {
-
- public Object transform(Object input)
- {
- return SerializationInterceptor.getEnhancedObject(input, sessionFactory);
- }
-
- };
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (from rev 483, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.2/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-26 11:06:52 UTC (rev 485)
@@ -0,0 +1,371 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
+import it.openutils.spring.rmibernate.shared.LazyReference;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.CallbackFilter;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.Factory;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+import net.sf.cglib.proxy.NoOp;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections.SetUtils;
+import org.apache.commons.collections.Transformer;
+import org.hibernate.EntityMode;
+import org.hibernate.SessionFactory;
+import org.hibernate.collection.PersistentCollection;
+import org.hibernate.collection.PersistentSet;
+import org.hibernate.proxy.HibernateProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
+
+
+/**
+ * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class SerializationInterceptor implements MethodInterceptor
+{
+
+ private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
+
+ private static ThreadLocal<HibernateLazyService> hibernateLazyService = new ThreadLocal<HibernateLazyService>();
+
+ private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
+
+ /**
+ * log
+ */
+ private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
+
+ /**
+ * non proxied object
+ */
+ private Object original;
+
+ /**
+ * hibernate sessionfactory
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * Constructor
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ */
+ private SerializationInterceptor(Object o, SessionFactory sessionFactory)
+ {
+ this.original = o;
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * Cleans the processed beans cache
+ */
+ public static void clean()
+ {
+ processed.set(null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
+ {
+ return getEnhancedObject(o, sessionFactory, null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @param lazyRef reference to a lazy field
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
+ {
+ if (o == null)
+ {
+ return null;
+ }
+
+ if (!(o instanceof HibernateProxy)
+ && !(o instanceof PersistentSet)
+ && processed.get() != null
+ && processed.get().contains(o))
+ {
+ return o;
+ }
+
+ if (o.getClass().getName().startsWith("java.") && !((o instanceof Collection) || (o instanceof Map)))
+ {
+ return o;
+ }
+
+ // check if there is an empty constructor
+ try
+ {
+ o.getClass().getConstructor(new Class[]{});
+ }
+ catch (NoSuchMethodException ex)
+ {
+ return o;
+ }
+
+ // check if object can be subclassed
+ if (Modifier.isFinal(o.getClass().getModifiers()))
+ {
+ return o;
+ }
+
+ try
+ {
+ // get class
+ Class clazz = o.getClass();
+
+ // if it is an hibernateproxy get superclass
+ if (o instanceof HibernateProxy)
+ {
+ clazz = o.getClass().getSuperclass();
+ if (clazz == null)
+ {
+ clazz = o.getClass().getInterfaces()[0];
+ }
+ }
+
+ Callback callback = null;
+
+ // if this is a lazy field user lazyreferenceaspect
+ if (lazyRef != null)
+ {
+ LazyReferenceAspect lra = new LazyReferenceAspect();
+ lra.setLazyReference(lazyRef);
+ callback = lra;
+ }
+ else
+ {
+ // user default interceptor
+ callback = new SerializationInterceptor(o, sessionFactory);
+ }
+
+ synchronized (proxies)
+ {
+ if (proxies.containsKey(clazz))
+ {
+ Factory proxy = (Factory) proxies.get(clazz);
+ return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
+ }
+ }
+ // create proxy to listen on writeReplace method calls
+ Object proxy = Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
+ {
+
+ public int accept(Method method)
+ {
+ if (method.getName().equals("writeReplace"))
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+
+ }, new Callback[]{callback, NoOp.INSTANCE });
+
+ // store proxy
+ proxies.put(clazz, ((Factory) proxy).newInstance(new Callback[]{
+ EmptyMethodInterceptor.INSTANCE,
+ NoOp.INSTANCE }));
+ return proxy;
+ }
+ catch (Throwable t)
+ {
+ log.warn(t.getMessage(), t);
+ return o;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ try
+ {
+ if (original == null)
+ {
+ return null;
+ }
+
+ if (original.getClass().getName().startsWith("java.")
+ && !(original instanceof Collection)
+ || (original instanceof Map))
+ {
+ return original;
+ }
+
+ if (processed.get() == null)
+ {
+ processed.set(new ArrayList<Object>());
+ }
+
+ // add to processed objects
+ processed.get().add(original);
+
+ if (original.getClass().isPrimitive())
+ {
+ log.debug("Non enhancing primitive type: {}", original.getClass().getName());
+ return original;
+ }
+ else if (original.getClass().isArray())
+ {
+ // replace array entries with proxied ones
+ Object[] array = (Object[]) original;
+ for (int i = 0; i < array.length; i++)
+ {
+ array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
+ }
+ return array;
+ }
+ else if (original instanceof Set)
+ {
+ // replace set entries with proxied ones
+ Set set = (Set) original;
+ SetUtils.transformedSet(set, transformer(sessionFactory));
+ return set;
+ }
+ else if (original instanceof Collection)
+ {
+ // replace collection entries with proxied ones
+ Collection collection = (Collection) original;
+ CollectionUtils.transform(collection, transformer(sessionFactory));
+ return collection;
+ }
+ else if (original instanceof Map)
+ {
+ // replace map entries with proxied ones
+ Map map = (Map) original;
+ MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
+ return map;
+ }
+ else
+ {
+ // cycle on bean fields
+ ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
+ {
+ // set field accessible
+ field.setAccessible(true);
+
+ // get original value
+ Object oldValue = field.get(original);
+
+ // get new value
+ Object newValue = null;
+
+ if (oldValue instanceof HibernateProxy || oldValue instanceof PersistentCollection)
+ {
+ // if this field is a hibernate proxy or a persistent collection store reference
+ LazyReference lazyRef = new LazyReference();
+ lazyRef.setFieldClassName(field.getType().getName());
+ lazyRef.setClassName(original.getClass().getName());
+ lazyRef.setFieldName(field.getName());
+ // load id
+ lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(
+ original,
+ EntityMode.POJO));
+
+ // get proxy for lazy
+ newValue = SerializationInt...
[truncated message content] |
|
From: <fc...@us...> - 2007-10-26 11:06:37
|
Revision: 484
http://openutils.svn.sourceforge.net/openutils/?rev=484&view=rev
Author: fcarone
Date: 2007-10-26 04:06:27 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-spring-rmibernate-1.0.2
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-26 10:58:18 UTC (rev 483)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-26 11:06:27 UTC (rev 484)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
<name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<properties>
<spring.version>2.0.6</spring.version>
@@ -119,4 +119,10 @@
<version>2.2.3</version>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.2</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 483
http://openutils.svn.sourceforge.net/openutils/?rev=483&view=rev
Author: fcarone
Date: 2007-10-26 03:58:18 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
Fix order of instanceof in serializationinterceptor
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-26 08:56:04 UTC (rev 482)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-26 10:58:18 UTC (rev 483)
@@ -251,6 +251,13 @@
}
return array;
}
+ else if (original instanceof Set)
+ {
+ // replace set entries with proxied ones
+ Set set = (Set) original;
+ SetUtils.transformedSet(set, transformer(sessionFactory));
+ return set;
+ }
else if (original instanceof Collection)
{
// replace collection entries with proxied ones
@@ -265,13 +272,6 @@
MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
return map;
}
- else if (original instanceof Set)
- {
- // replace set entries with proxied ones
- Set set = (Set) original;
- SetUtils.transformedSet(set, transformer(sessionFactory));
- return set;
- }
else
{
// cycle on bean fields
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-26 08:56:07
|
Revision: 482
http://openutils.svn.sourceforge.net/openutils/?rev=482&view=rev
Author: fcarone
Date: 2007-10-26 01:56:04 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
IWriteReplace interface removed, duped by EntitySerializer
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
Removed Paths:
-------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java 2007-10-25 16:50:39 UTC (rev 481)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java 2007-10-26 08:56:04 UTC (rev 482)
@@ -28,6 +28,8 @@
import org.hibernate.collection.PersistentSortedMap;
import org.hibernate.collection.PersistentSortedSet;
import org.hibernate.proxy.HibernateProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.orm.hibernate3.HibernateCallback;
import org.springframework.orm.hibernate3.HibernateTemplate;
@@ -46,11 +48,17 @@
private SessionFactory sessionFactory;
/**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(HibernateLazyServiceImpl.class);
+
+ /**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
public Object invoke(final String className, final String methodName, final Serializable id) throws RemoteException
{
+ log.debug("Initializing lazy property.");
return invoke(className, methodName, id, true);
}
@@ -62,11 +70,11 @@
HibernateTemplate ht = new HibernateTemplate(sessionFactory);
return ht.execute(new HibernateCallback()
{
-
public Object doInHibernate(Session session) throws HibernateException, SQLException
{
try
{
+ log.debug("Loading class: {}, id {}, method {}", new Object[] {className, id, methodName});
Object entity = sessionFactory.getCurrentSession().load(Class.forName(className), id);
Object retVal = PropertyUtils.getProperty(entity, methodName);
if (init)
@@ -77,6 +85,7 @@
}
catch (Exception ex)
{
+ log.error("{}", ex);
throw new HibernateException(ex);
}
}
Deleted: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java 2007-10-25 16:50:39 UTC (rev 481)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java 2007-10-26 08:56:04 UTC (rev 482)
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.spring.rmibernate.shared;
-
-import java.io.ObjectStreamException;
-
-
-/**
- * @author fcarone
- * @version $Id: $
- * This interface is necessary to enable the callback on the CGLib Enhanced dataobject
- */
-public interface IWriteReplace
-{
- /**
- * @return The replaced object
- * @throws ObjectStreamException Unmarshalling exception
- */
- Object writeReplace() throws ObjectStreamException;
-}
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-25 16:50:39 UTC (rev 481)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-26 08:56:04 UTC (rev 482)
@@ -3,6 +3,7 @@
import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
import it.openutils.spring.rmibernate.client.aspects.ClientSerializationInterceptor;
import it.openutils.spring.rmibernate.client.aspects.HibernateLazyLoaderAspect;
+import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -71,7 +72,7 @@
// if superclass is an interface add it to interfaces
if (superclass.isInterface())
{
- interfaces = new Class[]{superclass, Serializable.class, IWriteReplace.class };
+ interfaces = new Class[]{superclass, Serializable.class, EntitySerializer.class };
}
HibernateLazyLoaderAspect hlla = new HibernateLazyLoaderAspect(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-25 16:50:37
|
Revision: 481
http://openutils.svn.sourceforge.net/openutils/?rev=481&view=rev
Author: fcarone
Date: 2007-10-25 09:50:39 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
It's now possible to send intercepted beans back to the server
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
Added Paths:
-----------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/HibernateLazyLoaderCallbackFilter.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java
Property Changed:
----------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -9,12 +9,17 @@
/**
* ProxyFactoryBean for automatic injection of remote lazy loading proxies
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class HibernateRmiProxyFactoryBean extends RmiProxyFactoryBean
{
/**
+ *
+ */
+ private static final long serialVersionUID = 6545259150454309616L;
+
+ /**
* Store the hibernate lazy service to be used by remote lazy loading
*/
public static ThreadLocal<HibernateLazyService> hibernateLazyServiceTL = new ThreadLocal<HibernateLazyService>();
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
___________________________________________________________________
Name: svn:keywords
+ Id
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/ClientSerializationInterceptor.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.spring.rmibernate.client.aspects;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class ClientSerializationInterceptor implements MethodInterceptor, Serializable
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2694751376173790718L;
+
+ private HibernateLazyLoaderAspect hibernateLazyLoaderAspect;
+
+ /**
+ * @param hlla
+ */
+ public ClientSerializationInterceptor(HibernateLazyLoaderAspect hibernateLazyLoaderAspect)
+ {
+ this.hibernateLazyLoaderAspect = hibernateLazyLoaderAspect;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ return hibernateLazyLoaderAspect.loadObject();
+ }
+
+}
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -1,6 +1,5 @@
package it.openutils.spring.rmibernate.client.aspects;
-import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
import it.openutils.spring.rmibernate.client.pagination.Paginator;
import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
@@ -12,7 +11,7 @@
/**
* Aspect that does remote lazy loading on cglib proxy
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -2,7 +2,7 @@
/**
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class Paginator
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -8,7 +8,7 @@
/**
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class EmptyMethodInterceptor implements MethodInterceptor
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/EmptyMethodInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -1,7 +1,5 @@
package it.openutils.spring.rmibernate.server.aspects;
-import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
-
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.hibernate.SessionFactory;
@@ -12,7 +10,7 @@
/**
* Main server interceptor on rmi calls
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class HibernateLazyRmiInterceptor implements MethodInterceptor
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -11,7 +11,7 @@
/**
* Aspect on lazy fields to intercept writeReplace
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class LazyReferenceAspect implements MethodInterceptor
{
@@ -33,7 +33,6 @@
*/
public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
{
- // TODO Auto-generated method stub
return lazyReference;
}
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -40,7 +40,7 @@
/**
* Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class SerializationInterceptor implements MethodInterceptor
{
@@ -118,13 +118,11 @@
return o;
}
- if (o.getClass().getName().startsWith("java.") &&
- !((o instanceof Collection) || (o instanceof Map)))
+ if (o.getClass().getName().startsWith("java.") && !((o instanceof Collection) || (o instanceof Map)))
{
return o;
}
-
// check if there is an empty constructor
try
{
@@ -223,8 +221,9 @@
return null;
}
- if (original.getClass().getName().startsWith("java.") &&
- !(original instanceof Collection) || (original instanceof Map))
+ if (original.getClass().getName().startsWith("java.")
+ && !(original instanceof Collection)
+ || (original instanceof Map))
{
return original;
}
@@ -279,8 +278,6 @@
ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
{
-
-
/**
* {@inheritDoc}
*/
@@ -354,7 +351,6 @@
};
}
-
/**
* Sets the hibernateLazyService.
* @param hibernateLazyService the hibernateLazyService to set
@@ -364,7 +360,6 @@
SerializationInterceptor.hibernateLazyService.set(hibernateLazyService);
}
-
/**
* Returns the hibernateLazyService.
* @return the hibernateLazyService
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -5,7 +5,7 @@
/**
* Interface for intercepting writeReplace method calls
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public interface EntitySerializer
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -12,7 +12,7 @@
/**
* Rmi exporter that checks laziness of bean fields in all object graph
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class HibernateRmiServiceExporter extends RmiServiceExporter
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -35,7 +35,7 @@
/**
* Server side implementation of remote lazy loading calls
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class HibernateLazyServiceImpl implements HibernateLazyService
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/HibernateLazyLoaderCallbackFilter.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/HibernateLazyLoaderCallbackFilter.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/HibernateLazyLoaderCallbackFilter.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.spring.rmibernate.shared;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import org.apache.commons.lang.StringUtils;
+
+import net.sf.cglib.proxy.CallbackFilter;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class HibernateLazyLoaderCallbackFilter implements CallbackFilter, Serializable
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3409438660731356981L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public int accept(Method method)
+ {
+ if (StringUtils.equals(method.getName(), "writeReplace"))
+ {
+ return 1;
+ }
+ return 0;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/IWriteReplace.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.spring.rmibernate.shared;
+
+import java.io.ObjectStreamException;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ * This interface is necessary to enable the callback on the CGLib Enhanced dataobject
+ */
+public interface IWriteReplace
+{
+ /**
+ * @return The replaced object
+ * @throws ObjectStreamException Unmarshalling exception
+ */
+ Object writeReplace() throws ObjectStreamException;
+}
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -1,18 +1,20 @@
package it.openutils.spring.rmibernate.shared;
import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
+import it.openutils.spring.rmibernate.client.aspects.ClientSerializationInterceptor;
import it.openutils.spring.rmibernate.client.aspects.HibernateLazyLoaderAspect;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import net.sf.cglib.proxy.Callback;
import net.sf.cglib.proxy.Enhancer;
/**
* Store lazy reference
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public class LazyReference implements Serializable
{
@@ -64,17 +66,24 @@
{
// get proxy superclass
Class superclass = Class.forName(fieldClassName);
- Class[] interfaces = null;
+ Class[] interfaces = new Class[]{Serializable.class };
+
// if superclass is an interface add it to interfaces
if (superclass.isInterface())
{
- interfaces = new Class[]{superclass};
+ interfaces = new Class[]{superclass, Serializable.class, IWriteReplace.class };
}
+
+ HibernateLazyLoaderAspect hlla = new HibernateLazyLoaderAspect(
+ className,
+ fieldName,
+ id,
+ HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get());
+
// return proxy
- return Enhancer.create(
- superclass,
- interfaces,
- new HibernateLazyLoaderAspect(className, fieldName, id, HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get()));
+ return Enhancer.create(superclass, interfaces, new HibernateLazyLoaderCallbackFilter(), new Callback[]{
+ hlla,
+ new ClientSerializationInterceptor(hlla) });
}
@@ -108,13 +117,11 @@
this.fieldName = fieldName;
}
-
public String getFieldClassName()
{
return fieldClassName;
}
-
public void setFieldClassName(String fieldClassName)
{
this.fieldClassName = fieldClassName;
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java 2007-10-24 17:09:54 UTC (rev 480)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java 2007-10-25 16:50:39 UTC (rev 481)
@@ -7,7 +7,7 @@
/**
* Interface for server-side remote lazy loading calls
* @author mmolaschi
- * @version $Id: $
+ * @version $Id$
*/
public interface HibernateLazyService
{
Property changes on: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
___________________________________________________________________
Name: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 480
http://openutils.svn.sourceforge.net/openutils/?rev=480&view=rev
Author: fcarone
Date: 2007-10-24 10:09:54 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Hold a local reference for the object returned by the server
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-22 17:15:37 UTC (rev 479)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-24 17:09:54 UTC (rev 480)
@@ -30,6 +30,8 @@
private Serializable id;
+ private Object localReference;
+
private HibernateLazyService hibernateLazyService;
/**
@@ -69,13 +71,17 @@
*/
public Object loadObject() throws Exception
{
+ // @todo handle localreference with paginator
// Load from remote
if (paginator.get() != null)
{
return hibernateLazyService.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
}
-
- return hibernateLazyService.invoke(className, fieldName, id);
+ if (localReference == null)
+ {
+ localReference = hibernateLazyService.invoke(className, fieldName, id);
+ }
+ return localReference;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-22 17:15:35
|
Revision: 479
http://openutils.svn.sourceforge.net/openutils/?rev=479&view=rev
Author: fcarone
Date: 2007-10-22 10:15:37 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-22 17:15:30 UTC (rev 478)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-22 17:15:37 UTC (rev 479)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
<name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<properties>
<spring.version>2.0.6</spring.version>
@@ -119,10 +119,4 @@
<version>2.2.3</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-22 17:15:25
|
Revision: 478
http://openutils.svn.sourceforge.net/openutils/?rev=478&view=rev
Author: fcarone
Date: 2007-10-22 10:15:30 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-spring-rmibernate-1.0.1
Added Paths:
-----------
tags/openutils-spring-rmibernate-1.0.1/
tags/openutils-spring-rmibernate-1.0.1/pom.xml
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
Removed Paths:
-------------
tags/openutils-spring-rmibernate-1.0.1/pom.xml
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
Copied: tags/openutils-spring-rmibernate-1.0.1 (from rev 475, trunk/openutils-spring-rmibernate)
Deleted: tags/openutils-spring-rmibernate-1.0.1/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.1/pom.xml 2007-10-22 17:15:30 UTC (rev 478)
@@ -1,122 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring-rmibernate</artifactId>
- <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.1-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <!-- replaces commons-logging -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.ga</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-spring-rmibernate-1.0.1/pom.xml (from rev 477, trunk/openutils-spring-rmibernate/pom.xml)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.1/pom.xml (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.1/pom.xml 2007-10-22 17:15:30 UTC (rev 478)
@@ -0,0 +1,128 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring-rmibernate</artifactId>
+ <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <version>1.0.1</version>
+ <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.1</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -1,75 +0,0 @@
-package it.openutils.spring.rmibernate.client.aspects;
-
-import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
-import it.openutils.spring.rmibernate.client.pagination.Paginator;
-import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
-
-import java.io.Serializable;
-
-import net.sf.cglib.proxy.LazyLoader;
-
-
-/**
- * Aspect that does remote lazy loading on cglib proxy
- * @author mmolaschi
- * @version $Id: $
- */
-public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
-{
-
- private static ThreadLocal<Paginator> paginator = new ThreadLocal<Paginator>();
-
- private String className;
-
- private String fieldName;
-
- private Serializable id;
-
- /**
- * Constructor
- * @param className parent class name
- * @param fieldName field to be lazy loaded
- * @param id id of current entity
- */
- public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id)
- {
- this.className = className;
- this.fieldName = fieldName;
- this.id = id;
- }
-
- /**
- * Set pagination for next calls in current thread
- * @param from starting row number
- * @param size max number of rows
- */
- public static void setPagination(int from, int size)
- {
- paginator.set(new Paginator(from, size));
- }
-
- /**
- * Disable pagination for next calls in current thread
- */
- public static void resetPagination()
- {
- paginator.set(null);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object loadObject() throws Exception
- {
- // Load from remote
- HibernateLazyService hls = HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get();
-
- if (paginator.get() != null)
- {
- return hls.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
- }
-
- return hls.invoke(className, fieldName, id);
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java (from rev 476, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -0,0 +1,81 @@
+package it.openutils.spring.rmibernate.client.aspects;
+
+import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
+import it.openutils.spring.rmibernate.client.pagination.Paginator;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.io.Serializable;
+
+import net.sf.cglib.proxy.LazyLoader;
+
+
+/**
+ * Aspect that does remote lazy loading on cglib proxy
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
+{
+
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = -365731708075101363L;
+
+ private static ThreadLocal<Paginator> paginator = new ThreadLocal<Paginator>();
+
+ private String className;
+
+ private String fieldName;
+
+ private Serializable id;
+
+ private HibernateLazyService hibernateLazyService;
+
+ /**
+ * Constructor
+ * @param className parent class name
+ * @param fieldName field to be lazy loaded
+ * @param id id of current entity
+ */
+ public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id, HibernateLazyService hibernateLazyService)
+ {
+ this.className = className;
+ this.fieldName = fieldName;
+ this.id = id;
+ this.hibernateLazyService = hibernateLazyService;
+ }
+
+ /**
+ * Set pagination for next calls in current thread
+ * @param from starting row number
+ * @param size max number of rows
+ */
+ public static void setPagination(int from, int size)
+ {
+ paginator.set(new Paginator(from, size));
+ }
+
+ /**
+ * Disable pagination for next calls in current thread
+ */
+ public static void resetPagination()
+ {
+ paginator.set(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object loadObject() throws Exception
+ {
+ // Load from remote
+ if (paginator.get() != null)
+ {
+ return hibernateLazyService.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
+ }
+
+ return hibernateLazyService.invoke(className, fieldName, id);
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -1,58 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.hibernate.SessionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Main server interceptor on rmi calls
- * @author mmolaschi
- * @version $Id: $
- */
-public class HibernateLazyRmiInterceptor implements MethodInterceptor
-{
-
- /**
- * log
- */
- protected static final Logger logger = LoggerFactory.getLogger(HibernateLazyRmiInterceptor.class);
-
- private SessionFactory sessionFactory;
-
- /**
- * Contructor
- * @param sessionFactory hibernate session factory
- */
- public HibernateLazyRmiInterceptor(SessionFactory sessionFactory)
- {
- this.sessionFactory = sessionFactory;
- }
-
- /**
- * {@inheritDoc}
- */
- public Object invoke(MethodInvocation invocation) throws Throwable
- {
- try
- {
- Object retVal = invocation.proceed();
-
- SerializationInterceptor.clean();
- // Proxy class for serialization work
- return SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
- }
- catch (Throwable ex)
- {
- if (logger.isInfoEnabled())
- {
- logger.info("Processing of " + " remote call resulted in exception: ", ex);
- }
-
- throw ex;
- }
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java (from rev 476, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -0,0 +1,63 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.hibernate.SessionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Main server interceptor on rmi calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateLazyRmiInterceptor implements MethodInterceptor
+{
+
+ /**
+ * log
+ */
+ protected static final Logger logger = LoggerFactory.getLogger(HibernateLazyRmiInterceptor.class);
+
+ private SessionFactory sessionFactory;
+
+ /**
+ * Contructor
+ * @param sessionFactory hibernate session factory
+ */
+ public HibernateLazyRmiInterceptor(SessionFactory sessionFactory)
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object invoke(MethodInvocation invocation) throws Throwable
+ {
+ logger.debug("Catched invocation: {}", invocation);
+ try
+ {
+ Object retVal = invocation.proceed();
+
+ SerializationInterceptor.clean();
+ // Proxy class for serialization work
+ Object result = SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
+ logger.debug("Returning enhanced object {}", result);
+ return result;
+ }
+ catch (Throwable ex)
+ {
+ if (logger.isInfoEnabled())
+ {
+ logger.info("Processing of " + " remote call resulted in exception: ", ex);
+ }
+
+ throw ex;
+ }
+ }
+
+}
Deleted: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -1,334 +0,0 @@
-package it.openutils.spring.rmibernate.server.aspects;
-
-import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
-import it.openutils.spring.rmibernate.shared.LazyReference;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-import net.sf.cglib.proxy.NoOp;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.collections.SetUtils;
-import org.apache.commons.collections.Transformer;
-import org.hibernate.EntityMode;
-import org.hibernate.SessionFactory;
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.collection.PersistentSet;
-import org.hibernate.proxy.HibernateProxy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.ReflectionUtils;
-
-
-/**
- * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
- * @author mmolaschi
- * @version $Id: $
- */
-public class SerializationInterceptor implements MethodInterceptor
-{
-
- private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
-
- private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
-
- /**
- * log
- */
- private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
-
- /**
- * non proxied object
- */
- private Object original;
-
- /**
- * hibernate sessionfactory
- */
- private SessionFactory sessionFactory;
-
- /**
- * Constructor
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- */
- private SerializationInterceptor(Object o, SessionFactory sessionFactory)
- {
- this.original = o;
- this.sessionFactory = sessionFactory;
- }
-
- public static void clean()
- {
- processed.set(null);
- }
-
- /**
- * Get proxy object intercepting writeReplace calls
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- * @return proxied object
- */
- public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
- {
- return getEnhancedObject(o, sessionFactory, null);
- }
-
- /**
- * Get proxy object intercepting writeReplace calls
- * @param o object to be proxied
- * @param sessionFactory hibernate sessionfactory
- * @param lazyRef reference to a lazy field
- * @return proxied object
- */
- public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
- {
- if (o == null)
- {
- return null;
- }
-
- if (!(o instanceof HibernateProxy)
- && !(o instanceof PersistentSet)
- && processed.get() != null
- && processed.get().contains(o))
- {
- return o;
- }
-
- // check if there is an empty constructor
- try
- {
- o.getClass().getConstructor(new Class[]{});
- }
- catch (NoSuchMethodException ex)
- {
- return o;
- }
-
- // check if object can be subclassed
- if (Modifier.isFinal(o.getClass().getModifiers()))
- {
- return o;
- }
-
- try
- {
- // get class
- Class clazz = o.getClass();
-
- // if it is an hibernateproxy get superclass
- if (o instanceof HibernateProxy)
- {
- clazz = o.getClass().getSuperclass();
- if (clazz == null)
- {
- clazz = o.getClass().getInterfaces()[0];
- }
- }
-
- Callback callback = null;
-
- // if this is a lazy field user lazyreferenceaspect
- if (lazyRef != null)
- {
- LazyReferenceAspect lra = new LazyReferenceAspect();
- lra.setLazyReference(lazyRef);
- callback = lra;
- }
- else
- {
- // user default interceptor
- callback = new SerializationInterceptor(o, sessionFactory);
- }
-
- synchronized (proxies)
- {
- if (proxies.containsKey(clazz))
- {
- Factory proxy = (Factory)proxies.get(clazz);
- return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
- }
- }
- // create proxy to listen on writeReplace method calls
- Object proxy = Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
- {
-
- public int accept(Method method)
- {
- if (method.getName().equals("writeReplace"))
- {
- return 0;
- }
- else
- {
- return 1;
- }
- }
-
- }, new Callback[]{callback, NoOp.INSTANCE });
-
- // store proxy
- proxies.put(clazz, ((Factory)proxy).newInstance(new Callback[]{EmptyMethodInterceptor.INSTANCE, NoOp.INSTANCE }));
- return proxy;
- }
- catch (Throwable t)
- {
- log.warn(t.getMessage(), t);
- return o;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
- {
-
- try
- {
- if (original == null)
- {
- return null;
- }
-
- if (processed.get() == null)
- {
- processed.set(new ArrayList<Object>());
- }
-
- // add to processed objects
- processed.get().add(original);
-
- if (original.getClass().isPrimitive())
- {
- return original;
- }
- else if (original.getClass().isArray())
- {
- // replace array entries with proxied ones
- Object[] array = (Object[]) original;
- for (int i = 0; i < array.length; i++)
- {
- array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
- }
- return array;
- }
- else if (original instanceof Collection)
- {
- // replace collection entries with proxied ones
- Collection collection = (Collection) original;
- CollectionUtils.transform(collection, transformer(sessionFactory));
- return collection;
- }
- else if (original instanceof Map)
- {
- // replace map entries with proxied ones
- Map map = (Map) original;
- MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
- return map;
- }
- else if (original instanceof Set)
- {
- // replace set entries with proxied ones
- Set set = (Set) original;
- SetUtils.transformedSet(set, transformer(sessionFactory));
- return set;
- }
- else
- {
- // cycle on bean fields
- ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
- {
-
- /**
- * {@inheritDoc}
- */
- public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
- {
- // set field accessible
- field.setAccessible(true);
-
- // get original value
- Object oldValue = field.get(original);
-
- // get new value
- Object newValue = null;
-
- if (oldValue instanceof HibernateProxy || oldValue instanceof PersistentCollection)
- {
- // if this field is a hibernate proxy or a persistent collection store reference
- LazyReference lazyRef = new LazyReference();
- lazyRef.setFieldClassName(field.getType().getName());
- lazyRef.setClassName(original.getClass().getName());
- lazyRef.setFieldName(field.getName());
- // load id
- lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(
- original,
- EntityMode.POJO));
-
- // get proxy for lazy
- newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory, lazyRef);
- }
- else
- {
- // get default proxy
- newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory);
- }
-
- // if there is a variation store it
- if (newValue != oldValue)
- {
- field.set(original, newValue);
- }
- }
-
- });
- }
-
- return original;
-
- }
- catch (Throwable t)
- {
- log.error(t.getMessage(), t);
- return original;
- }
- }
-
- /**
- * Get transformer for collection, map or set injection of proxied objects
- * @param factory hibernate session factory
- * @return transformer
- */
- private Transformer transformer(SessionFactory factory)
- {
- return new Transformer()
- {
-
- public Object transform(Object input)
- {
- return SerializationInterceptor.getEnhancedObject(input, sessionFactory);
- }
-
- };
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (from rev 476, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -0,0 +1,376 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
+import it.openutils.spring.rmibernate.shared.LazyReference;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.CallbackFilter;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.Factory;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+import net.sf.cglib.proxy.NoOp;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections.SetUtils;
+import org.apache.commons.collections.Transformer;
+import org.hibernate.EntityMode;
+import org.hibernate.SessionFactory;
+import org.hibernate.collection.PersistentCollection;
+import org.hibernate.collection.PersistentSet;
+import org.hibernate.proxy.HibernateProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
+
+
+/**
+ * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class SerializationInterceptor implements MethodInterceptor
+{
+
+ private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
+
+ private static ThreadLocal<HibernateLazyService> hibernateLazyService = new ThreadLocal<HibernateLazyService>();
+
+ private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
+
+ /**
+ * log
+ */
+ private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
+
+ /**
+ * non proxied object
+ */
+ private Object original;
+
+ /**
+ * hibernate sessionfactory
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * Constructor
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ */
+ private SerializationInterceptor(Object o, SessionFactory sessionFactory)
+ {
+ this.original = o;
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * Cleans the processed beans cache
+ */
+ public static void clean()
+ {
+ processed.set(null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
+ {
+ return getEnhancedObject(o, sessionFactory, null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @param lazyRef reference to a lazy field
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
+ {
+ if (o == null)
+ {
+ return null;
+ }
+
+ if (!(o instanceof HibernateProxy)
+ && !(o instanceof PersistentSet)
+ && processed.get() != null
+ && processed.get().contains(o))
+ {
+ return o;
+ }
+
+ if (o.getClass().getName().startsWith("java.") &&
+ !((o instanceof Collection) || (o instanceof Map)))
+ {
+ return o;
+ }
+
+
+ // check if there is an empty constructor
+ try
+ {
+ o.getClass().getConstructor(new Class[]{});
+ }
+ catch (NoSuchMethodException ex)
+ {
+ return o;
+ }
+
+ // check if object can be subclassed
+ if (Modifier.isFinal(o.getClass().getModifiers()))
+ {
+ return o;
+ }
+
+ try
+ {
+ // get class
+ Class clazz = o.getClass();
+
+ // if it is an hibernateproxy get superclass
+ if (o instanceof HibernateProxy)
+ {
+ clazz = o.getClass().getSuperclass();
+ if (clazz == null)
+ {
+ clazz = o.getClass().getInterfaces()[0];
+ }
+ }
+
+ Callback callback = null;
+
+ // if this is a lazy field user lazyreferenceaspect
+ if (lazyRef != null)
+ {
+ LazyReferenceAspect lra = new LazyReferenceAspect();
+ lra.setLazyReference(lazyRef);
+ callback = lra;
+ }
+ else
+ {
+ // user default interceptor
+ callback = new SerializationInterceptor(o, sessionFactory);
+ }
+
+ synchronized (proxies)
+ {
+ if (proxies.containsKey(clazz))
+ {
+ Factory proxy = (Factory) proxies.get(clazz);
+ return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
+ }
+ }
+ // create proxy to listen on writeReplace method calls
+ Object proxy = Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
+ {
+
+ public int accept(Method method)
+ {
+ if (method.getName().equals("writeReplace"))
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+
+ }, new Callback[]{callback, NoOp.INSTANCE });
+
+ // store proxy
+ proxies.put(clazz, ((Factory) proxy).newInstance(new Callback[]{
+ EmptyMethodInterceptor.INSTANCE,
+ NoOp.INSTANCE }));
+ return proxy;
+ }
+ catch (Throwable t)
+ {
+ log.warn(t.getMessage(), t);
+ return o;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ try
+ {
+ if (original == null)
+ {
+ return null;
+ }
+
+ if (original.getClass().getName().startsWith("java.") &&
+ !(original instanceof Collection) || (original instanceof Map))
+ {
+ return original;
+ }
+
+ if (processed.get() == null)
+ {
+ processed.set(new ArrayList<Object>());
+ }
+
+ // add to processed objects
+ processed.get().add(original);
+
+ if (original.getClass().isPrimitive())
+ {
+ log.debug("Non enhancing primitive type: {}", original.getClass().getName());
+ return original;
+ }
+ else if (original.getClass().isArray())
+ {
+ // replace array entries with proxied ones
+ Object[] array = (Object[]) original;
+ for (int i = 0; i < array.length; i++)
+ {
+ array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
+ }
+ return array;
+ }
+ else if (original instanceof Collection)
+ {
+ // replace collection entries with proxied ones
+ Collection collection = (Collection) original;
+ CollectionUtils.transform(collection, transformer(sessionFactory));
+ return collection;
+ }
+ else if (original instanceof Map)
+ {
+ // replace map entries with proxied ones
+ Map map = (Map) original;
+ MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
+ return map;
+ }
+ else if (original instanceof Set)
+ {
+ // replace set entries with proxied ones
+ Set set = (Set) original;
+ SetUtils.transformedSet(set, transformer(sessionFactory));
+ return set;
+ }
+ else
+ {
+ // cycle on bean fields
+ ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
+ {
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
+ {
+ // set field accessible
+ field.setAccessible(true);
+
+ // get original value
+ Object oldValue = field.get(original);
+
+ // get new value
+ Object newValue = null;
+
+ if (oldValue instanceof HibernateProxy || oldValue instanceof PersistentCollection)
+ {
+ // if this field is a hibernate proxy or a persistent collection store reference
+ LazyReference lazyRef = new LazyReference();
+ lazyRef.setFieldClassName(field.getType().getName());
+ lazyRef.setClassName(original.getClass().getName());
+ lazyRef.setFieldName(field.getName());
+ // load id
+ lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(
+ original,
+ EntityMode.POJO));
+
+ // get proxy for lazy
+ newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory, lazyRef);
+ }
+ else
+ {
+ // get default proxy
+ newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory);
+ }
+
+ // if there is a variation store it
+ if (newValue != oldValue)
+ {
+ field.set(original, newValue);
+ }
+ }
+
+ });
+ }
+
+ return original;
+
+ }
+ catch (Throwable t)
+ {
+ log.error(t.getMessage(), t);
+ return original;
+ }
+ }
+
+ /**
+ * Get transformer for collection, map or set injection of proxied objects
+ * @param factory hibernate session factory
+ * @return transformer
+ */
+ private Transformer transformer(SessionFactory factory)
+ {
+ return new Transformer()
+ {
+
+ public Object transform(Object input)
+ {
+ return SerializationInterceptor.getEnhancedObject(input, sessionFactory);
+ }
+
+ };
+ }
+
+
+ /**
+ * Sets the hibernateLazyService.
+ * @param hibernateLazyService the hibernateLazyService to set
+ */
+ public static void setHibernateLazyService(HibernateLazyService hibernateLazyService)
+ {
+ SerializationInterceptor.hibernateLazyService.set(hibernateLazyService);
+ }
+
+
+ /**
+ * Returns the hibernateLazyService.
+ * @return the hibernateLazyService
+ */
+ public static HibernateLazyService getHibernateLazyService()
+ {
+ return hibernateLazyService.get();
+ }
+}
Deleted: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-17 17:06:38 UTC (rev 475)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -1,117 +0,0 @@
-package it.openutils.spring.rmibernate.shared;
-
-import it.openutils.spring.rmibernate.client.aspects.HibernateLazyLoaderAspect;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
-import net.sf.cglib.proxy.Enhancer;
-
-
-/**
- * Store lazy reference
- * @author mmolaschi
- * @version $Id: $
- */
-public class LazyReference implements Serializable
-{
-
- private Serializable id;
-
- private String fieldName;
-
- private String className;
-
- private String fieldClassName;
-
- /**
- * default constructor
- */
- public LazyReference()
- {
-
- }
-
- /**
- * Constructor
- * @param className className
- * @param fieldName fieldName
- * @param fieldClassName fieldClassName
- * @param id id of current entity
- */
- public LazyReference(String className, String fieldName, String fieldClassName, Serializable id)
- {
- this.className = className;
- this.fieldName = fieldName;
- this.fieldClassName = fieldClassName;
- this.id = id;
- }
-
- /**
- * Called on deserialization, creates proxy for remote lazy loading
- * @return proxy for remote lazy loading
- * @throws ObjectStreamException exception reading
- * @throws ClassNotFoundException class not found
- */
- @SuppressWarnings("unchecked")
- Object readResolve() throws ObjectStreamException, ClassNotFoundException
- {
- // get proxy superclass
- Class superclass = Class.forName(fieldClassName);
- Class[] interfaces = null;
- // if superclass is an interface add it to interfaces
- if (superclass.isInterface())
- {
- interfaces = new Class[]{superclass};
- }
- // return proxy
- return Enhancer.create(
- superclass,
- interfaces,
- new HibernateLazyLoaderAspect(className, fieldName, id));
-
- }
-
- public String getClassName()
- {
- return className;
- }
-
- public void setClassName(String className)
- {
- this.className = className;
- }
-
- public Serializable getId()
- {
- return id;
- }
-
- public void setId(Serializable id)
- {
- this.id = id;
- }
-
- public String getFieldName()
- {
- return fieldName;
- }
-
- public void setFieldName(String fieldName)
- {
- this.fieldName = fieldName;
- }
-
-
- public String getFieldClassName()
- {
- return fieldClassName;
- }
-
-
- public void setFieldClassName(String fieldClassName)
- {
- this.fieldClassName = fieldClassName;
- }
-
-}
Copied: tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java (from rev 476, trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java)
===================================================================
--- tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java (rev 0)
+++ tags/openutils-spring-rmibernate-1.0.1/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-22 17:15:30 UTC (rev 478)
@@ -0,0 +1,123 @@
+package it.openutils.spring.rmibernate.shared;
+
+import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
+import it.openutils.spring.rmibernate.client.aspects.HibernateLazyLoaderAspect;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+import net.sf.cglib.proxy.Enhancer;
+
+
+/**
+ * Store lazy reference
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class LazyReference implements Serializable
+{
+
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = 421364413345638150L;
+
+ private Serializable id;
+
+ private String fieldName;
+
+ private String className;
+
+ private String fieldClassName;
+
+ /**
+ * default constructor
+ */
+ public LazyReference()
+ {
+
+ }
+
+ /**
+ * Constructor
+ * @param className className
+ * @param fieldName fieldName
+ * @param fieldClassName fieldClassName
+ * @param id id of current entity
+ */
+ public LazyReference(String className, String fieldName, String fieldClassName, Serializable id)
+ {
+ this.className = className;
+ this.fieldName = fieldName;
+ this.fieldClassName = fieldClassName;
+ this.id = id;
+ }
+
+ /**
+ * Called on deserialization, creates proxy for remote lazy loading
+ * @return proxy for remote lazy loading
+ * @throws ObjectStreamException exception reading
+ * @throws ClassNotFoundException class not found
+ */
+ @SuppressWarnings("unchecked")
+ Object readResolve() throws ObjectStreamException, ClassNotFoundException
+ {
+ // get proxy superclass
+ Class superclass = Class.forName(fieldClassName);
+ Class[] interfaces = null;
+ // if superclass is an interface add it to interfaces
+ if (superclass.isInterface())
+ {
+ interfaces = new Class[]{superclass};
+ }
+ // return proxy
+ return Enhancer.create(
+ superclass,
+ interfaces,
+ new HibernateLazyLoaderAspect(className, fieldName, id, HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get()));
+
+ }
+
+ public String getClassName()
+ {
+ return className;
+ }
+
+ public void setClassName(String className)
+ {
+ this.className = className;
+ }
+
+ public Serializable getId()
+ {
+ return id;
+ }
+
+ public void setId(Serializable id)
+ {
+ this.id = id;
+ }
+
+ public String getFieldName()
+ {
+ return fieldName;
+ }
+
+ public void setFieldName(String fieldName)
+ {
+ this.fieldName = fieldName;
+ }
+
+
+ public String getFieldClassName()
+ {
+ return fieldClassName;
+ }
+
+
+ public void setFieldClassName(String fieldClassName)
+ {
+ this.fieldClassName = fieldClassName;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-22 17:15:13
|
Revision: 477
http://openutils.svn.sourceforge.net/openutils/?rev=477&view=rev
Author: fcarone
Date: 2007-10-22 10:15:16 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-spring-rmibernate-1.0.1
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-22 16:57:38 UTC (rev 476)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-22 17:15:16 UTC (rev 477)
@@ -1,122 +1,128 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring-rmibernate</artifactId>
- <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.1-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <!-- replaces commons-logging -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.ga</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring-rmibernate</artifactId>
+ <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <version>1.0.1</version>
+ <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-22 16:57:41
|
Revision: 476
http://openutils.svn.sourceforge.net/openutils/?rev=476&view=rev
Author: fcarone
Date: 2007-10-22 09:57:38 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Lazy loading enhancements
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-17 17:06:38 UTC (rev 475)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-22 16:57:38 UTC (rev 476)
@@ -17,6 +17,11 @@
public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
{
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = -365731708075101363L;
+
private static ThreadLocal<Paginator> paginator = new ThreadLocal<Paginator>();
private String className;
@@ -25,17 +30,20 @@
private Serializable id;
+ private HibernateLazyService hibernateLazyService;
+
/**
* Constructor
* @param className parent class name
* @param fieldName field to be lazy loaded
* @param id id of current entity
*/
- public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id)
+ public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id, HibernateLazyService hibernateLazyService)
{
this.className = className;
this.fieldName = fieldName;
this.id = id;
+ this.hibernateLazyService = hibernateLazyService;
}
/**
@@ -62,14 +70,12 @@
public Object loadObject() throws Exception
{
// Load from remote
- HibernateLazyService hls = HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get();
-
if (paginator.get() != null)
{
- return hls.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
+ return hibernateLazyService.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
}
- return hls.invoke(className, fieldName, id);
+ return hibernateLazyService.invoke(className, fieldName, id);
}
}
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-22 16:57:38 UTC (rev 476)
@@ -1,5 +1,7 @@
package it.openutils.spring.rmibernate.server.aspects;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.hibernate.SessionFactory;
@@ -36,13 +38,16 @@
*/
public Object invoke(MethodInvocation invocation) throws Throwable
{
+ logger.debug("Catched invocation: {}", invocation);
try
{
Object retVal = invocation.proceed();
SerializationInterceptor.clean();
// Proxy class for serialization work
- return SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
+ Object result = SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
+ logger.debug("Returning enhanced object {}", result);
+ return result;
}
catch (Throwable ex)
{
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-17 17:06:38 UTC (rev 475)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-22 16:57:38 UTC (rev 476)
@@ -2,6 +2,7 @@
import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
import it.openutils.spring.rmibernate.shared.LazyReference;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -46,6 +47,8 @@
private static ThreadLocal<List<Object>> processed = new ThreadLocal<List<Object>>();
+ private static ThreadLocal<HibernateLazyService> hibernateLazyService = new ThreadLocal<HibernateLazyService>();
+
private static Map<Class, Object> proxies = Collections.synchronizedMap(new HashMap<Class, Object>());
/**
@@ -74,6 +77,9 @@
this.sessionFactory = sessionFactory;
}
+ /**
+ * Cleans the processed beans cache
+ */
public static void clean()
{
processed.set(null);
@@ -112,6 +118,13 @@
return o;
}
+ if (o.getClass().getName().startsWith("java.") &&
+ !((o instanceof Collection) || (o instanceof Map)))
+ {
+ return o;
+ }
+
+
// check if there is an empty constructor
try
{
@@ -162,7 +175,7 @@
{
if (proxies.containsKey(clazz))
{
- Factory proxy = (Factory)proxies.get(clazz);
+ Factory proxy = (Factory) proxies.get(clazz);
return proxy.newInstance(new Callback[]{callback, NoOp.INSTANCE });
}
}
@@ -185,7 +198,9 @@
}, new Callback[]{callback, NoOp.INSTANCE });
// store proxy
- proxies.put(clazz, ((Factory)proxy).newInstance(new Callback[]{EmptyMethodInterceptor.INSTANCE, NoOp.INSTANCE }));
+ proxies.put(clazz, ((Factory) proxy).newInstance(new Callback[]{
+ EmptyMethodInterceptor.INSTANCE,
+ NoOp.INSTANCE }));
return proxy;
}
catch (Throwable t)
@@ -201,7 +216,6 @@
@SuppressWarnings("unchecked")
public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
{
-
try
{
if (original == null)
@@ -209,6 +223,12 @@
return null;
}
+ if (original.getClass().getName().startsWith("java.") &&
+ !(original instanceof Collection) || (original instanceof Map))
+ {
+ return original;
+ }
+
if (processed.get() == null)
{
processed.set(new ArrayList<Object>());
@@ -219,6 +239,7 @@
if (original.getClass().isPrimitive())
{
+ log.debug("Non enhancing primitive type: {}", original.getClass().getName());
return original;
}
else if (original.getClass().isArray())
@@ -258,6 +279,8 @@
ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
{
+
+
/**
* {@inheritDoc}
*/
@@ -331,4 +354,23 @@
};
}
+
+ /**
+ * Sets the hibernateLazyService.
+ * @param hibernateLazyService the hibernateLazyService to set
+ */
+ public static void setHibernateLazyService(HibernateLazyService hibernateLazyService)
+ {
+ SerializationInterceptor.hibernateLazyService.set(hibernateLazyService);
+ }
+
+
+ /**
+ * Returns the hibernateLazyService.
+ * @return the hibernateLazyService
+ */
+ public static HibernateLazyService getHibernateLazyService()
+ {
+ return hibernateLazyService.get();
+ }
}
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-17 17:06:38 UTC (rev 475)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-22 16:57:38 UTC (rev 476)
@@ -1,5 +1,6 @@
package it.openutils.spring.rmibernate.shared;
+import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
import it.openutils.spring.rmibernate.client.aspects.HibernateLazyLoaderAspect;
import java.io.ObjectStreamException;
@@ -16,6 +17,11 @@
public class LazyReference implements Serializable
{
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = 421364413345638150L;
+
private Serializable id;
private String fieldName;
@@ -68,7 +74,7 @@
return Enhancer.create(
superclass,
interfaces,
- new HibernateLazyLoaderAspect(className, fieldName, id));
+ new HibernateLazyLoaderAspect(className, fieldName, id, HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get()));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-17 17:06:34
|
Revision: 475
http://openutils.svn.sourceforge.net/openutils/?rev=475&view=rev
Author: fcarone
Date: 2007-10-17 10:06:38 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-17 17:06:30 UTC (rev 474)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-17 17:06:38 UTC (rev 475)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
<name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<properties>
<spring.version>2.0.6</spring.version>
@@ -119,10 +119,4 @@
<version>2.2.3</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.0</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-17 17:06:25
|
Revision: 474
http://openutils.svn.sourceforge.net/openutils/?rev=474&view=rev
Author: fcarone
Date: 2007-10-17 10:06:30 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-spring-rmibernate-1.0.0
Added Paths:
-----------
tags/openutils-spring-rmibernate-1.0.0/
Copied: tags/openutils-spring-rmibernate-1.0.0 (from rev 473, trunk/openutils-spring-rmibernate)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-17 17:06:25
|
Revision: 469
http://openutils.svn.sourceforge.net/openutils/?rev=469&view=rev
Author: fcarone
Date: 2007-10-17 09:39:26 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
ignore eclipse properties
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/.classpath
trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs
Property Changed:
----------------
trunk/openutils-spring-rmibernate/
Property changes on: trunk/openutils-spring-rmibernate
___________________________________________________________________
Name: svn:ignore
+ .project
.classpath
.checkstyle
Modified: trunk/openutils-spring-rmibernate/.classpath
===================================================================
--- trunk/openutils-spring-rmibernate/.classpath 2007-10-16 13:46:35 UTC (rev 468)
+++ trunk/openutils-spring-rmibernate/.classpath 2007-10-17 16:39:26 UTC (rev 469)
@@ -1,32 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar" sourcepath="M2_REPO/asm/asm/2.2.3/asm-2.2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.6/spring-beans-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0.6/spring-dao-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0.6/spring-aop-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-remoting/2.0.6/spring-remoting-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0.6/spring-web-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0.6/spring-hibernate3-2.0.6.jar" sourcepath="/M2_REPO/org/springframework/spring-hibernate3/2.0.1/spring-hibernate3-2.0.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.0.6/spring-jdbc-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.6/spring-core-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.6/spring-context-2.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1-sources.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0.6/spring-aop-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.6/spring-beans-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.6/spring-context-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0.6/spring-hibernate3-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-remoting/2.0.6/spring-remoting-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.0.6/spring-jdbc-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.6/spring-core-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0.6/spring-web-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0.6/spring-dao-2.0.6.jar"/>
+</classpath>
\ No newline at end of file
Modified: trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs 2007-10-16 13:46:35 UTC (rev 468)
+++ trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs 2007-10-17 16:39:26 UTC (rev 469)
@@ -1,5 +1,5 @@
-#Tue Oct 16 10:42:53 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+#Wed Oct 17 18:36:51 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-17 17:04:23
|
Revision: 473
http://openutils.svn.sourceforge.net/openutils/?rev=473&view=rev
Author: fcarone
Date: 2007-10-17 10:04:22 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-spring-rmibernate-1.0.0
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2007-10-17 16:49:49 UTC (rev 472)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-17 17:04:22 UTC (rev 473)
@@ -1,122 +1,128 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring-rmibernate</artifactId>
- <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
- <version>1.0.0-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <!-- replaces commons-logging -->
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.ga</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring-rmibernate</artifactId>
+ <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <version>1.0.0</version>
+ <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-rmibernate-1.0.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-rmibernate-1.0.0</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2007-10-17 16:49:44
|
Revision: 472
http://openutils.svn.sourceforge.net/openutils/?rev=472&view=rev
Author: fcarone
Date: 2007-10-17 09:49:49 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
delete eclipse autogenerated files
Removed Paths:
-------------
trunk/openutils-spring-rmibernate/.checkstyle
Deleted: trunk/openutils-spring-rmibernate/.checkstyle
===================================================================
--- trunk/openutils-spring-rmibernate/.checkstyle 2007-10-17 16:49:31 UTC (rev 471)
+++ trunk/openutils-spring-rmibernate/.checkstyle 2007-10-17 16:49:49 UTC (rev 472)
@@ -1,6 +0,0 @@
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="project" local="false">
- <file-match-pattern match-pattern="." include-pattern="true" />
- </fileset>
- <filter name="NonSrcDirs" enabled="true" />
-</fileset-config>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
