You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2009/11/18 20:11:11 UTC
svn commit: r881884 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMultiTier.java
cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
Author: andrey
Date: Wed Nov 18 19:11:11 2009
New Revision: 881884
URL: http://svn.apache.org/viewvc?rev=881884&view=rev
Log:
fixing generating errors
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMultiTier.java
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMultiTier.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMultiTier.java?rev=881884&r1=881883&r2=881884&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMultiTier.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/auto/_ClientMultiTier.java Wed Nov 18 19:11:11 2009
@@ -5,7 +5,7 @@
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.query.NamedQuery;
-import org.apache.cayenne.testdo.mt.MtTable1;
+import org.apache.cayenne.testdo.mt.ClientMtTable1;
/**
* This class was generated by Cayenne.
@@ -21,15 +21,15 @@
public static final String PARAMETERIZED_MT_QUERY_WITH_LOCAL_CACHE_QUERYNAME = "ParameterizedMtQueryWithLocalCache";
- public List<MtTable1> performAllMtTable1(ObjectContext context ) {
+ public List<ClientMtTable1> performAllMtTable1(ObjectContext context ) {
return context.performQuery(new NamedQuery("AllMtTable1"));
}
- public List<MtTable1> performMtQueryWithLocalCache(ObjectContext context ) {
+ public List<ClientMtTable1> performMtQueryWithLocalCache(ObjectContext context ) {
return context.performQuery(new NamedQuery("MtQueryWithLocalCache"));
}
- public List<MtTable1> performParameterizedMtQueryWithLocalCache(ObjectContext context , String g) {
+ public List<ClientMtTable1> performParameterizedMtQueryWithLocalCache(ObjectContext context , String g) {
String[] parameters = {
"g",
};
@@ -40,4 +40,4 @@
return context.performQuery(new NamedQuery("ParameterizedMtQueryWithLocalCache", parameters, values));
}
-}
\ No newline at end of file
+}
Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java?rev=881884&r1=881883&r2=881884&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java Wed Nov 18 19:11:11 2009
@@ -31,9 +31,9 @@
public static final String SUBCLASS_TEMPLATE = "dotemplates/v1_2/client-subclass.vm";
public static final String SUPERCLASS_TEMPLATE = "dotemplates/v1_2/client-superclass.vm";
- public static final String DMAP_SINGLE_CLASS_TEMPLATE = "dotemplates/v1_2/datamap-singleclass.vm";
- public static final String DMAP_SUBCLASS_TEMPLATE = "dotemplates/v1_2/datamap-subclass.vm";
- public static final String DMAP_SUPERCLASS_TEMPLATE = "dotemplates/v1_2/datamap-superclass.vm";
+ public static final String DMAP_SINGLE_CLASS_TEMPLATE = "dotemplates/v1_2/client-datamap-singleclass.vm";
+ public static final String DMAP_SUBCLASS_TEMPLATE = "dotemplates/v1_2/client-datamap-subclass.vm";
+ public static final String DMAP_SUPERCLASS_TEMPLATE = "dotemplates/v1_2/client-datamap-superclass.vm";
public static final String CLIENT_SUPERCLASS_PREFIX = "_Client";