weaver 2004/04/22 14:09:53
Modified:
components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/pb
Tag: NANOCONTAINER_DEPLOYER PBStore.java
components/persistence/src/java/org/apache/jetspeed/components/persistence/store/impl
Tag: NANOCONTAINER_DEPLOYER
DefaultPersistenceStoreContainer.java
components/persistence/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
components/persistence Tag: NANOCONTAINER_DEPLOYER maven.xml
Log:
- Uses ChildAwareContainer
- PBStore can now load OJB repository mappings from META-INF/ojb_repository.xml.
This
now removes the need to add entity mappings to the base repository.xml as the
individual
descriptors are now loaded programmatically through OJB's MetaManager.
Revision Changes Path
No revision
No revision
1.5.2.1 +20 -0
jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/pb/PBStore.java
Index: PBStore.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/ojb/pb/PBStore.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- PBStore.java 8 Mar 2004 19:07:22 -0000 1.5
+++ PBStore.java 22 Apr 2004 21:09:53 -0000 1.5.2.1
@@ -15,13 +15,17 @@
*/
package org.apache.jetspeed.components.persistence.store.ojb.pb;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.persistence.store.Filter;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import
org.apache.jetspeed.components.persistence.store.PersistenceStoreEventListener;
@@ -33,6 +37,9 @@
import org.apache.ojb.broker.PBKey;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerFactory;
+import org.apache.ojb.broker.metadata.DescriptorRepository;
+import org.apache.ojb.broker.metadata.MetadataManager;
+import org.apache.ojb.broker.metadata.RepositoryPersistor;
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryFactory;
@@ -55,6 +62,7 @@
private PersistenceBroker pb;
protected Set toBeStored;
+ protected static final Log log = LogFactory.getLog(PBStore.class);
public PBStore(String jcd)
@@ -75,6 +83,18 @@
invoker = new StoreEventInvoker(listeners, this);
pb = PersistenceBrokerFactory.createPersistenceBroker(pbKey);
toBeStored = new HashSet();
+ MetadataManager metaManager = MetadataManager.getInstance();
+ RepositoryPersistor persistor = new RepositoryPersistor();
+ // metaManager.mergeDescriptorRepository()
+ Enumeration descriptors =
getClass().getClassLoader().getResources("META-INF/ojb_repository.xml");
+ while(descriptors.hasMoreElements())
+ {
+ URL descriptorUrl = (URL) descriptors.nextElement();
+ log.info("Merging OJB respository: "+descriptorUrl);
+ DescriptorRepository repo =
persistor.readDescriptorRepository(descriptorUrl.openStream());
+ metaManager.mergeDescriptorRepository(repo);
+ }
+
}
catch (Throwable e)
{
No revision
No revision
1.6.2.1 +2 -2
jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/impl/DefaultPersistenceStoreContainer.java
Index: DefaultPersistenceStoreContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/persistence/store/impl/DefaultPersistenceStoreContainer.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- DefaultPersistenceStoreContainer.java 9 Mar 2004 16:14:31 -0000 1.6
+++ DefaultPersistenceStoreContainer.java 22 Apr 2004 21:09:53 -0000 1.6.2.1
@@ -22,13 +22,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.components.ChildAwareContainer;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
import org.apache.jetspeed.components.persistence.store.PersistenceStoreEvent;
import
org.apache.jetspeed.components.persistence.store.PersistenceStoreEventListener;
import org.picocontainer.PicoContainer;
import org.picocontainer.defaults.ComponentAdapterFactory;
-import org.picocontainer.defaults.DefaultPicoContainer;
/**
* <p>
@@ -42,7 +42,7 @@
*
*/
public class DefaultPersistenceStoreContainer
- extends DefaultPicoContainer
+ extends ChildAwareContainer
implements PersistenceStoreContainer, PersistenceStoreEventListener
{
/** Holds the current threads PersistenceStore */
No revision
No revision
1.1.2.2 +6 -9
jakarta-jetspeed-2/components/persistence/src/java/META-INF/Attic/nanocontainer.groovy
Index: nanocontainer.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/persistence/src/java/META-INF/Attic/nanocontainer.groovy,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- nanocontainer.groovy 19 Apr 2004 21:08:27 -0000 1.1.2.1
+++ nanocontainer.groovy 22 Apr 2004 21:09:53 -0000 1.1.2.2
@@ -1,4 +1,3 @@
-import org.picocontainer.defaults.DefaultPicoContainer
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.apache.jetspeed.components.persistence.store.ojb.pb.PBStore
@@ -8,18 +7,16 @@
import org.picocontainer.defaults.ConstructorInjectionComponentAdapter
-container = new DefaultPersistenceStoreContainer(15000, 10000)
-if(parent != null)
-{
- container.setParent(parent);
- // make sure that this container is also registered as a component
- // by its interface
- parent.registerComponentInstance(PersistenceStoreContainer, container);
-}
+container = new DefaultPersistenceStoreContainer(parent, 15000, 10000)
ComponentAdapter ca = new ConstructorInjectionComponentAdapter("jetspeed", PBStore,
new Parameter[] {new ConstantParameter("jetspeed")})
container.registerComponent(ca)
+
+if(parent != null)
+{
+ parent.registerComponentInstance(PersistenceStoreContainer, container)
+}
return container
No revision
No revision
1.3.2.2 +1 -1 jakarta-jetspeed-2/components/persistence/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/maven.xml,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- maven.xml 19 Apr 2004 21:08:27 -0000 1.3.2.1
+++ maven.xml 22 Apr 2004 21:09:53 -0000 1.3.2.2
@@ -29,7 +29,7 @@
</goal>
<preGoal name="test:test">
- <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-rdbms-2.0-a1-dev.jar" />
+ <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-rdbms-2.0-a1-dev.jar"
overwrite="true" />
</preGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
