portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal project.xml
Date Tue, 03 Feb 2004 21:57:35 GMT
taylor      2004/02/03 13:57:35

  Modified:    commons  project.xml
               cornerstone project.xml
               cornerstone-demo project.xml
               cps      maven.xml
               cps/src/java/org/apache/jetspeed/cps
                        CommonPortletServices.java
               plugin   project.xml
               portal   project.xml
  Log:
  upgraded to latest Bean Utils 1.6.1
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-jetspeed-2/commons/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/commons/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	9 Jan 2004 04:58:03 -0000	1.6
  +++ project.xml	3 Feb 2004 21:57:35 -0000	1.7
  @@ -35,7 +35,7 @@
       </dependency>
       <dependency>
         <id>commons-beanutils</id>
  -      <version>1.6</version>
  +      <version>1.6.1</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  
  1.2       +1 -1      jakarta-jetspeed-2/cornerstone/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	23 Oct 2003 21:00:53 -0000	1.1
  +++ project.xml	3 Feb 2004 21:57:35 -0000	1.2
  @@ -14,7 +14,7 @@
     <dependencies>
     	 <dependency>
         <id>commons-beanutils</id>
  -      <version>1.6</version>
  +      <version>1.6.1</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/cornerstone-demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone-demo/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Dec 2003 19:12:24 -0000	1.2
  +++ project.xml	3 Feb 2004 21:57:35 -0000	1.3
  @@ -40,7 +40,7 @@
     	
     	 <dependency>
         <id>commons-beanutils</id>
  -      <version>1.6</version>
  +      <version>1.6.1</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/cps/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/cps/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	12 Jan 2004 18:21:25 -0000	1.3
  +++ maven.xml	3 Feb 2004 21:57:35 -0000	1.4
  @@ -4,7 +4,7 @@
            xmlns:reactor="reactor">
   
     <!-- Target of maven test:single test -->
  -  <property name='testcase' value='org.apache.jetspeed.cps.rewriter.TestRewriterRules'/>
 
  +  <property name='testcase' value='org.apache.jetspeed.cps.discovery.TestCPSDiscovery'/>
 
     
      <goal name="deployJar">
     	<attainGoal name="jar:install"/>
  
  
  
  1.3       +39 -3     jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/CommonPortletServices.java
  
  Index: CommonPortletServices.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/cps/src/java/org/apache/jetspeed/cps/CommonPortletServices.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CommonPortletServices.java	18 Oct 2003 19:52:15 -0000	1.2
  +++ CommonPortletServices.java	3 Feb 2004 21:57:35 -0000	1.3
  @@ -53,9 +53,14 @@
    */
   package org.apache.jetspeed.cps;
   
  +import java.util.Hashtable;
   import java.util.Properties;
   import java.io.FileInputStream;
   
  +import javax.naming.Context;
  +import javax.naming.InitialContext;
  +import javax.naming.NamingException;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.commons.logging.impl.Log4jFactory;
  @@ -77,6 +82,8 @@
   
       private static final Log log = LogFactory.getLog(CommonPortletServices.class);
   
  +    private boolean initialized = false;
  +    
       /**
        * This constructor is protected to force clients to use
        * getInstance() to access this class.
  @@ -92,7 +99,7 @@
        * @return The single instance of this class.
        */
       public static CommonPortletServices getInstance()
  -    {
  +    {        
           return instance;
       }
   
  @@ -116,6 +123,11 @@
       {
           try
           {
  +            if (initialized)
  +            {
  +                return;
  +            }
  +            
               //
               // bootstrap the initable services
               //
  @@ -193,5 +205,29 @@
           }
           return null;
       }
  -
  +    
  +    private void publishServices()
  +    throws CPSInitializationException
  +    {
  +        try
  +        {
  +            Hashtable env = new Hashtable();
  +            env.put(Context.INITIAL_CONTEXT_FACTORY,  
  +                "com.sun.jndi.fscontext.FSContextFactory");
  +            env.put(Context.PROVIDER_URL, "file:/");
  +            //env.put(Context.OBJECT_FACTORIES, "foo.bar.ObjFactory");
  +            //env.put("foo", "bar");            
  +            Context ctx = new InitialContext(env);        
  +            ctx.bind("cps/services", this);
  +        }
  +        catch (NamingException e)
  +        {
  +            throw new CPSInitializationException(e.toString()); 
  +        }
  +    }
  + 
  +    public boolean isInitialized()
  +    {
  +        return initialized;
  +    }
   }
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/plugin/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	3 Feb 2004 21:47:16 -0000	1.4
  +++ project.xml	3 Feb 2004 21:57:35 -0000	1.5
  @@ -28,7 +28,7 @@
       </dependency>
       <dependency>
         <id>commons-beanutils</id>
  -      <version>1.6</version>
  +      <version>1.6.1</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  
  1.26      +1 -1      jakarta-jetspeed-2/portal/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- project.xml	3 Feb 2004 20:59:29 -0000	1.25
  +++ project.xml	3 Feb 2004 21:57:35 -0000	1.26
  @@ -37,7 +37,7 @@
       </dependency>
       <dependency>
         <id>commons-beanutils</id>
  -      <version>1.6</version>
  +      <version>1.6.1</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
         </properties>
  
  
  

---------------------------------------------------------------------
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