weaver 2004/04/22 14:17:58
Modified: components/registry/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER nanocontainer.groovy
Added: components/registry/src/java/META-INF Tag:
NANOCONTAINER_DEPLOYER ojb_repository.xml
otm_repository_registry.xml
Log:
- removed uneeded mappings
- repository_registry.xml moved to META-INF and renamed to ojb_repository.xml
- now use ChildAwareContainer
Revision Changes Path
No revision
No revision
1.1.2.2 +6 -25
jakarta-jetspeed-2/components/registry/src/java/META-INF/Attic/nanocontainer.groovy
Index: nanocontainer.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/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:09:07 -0000 1.1.2.1
+++ nanocontainer.groovy 22 Apr 2004 21:17:58 -0000 1.1.2.2
@@ -15,7 +15,7 @@
* ========================================================================
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.defaults.ComponentParameter
@@ -31,30 +31,11 @@
import java.io.File
-/**
- * This is the standard assembly for a Regsitry
- * component. We want the Registry component to be exposed
- * at as high the container hierarchy as possibly so, if a
- * parent container is provided, we will regsiter to the parent
- * and use it as the container for the Regsitry.
- */
-
-// Prior to this, you will need to have an Implementation
-// of org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
-// registered.
-if(parent != null)
-{
- container = new DefaultPicoContainer(parent)
- parent.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
- parent.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
-}
-else
-{
- container = new DefaultPicoContainer()
- container.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
- container.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
-}
+
+container = new ChildAwareContainer(parent)
+container.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
+container.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
+
-// This will be an empty container if "parent" was not null
return container
No revision
Index: nanocontainer.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/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:09:07 -0000 1.1.2.1
+++ nanocontainer.groovy 22 Apr 2004 21:17:58 -0000 1.1.2.2
@@ -15,7 +15,7 @@
* ========================================================================
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.defaults.ComponentParameter
@@ -31,30 +31,11 @@
import java.io.File
-/**
- * This is the standard assembly for a Regsitry
- * component. We want the Registry component to be exposed
- * at as high the container hierarchy as possibly so, if a
- * parent container is provided, we will regsiter to the parent
- * and use it as the container for the Regsitry.
- */
-
-// Prior to this, you will need to have an Implementation
-// of org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
-// registered.
-if(parent != null)
-{
- container = new DefaultPicoContainer(parent)
- parent.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
- parent.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
-}
-else
-{
- container = new DefaultPicoContainer()
- container.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
- container.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
-}
+
+container = new ChildAwareContainer(parent)
+container.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
+container.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
+
-// This will be an empty container if "parent" was not null
return container
No revision
Index: nanocontainer.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/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:09:07 -0000 1.1.2.1
+++ nanocontainer.groovy 22 Apr 2004 21:17:58 -0000 1.1.2.2
@@ -15,7 +15,7 @@
* ========================================================================
*/
-import org.picocontainer.defaults.DefaultPicoContainer
+import org.apache.jetspeed.components.ChildAwareContainer
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.defaults.ComponentParameter
@@ -31,30 +31,11 @@
import java.io.File
-/**
- * This is the standard assembly for a Regsitry
- * component. We want the Registry component to be exposed
- * at as high the container hierarchy as possibly so, if a
- * parent container is provided, we will regsiter to the parent
- * and use it as the container for the Regsitry.
- */
-
-// Prior to this, you will need to have an Implementation
-// of org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
-// registered.
-if(parent != null)
-{
- container = new DefaultPicoContainer(parent)
- parent.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
- parent.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
-}
-else
-{
- container = new DefaultPicoContainer()
- container.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
- container.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
-}
+
+container = new ChildAwareContainer(parent)
+container.registerComponentImplementation(PortletRegistryComponent,
PortletRegistryComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
+container.registerComponentImplementation(PortletEntityAccessComponent,
PortletEntityAccessComponentImpl, new Parameter[] {new
ComponentParameter(PersistenceStoreContainer), new ConstantParameter("jetspeed")} )
+
-// This will be an empty container if "parent" was not null
return container
1.1.2.1 +1330 -0
jakarta-jetspeed-2/components/registry/src/java/META-INF/Attic/ojb_repository.xml
1.1.2.1 +906 -0
jakarta-jetspeed-2/components/registry/src/java/META-INF/Attic/otm_repository_registry.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
