Menu
▾
▴
[Andromda-cvs] CVS update: cartridges/andromda-spring/src/test/expected cartridge-output.zip
|
From: Chad B. <cwb...@us...> - 2006-11-30 16:25:44
|
User: cwbrandon
Date: 06/11/30 08:25:42
Modified: andromda-spring/src/templates/spring/hibernate Tag:
V3_x_HEAD HibernateSearch.vsl
SpringHibernateDaoBase.vsl
andromda-spring/src/templates/spring/richclient Tag:
V3_x_HEAD serverTestBeanRefFactory.properties.vsl
andromda-spring/src/templates/spring/presentation/hibernate
Tag: V3_x_HEAD OpenSessionInViewFilter.java.vsl
andromda-spring/src/test/expected Tag: V3_x_HEAD
cartridge-output.zip
Log:
fix hardcoding of package name
Revision Changes Path
No revision
No revision
1.30.4.5 +1 -1 cartridges/andromda-spring/src/templates/spring/hibernate/HibernateSearch.vsl
Index: HibernateSearch.vsl
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/templates/spring/hibernate/HibernateSearch.vsl,v
retrieving revision 1.30.4.4
retrieving revision 1.30.4.5
diff -u -w -r1.30.4.4 -r1.30.4.5
--- HibernateSearch.vsl 29 Nov 2006 00:44:44 -0000 1.30.4.4
+++ HibernateSearch.vsl 30 Nov 2006 16:25:34 -0000 1.30.4.5
@@ -190,7 +190,7 @@
{
if (considerParameter(parameter))
{
- final org.hibernate.Criteria parameterCriteria = this.getParameterCriteria(parameter);
+ final ${hibernateUtils.basePackage}.Criteria parameterCriteria = this.getParameterCriteria(parameter);
final java.lang.String parameterName = this.getParameterName(parameter);
// check the type parameter value to add
1.86.2.34 +12 -12 cartridges/andromda-spring/src/templates/spring/hibernate/SpringHibernateDaoBase.vsl
Index: SpringHibernateDaoBase.vsl
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/templates/spring/hibernate/SpringHibernateDaoBase.vsl,v
retrieving revision 1.86.2.33
retrieving revision 1.86.2.34
diff -u -w -r1.86.2.33 -r1.86.2.34
--- SpringHibernateDaoBase.vsl 27 Nov 2006 23:55:34 -0000 1.86.2.33
+++ SpringHibernateDaoBase.vsl 30 Nov 2006 16:25:34 -0000 1.86.2.34
@@ -82,10 +82,10 @@
final java.lang.Object entity = this.getHibernateTemplate().execute(
new org.springframework.orm.hibernate3.HibernateCallback()
{
- public java.lang.Object doInHibernate(org.hibernate.Session hibernateSession)
- throws org.hibernate.HibernateException
+ public java.lang.Object doInHibernate(${hibernateUtils.basePackage}.Session hibernateSession)
+ throws ${hibernateUtils.basePackage}.HibernateException
{
- org.hibernate.Session xmlSession = hibernateSession.getSession(org.hibernate.EntityMode.DOM4J);
+ ${hibernateUtils.basePackage}.Session xmlSession = hibernateSession.getSession(${hibernateUtils.basePackage}.EntityMode.DOM4J);
return xmlSession.get(${entity.fullyQualifiedEntityImplementationName}.class, $argument);
}
},
@@ -167,10 +167,10 @@
java.lang.Object newID = this.getHibernateTemplate().execute(
new org.springframework.orm.hibernate3.HibernateCallback()
{
- public java.lang.Object doInHibernate(org.hibernate.Session hibernateSession)
- throws org.hibernate.HibernateException
+ public java.lang.Object doInHibernate(${hibernateUtils.basePackage}.Session hibernateSession)
+ throws ${hibernateUtils.basePackage}.HibernateException
{
- org.hibernate.Session xmlSession = hibernateSession.getSession(org.hibernate.EntityMode.DOM4J);
+ ${hibernateUtils.basePackage}.Session xmlSession = hibernateSession.getSession(${hibernateUtils.basePackage}.EntityMode.DOM4J);
return xmlSession.save("$entity.fullyQualifiedEntityImplementationName", $argumentName);
}
},
@@ -341,10 +341,10 @@
this.getHibernateTemplate().execute(
new org.springframework.orm.hibernate3.HibernateCallback()
{
- public java.lang.Object doInHibernate(org.hibernate.Session hibernateSession)
- throws org.hibernate.HibernateException
+ public java.lang.Object doInHibernate(${hibernateUtils.basePackage}.Session hibernateSession)
+ throws ${hibernateUtils.basePackage}.HibernateException
{
- org.hibernate.Session xmlSession = hibernateSession.getSession(org.hibernate.EntityMode.DOM4J);
+ ${hibernateUtils.basePackage}.Session xmlSession = hibernateSession.getSession(${hibernateUtils.basePackage}.EntityMode.DOM4J);
xmlSession.update("$entity.fullyQualifiedEntityImplementationName", $argumentName);
return null;
}
@@ -406,10 +406,10 @@
this.getHibernateTemplate().execute(
new org.springframework.orm.hibernate3.HibernateCallback()
{
- public java.lang.Object doInHibernate(org.hibernate.Session hibernateSession)
- throws org.hibernate.HibernateException
+ public java.lang.Object doInHibernate(${hibernateUtils.basePackage}.Session hibernateSession)
+ throws ${hibernateUtils.basePackage}.HibernateException
{
- org.hibernate.Session xmlSession = hibernateSession.getSession(org.hibernate.EntityMode.DOM4J);
+ ${hibernateUtils.basePackage}.Session xmlSession = hibernateSession.getSession(${hibernateUtils.basePackage}.EntityMode.DOM4J);
xmlSession.delete($argumentName);
return null;
}
No revision
No revision
1.1.2.2 +1 -1 cartridges/andromda-spring/src/templates/spring/richclient/Attic/serverTestBeanRefFactory.properties.vsl
Index: serverTestBeanRefFactory.properties.vsl
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/templates/spring/richclient/Attic/serverTestBeanRefFactory.properties.vsl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- serverTestBeanRefFactory.properties.vsl 15 Mar 2006 03:29:29 -0000 1.1.2.1
+++ serverTestBeanRefFactory.properties.vsl 30 Nov 2006 16:25:34 -0000 1.1.2.2
@@ -3,7 +3,7 @@
dataSource.username=sa
dataSource.password=
dataSource.url=jdbc:hsqldb:mem:testDB
-sessionFactory.hibernateProperties[hibernate.dialect]=org.hibernate.dialect.HSQLDialect
+sessionFactory.hibernateProperties[hibernate.dialect]=${hibernateUtils.basePackage}.dialect.HSQLDialect
sessionFactory.hibernateProperties[hibernate.hbm2ddl.auto]=create-drop
sessionFactory.hibernateProperties[hibernate.show_sql]=true
No revision
No revision
1.5.6.2 +1 -1 cartridges/andromda-spring/src/templates/spring/presentation/hibernate/OpenSessionInViewFilter.java.vsl
Index: OpenSessionInViewFilter.java.vsl
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/templates/spring/presentation/hibernate/OpenSessionInViewFilter.java.vsl,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -u -w -r1.5.6.1 -r1.5.6.2
--- OpenSessionInViewFilter.java.vsl 15 Mar 2006 16:59:04 -0000 1.5.6.1
+++ OpenSessionInViewFilter.java.vsl 30 Nov 2006 16:25:34 -0000 1.5.6.2
@@ -28,6 +28,6 @@
org.springframework.context.access.ContextSingletonBeanFactoryLocator.getInstance("$beanRefFactory");
final org.springframework.beans.factory.access.BeanFactoryReference reference =
beanFactoryLocator.useBeanFactory("$beanRefFactoryId");
- return (org.hibernate.SessionFactory)reference.getFactory().getBean(this.getSessionFactoryBeanName());
+ return (${hibernateUtils.basePackage}.SessionFactory)reference.getFactory().getBean(this.getSessionFactoryBeanName());
}
}
\ No newline at end of file
No revision
No revision
1.269.2.75 +269 -271 cartridges/andromda-spring/src/test/expected/cartridge-output.zip
<<Binary file>>
|
