taylor 2004/10/20 18:47:26
Modified: components/profiler/src/java/META-INF ojb_repository.xml
components/profiler/src/java/org/apache/jetspeed/profiler/impl
JetspeedProfiler.java
Log:
the profiler OJB mapping rules were updated to properly store dependent objects in a
deep object tree store i.e. storing a rule, and ensuring that all criteria store along
with it
tested in add/update/delete
Revision Changes Path
1.4 +8 -5
jakarta-jetspeed-2/components/profiler/src/java/META-INF/ojb_repository.xml
Index: ojb_repository.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/profiler/src/java/META-INF/ojb_repository.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ojb_repository.xml 8 Oct 2004 06:49:37 -0000 1.3
+++ ojb_repository.xml 21 Oct 2004 01:47:26 -0000 1.4
@@ -43,13 +43,16 @@
column="TITLE"
jdbc-type="VARCHAR"
/>
- <collection-descriptor
+ <collection-descriptor
name="criteria"
element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
- auto-retrieve="true"
- >
- <inverse-foreignkey field-ref="ruleId"/>
- </collection-descriptor>
+ auto-delete="object"
+ auto-update = "object"
+ auto-retrieve = "true"
+ >
+ <inverse-foreignkey field-ref="ruleId"/>
+ </collection-descriptor>
+
</class-descriptor>
1.12 +3 -7
jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java
Index: JetspeedProfiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JetspeedProfiler.java 20 Oct 2004 16:43:38 -0000 1.11
+++ JetspeedProfiler.java 21 Oct 2004 01:47:26 -0000 1.12
@@ -30,7 +30,6 @@
import org.apache.jetspeed.components.persistence.store.LockFailedException;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.Transaction;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.profiler.ProfileLocator;
import org.apache.jetspeed.profiler.ProfiledPageContext;
import org.apache.jetspeed.profiler.Profiler;
@@ -76,7 +75,7 @@
{
this.persistentStore = persistentStore;
}
-
+
/**
* Create a JetspeedProfiler with properties. Expected properties are:
*
@@ -397,14 +396,11 @@
{
try
{
- System.out.println("making pers : " + rule.getId());
Transaction tx = persistentStore.getTransaction();
tx.begin();
persistentStore.makePersistent(rule);
persistentStore.lockForWrite(rule);
- tx.commit();
- System.out.println("done making pers : " + rule.getId());
-
+ tx.commit();
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
