portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/containers prefs.container.groovy
Date Mon, 19 Apr 2004 21:08:45 GMT
weaver      2004/04/19 14:08:45

  Modified:    components/persistence/src/java/org/apache/jetspeed/components/omfactory
                        Tag: NANOCONTAINER_DEPLOYER
                        OMFactoryComponentImpl.java
               components/prefs Tag: NANOCONTAINER_DEPLOYER project.xml
                        project.properties
               components/persistence/src/java/org/apache/jetspeed/containers
                        Tag: NANOCONTAINER_DEPLOYER
                        persistence.container.groovy
               components/rdbms Tag: NANOCONTAINER_DEPLOYER project.xml
                        project.properties
               components/persistence/src/test/org/apache/jetspeed/components/persistence
                        Tag: NANOCONTAINER_DEPLOYER
                        TestPersistenceContainer.java
               components/prefs/src/java/org/apache/jetspeed/prefs/containers
                        Tag: NANOCONTAINER_DEPLOYER prefs.container.groovy
  Log:
  starting new branch for using nano deployer
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.1   +2 -3      jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/omfactory/OMFactoryComponentImpl.java
  
  Index: OMFactoryComponentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/components/omfactory/OMFactoryComponentImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- OMFactoryComponentImpl.java	8 Mar 2004 00:46:21 -0000	1.2
  +++ OMFactoryComponentImpl.java	19 Apr 2004 21:08:45 -0000	1.2.2.1
  @@ -20,10 +20,9 @@
   import java.util.Map;
   import java.util.Properties;
   
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.picocontainer.defaults.ConstructorComponentAdapterFactory;
  +import org.picocontainer.defaults.ConstructorInjectionComponentAdapterFactory;
   import org.picocontainer.defaults.DefaultPicoContainer;
   
   
  @@ -46,7 +45,7 @@
       public OMFactoryComponentImpl(Properties props)
       {
           // We allways want new instance of the object model
  -        super(new ConstructorComponentAdapterFactory());
  +        super(new ConstructorInjectionComponentAdapterFactory());
           this.props = props;
           this.classMap = new HashMap();
       }
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -1      jakarta-jetspeed-2/components/prefs/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- project.xml	29 Mar 2004 04:54:39 -0000	1.5
  +++ project.xml	19 Apr 2004 21:08:45 -0000	1.5.2.1
  @@ -191,7 +191,7 @@
       </dependency>
       <dependency>
         <id>picocontainer</id>
  -      <version>1.0-beta-5-SNAPSHOT</version>
  +      <version>1.0-RC-1-SNAPSHOT</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  
  1.7.2.1   +1 -1      jakarta-jetspeed-2/components/prefs/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.properties,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- project.properties	29 Mar 2004 04:54:39 -0000	1.7
  +++ project.properties	19 Apr 2004 21:08:45 -0000	1.7.2.1
  @@ -13,7 +13,7 @@
   # limitations under the License.
   
   # Remote repos
  -maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
  +maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,http://dist.codehaus.org
   
   # Display the date on the Maven web site
   maven.xdoc.date = left
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +4 -3      jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/containers/persistence.container.groovy
  
  Index: persistence.container.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/src/java/org/apache/jetspeed/containers/persistence.container.groovy,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- persistence.container.groovy	9 Mar 2004 16:16:14 -0000	1.4
  +++ persistence.container.groovy	19 Apr 2004 21:08:45 -0000	1.4.2.1
  @@ -5,7 +5,8 @@
   import org.apache.jetspeed.components.persistence.store.impl.DefaultPersistenceStoreContainer
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
   import org.picocontainer.ComponentAdapter
  -import org.picocontainer.defaults.ConstructorComponentAdapter
  +import org.picocontainer.defaults.ConstructorInjectionComponentAdapter
  +import org.apache.jetspeed.components.MultiStartPicoContainerWrapper
   
   
   container = new DefaultPersistenceStoreContainer(15000, 10000)
  @@ -17,9 +18,9 @@
    parent.registerComponentInstance(PersistenceStoreContainer, container);
   }
   
  -ComponentAdapter ca = new ConstructorComponentAdapter("jetspeed", PBStore, new Parameter[]
{new ConstantParameter("jetspeed")})
  +ComponentAdapter ca = new ConstructorInjectionComponentAdapter("jetspeed", PBStore, new
Parameter[] {new ConstantParameter("jetspeed")})
   
   container.registerComponent(ca)
   
   
  -return container
  \ No newline at end of file
  +return new MultiStartPicoContainerWrapper(container)
  \ No newline at end of file
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +15 -1     jakarta-jetspeed-2/components/rdbms/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- project.xml	29 Mar 2004 04:55:32 -0000	1.3
  +++ project.xml	19 Apr 2004 21:08:45 -0000	1.3.2.1
  @@ -49,6 +49,20 @@
         </properties>
       </dependency>
       <dependency>
  +      <id>commons-vfs</id>
  +      <version>SNAPSHOT</version>
  +      <properties>
  +        <war.bundle.jar>true</war.bundle.jar>
  +      </properties>
  +    </dependency>
  +    <dependency>
  +      <id>nanocontainer:nanocontainer-deployer</id>
  +      <version>1.0-beta-1-SNAPSHOT</version>
  +      <properties>
  +        <war.bundle.jar>true</war.bundle.jar>
  +      </properties>
  +    </dependency> 
  +    <dependency>
         <id>commons-dbcp</id>
         <version>1.1</version>
         <properties>
  @@ -113,7 +127,7 @@
       </dependency>
       <dependency>
         <id>picocontainer</id>
  -      <version>1.0-beta-5-SNAPSHOT</version>
  +      <version>1.0-RC-1-SNAPSHOT</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  
  1.4.2.1   +1 -1      jakarta-jetspeed-2/components/rdbms/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/project.properties,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- project.properties	29 Mar 2004 04:55:32 -0000	1.4
  +++ project.properties	19 Apr 2004 21:08:45 -0000	1.4.2.1
  @@ -13,7 +13,7 @@
   # limitations under the License.
   
   # Remote repos
  -maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
  +maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,http://dist.codehaus.org
   
   # Display the date on the Maven web site
   maven.xdoc.date = left
  
  
  
  No                   revision
  No                   revision
  1.10.2.1  +10 -4     jakarta-jetspeed-2/components/persistence/src/test/org/apache/jetspeed/components/persistence/TestPersistenceContainer.java
  
  Index: TestPersistenceContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/src/test/org/apache/jetspeed/components/persistence/TestPersistenceContainer.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- TestPersistenceContainer.java	9 Mar 2004 16:15:37 -0000	1.10
  +++ TestPersistenceContainer.java	19 Apr 2004 21:08:45 -0000	1.10.2.1
  @@ -14,12 +14,14 @@
    * limitations under the License.
    */
   package org.apache.jetspeed.components.persistence;
  +import java.io.File;
  +import java.net.MalformedURLException;
   import java.util.ArrayList;
   
   import junit.framework.Test;
   
   import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
  -import org.apache.jetspeed.components.ComponentAwareTestSuite;
  +import org.apache.jetspeed.components.NanoDeployerBasedTestSuite;
   import org.apache.jetspeed.components.persistence.store.Filter;
   import org.apache.jetspeed.components.persistence.store.PersistenceStore;
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
  @@ -52,10 +54,14 @@
           // TODO Auto-generated constructor stub
       }
   
  -    public static Test suite()
  +    public static Test suite() throws MalformedURLException
       {
  -        ComponentAwareTestSuite suite = new ComponentAwareTestSuite(TestPersistenceContainer.class);
  -        suite.setScript("org/apache/jetspeed/containers/test.persistence.groovy");
  +       // ComponentAwareTestSuite suite = new ComponentAwareTestSuite(TestPersistenceContainer.class);
  +       //  suite.setScript("org/apache/jetspeed/containers/test.persistence.groovy");
  +
  +        NanoDeployerBasedTestSuite suite = new NanoDeployerBasedTestSuite(TestPersistenceContainer.class);
  +        // suite.setScript("org/apache/jetspeed/containers/rdbms.container.groovy");
  +        
           
           return suite;
       }
  
  
  
  No                   revision
  No                   revision
  1.6.2.1   +1 -1      jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/containers/prefs.container.groovy
  
  Index: prefs.container.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/containers/prefs.container.groovy,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- prefs.container.groovy	18 Mar 2004 19:32:19 -0000	1.6
  +++ prefs.container.groovy	19 Apr 2004 21:08:45 -0000	1.6.2.1
  @@ -18,7 +18,7 @@
   import org.picocontainer.Parameter
   import org.picocontainer.defaults.ConstantParameter
   import org.picocontainer.defaults.ComponentParameter
  -import org.picocontainer.defaults.ConstructorComponentAdapter
  +import org.picocontainer.defaults.ConstructorInjectionComponentAdapter
   
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message