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/cps/src/test/org/apache/jetspeed/cps/discovery TestCPSDiscovery.java
Date Tue, 03 Feb 2004 22:21:00 GMT
taylor      2004/02/03 14:21:00

  Modified:    cps/src/java/org/apache/jetspeed/cps
                        CommonPortletServices.java
  Added:       cps/src/test/org/apache/jetspeed/cps/discovery
                        TestCPSDiscovery.java
  Log:
  cleaning up discovery process of CPS services (for now disabling)
  waiting for tyrex stuff to get committed to do this properly
  
  Revision  Changes    Path
  1.4       +7 -6      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CommonPortletServices.java	3 Feb 2004 21:57:35 -0000	1.3
  +++ CommonPortletServices.java	3 Feb 2004 22:21:00 -0000	1.4
  @@ -206,17 +206,18 @@
           return null;
       }
       
  +/*
       private void publishServices()
       throws CPSInitializationException
       {
           try
           {
               Hashtable env = new Hashtable();
  -            env.put(Context.INITIAL_CONTEXT_FACTORY,  
  +             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");            
  +             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);
           }
  @@ -225,7 +226,7 @@
               throw new CPSInitializationException(e.toString()); 
           }
       }
  - 
  +*/ 
       public boolean isInitialized()
       {
           return initialized;
  
  
  
  1.1                  jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/cps/discovery/TestCPSDiscovery.java
  
  Index: TestCPSDiscovery.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *    "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.jetspeed.cps.discovery;
  
  import javax.naming.Context;
  import javax.naming.InitialContext;
  
  import org.apache.jetspeed.cps.CPSTest;
  import org.apache.jetspeed.cps.CommonPortletServices;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  /**
   * CPSDiscoveryTest
   *
   * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
   * @version $Id: TestCPSDiscovery.java,v 1.1 2004/02/03 22:21:00 taylor Exp $
   */
  public class TestCPSDiscovery extends CPSTest
  {
      /**
        * Defines the testcase name for JUnit.
        *
        * @param name the testcase's name.
        */
      public TestCPSDiscovery( String name ) 
      {
          super( name );
      }
  
      /**
       * Start the tests.
       *
       * @param args the arguments. Not used
       */
      public static void main(String args[]) 
      {
          junit.awtui.TestRunner.main( new String[] { TestCPSDiscovery.class.getName() } );
      }
  
      public void setup() 
      {
          System.out.println("Setup: Testing Email");
      }
  
      public static Test suite()
      {
          // All methods starting with "test" will be executed in the test suite.
          return new TestSuite( TestCPSDiscovery.class );
      }
      
      public void testDiscover()
            throws Exception
      {
      /*
          Context ctx = new InitialContext();
          CommonPortletServices cps = (CommonPortletServices)ctx.lookup("cps/services");
          assertNotNull("CPS is null", cps);
          assertNotNull("app root", cps.getApplicationRoot());
          System.out.println("app root = " + cps.getApplicationRoot());        
          */
      }
      
  }
  
  
  

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