You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by cl...@apache.org on 2006/12/18 18:23:50 UTC
svn commit: r488349 - in
/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller:
business/datamapper/ pojos/
Author: clr
Date: Mon Dec 18 09:23:49 2006
New Revision: 488349
URL: http://svn.apache.org/viewvc?view=rev&rev=488349
Log:
Datamapper updates for Weblog and User
Modified:
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java?view=diff&rev=488349&r1=488348&r2=488349
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java Mon Dec 18 09:23:49 2006
@@ -624,7 +624,7 @@
Object[] params;
if (enabled != null) {
query = strategy.newQuery(UserData.class,
- "UserData.getByUserName&enabled");
+ "UserData.getByUserName&Enabled");
params = new Object[] {userName, enabled};
} else {
query = strategy.newQuery(WebsiteData.class,
@@ -824,7 +824,7 @@
"UserData.getByEnabled&UserNameOrEmailAddressStartsWith");
if (setRange) query.setRange(offset, offset + length);
results = (List) query.execute(
- new Object[] {enabled, startsWith});
+ new Object[] {enabled, startsWith + '%'});
} else {
query = strategy.newQuery(UserData.class,
"UserData.getByEnabled");
@@ -836,7 +836,7 @@
query = strategy.newQuery(UserData.class,
"UserData.getByUserNameOrEmailAddressStartsWith");
if (setRange) query.setRange(offset, offset + length);
- results = (List) query.execute(startsWith);
+ results = (List) query.execute(startsWith + '%');
} else {
query = strategy.newQuery(UserData.class, "UserData.getAll");
if (setRange) query.setRange(offset, offset + length);
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java?view=diff&rev=488349&r1=488348&r2=488349
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java Mon Dec 18 09:23:49 2006
@@ -998,25 +998,25 @@
"WeblogEntryTagAggregateData.getTagsByWebsite&NameStartsWithOrderByName");
if (limit > 0) query.setRange(0, limit);
queryResults = (List) query.execute(
- new Object[] {website, startsWith});
+ new Object[] {website, startsWith + '%'});
} else {
query = strategy.newQuery(WeblogEntryTagAggregateData.class,
"WeblogEntryTagAggregateData.getTagsByWebsite&NameStartsWith");
if (limit > 0) query.setRange(0, limit);
queryResults = (List) query.execute(
- new Object[] {website, startsWith});
+ new Object[] {website, startsWith + '%'});
}
} else {
if (sortByName) {
query = strategy.newQuery(WeblogEntryTagAggregateData.class,
"WeblogEntryTagAggregateData.getTagsByWebsiteOrderByName");
if (limit > 0) query.setRange(0, limit);
- queryResults = (List) query.execute(startsWith);
+ queryResults = (List) query.execute(startsWith + '%');
} else {
query = strategy.newQuery(WeblogEntryTagAggregateData.class,
"WeblogEntryTagAggregateData.getTagsByWebsite");
if (limit > 0) query.setRange(0, limit);
- queryResults = (List) query.execute(startsWith);
+ queryResults = (List) query.execute(startsWith + '%');
}
}
} else {
@@ -1025,12 +1025,12 @@
query = strategy.newQuery(WeblogEntryTagAggregateData.class,
"WeblogEntryTagAggregateData.getTagsByWebsiteNull&NameStartsWithOrderByName");
if (limit > 0) query.setRange(0, limit);
- queryResults = (List) query.execute(startsWith);
+ queryResults = (List) query.execute(startsWith + '%');
} else {
query = strategy.newQuery(WeblogEntryTagAggregateData.class,
"WeblogEntryTagAggregateData.getTagsByWebsiteNull&NameStartsWith");
if (limit > 0) query.setRange(0, limit);
- queryResults = (List) query.execute(startsWith);
+ queryResults = (List) query.execute(startsWith + '%');
}
} else {
if (sortByName) {
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml?view=diff&rev=488349&r1=488348&r2=488349
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml Mon Dec 18 09:23:49 2006
@@ -110,12 +110,12 @@
</basic>
<one-to-many name="permissions" mapped-by="user" target-entity="org.apache.roller.pojos.PermissionsData" fetch="LAZY">
<cascade>
- <cascade-remove/>
+ <cascade-all/>
</cascade>
</one-to-many>
<one-to-many name="roles" mapped-by="user" target-entity="org.apache.roller.pojos.RoleData" fetch="LAZY">
<cascade>
- <cascade-remove/>
+ <cascade-all/>
</cascade>
</one-to-many>
</attributes>
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml?view=diff&rev=488349&r1=488348&r2=488349
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml Mon Dec 18 09:23:49 2006
@@ -52,6 +52,7 @@
<cascade-remove/>
</cascade>
</one-to-many>
+ <transient name="inUse"/>
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml?view=diff&rev=488349&r1=488348&r2=488349
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml (original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml Mon Dec 18 09:23:49 2006
@@ -25,7 +25,6 @@
</basic>
<basic name="time">
<column name="time" insertable="true" updatable="true" unique="false"/>
- <temporal>TIMESTAMP</temporal>
</basic>
<many-to-one name="weblog" target-entity="org.apache.roller.pojos.WebsiteData">
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>