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/src/java/org/apache/jetspeed/engine JetspeedEngine.java
Date Sat, 05 Jun 2004 05:13:09 GMT
taylor      2004/06/04 22:13:09

  Modified:    portal/src/java/org/apache/jetspeed/engine
                        JetspeedEngine.java
  Added:       portal/src/java/org/apache/jetspeed/pipeline/descriptor
                        ValveDescriptor.java XmlReader.java
                        BaseDescriptor.java PipelineDescriptor.java
               portal/src/java/org/apache/jetspeed/pipeline/valve
                        ContainerValve.java SecurityValve.java
                        CleanupValve.java AggregateValve.java
                        LocalizationValve.java AbstractValve.java
                        PageProfilerValve.java LayoutValve.java
                        ValveContext.java ActionValve.java Valve.java
                        CapabilityValve.java ContentValve.java
                        UserProfilerValve.java
               portal/src/java/org/apache/jetspeed/pipeline
                        PipelineException.java Pipeline.java
               jetspeed-api/src/java/org/apache/jetspeed/pipeline/descriptor
                        PipelineDescriptorApi.java ValveDescriptorApi.java
  Removed:     jetspeed-api/src/java/org/apache/jetspeed/pipeline/valve
                        Valve.java CapabilityValve.java ContainerValve.java
                        LayoutValve.java AbstractValve.java
                        LocalizationValve.java SecurityValve.java
                        ValveContext.java UserProfilerValve.java
                        ContentValve.java CleanupValve.java
                        ActionValve.java AggregateValve.java
                        PageProfilerValve.java
               jetspeed-api/src/java/org/apache/jetspeed/pipeline/descriptor
                        XmlReader.java ValveDescriptor.java
                        BaseDescriptor.java PipelineDescriptor.java
               jetspeed-api/src/java/org/apache/jetspeed/pipeline
                        Pipeline.java PipelineException.java
  Log:
  Had to move the pipeline back into /portal project temporarily (from jetspeed-api)
  There were classes here that didn't belong here
  The main problem I was having was with the betwixt descriptors using interfaces
  It just wasnt working
  We are going to refactor this anyway, and drop the XML pipeline descriptors for a pico container
and nano script to assemble the pipelines
  So this is an temporary fix
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.3       +5 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptor.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/descriptor/XmlReader.java
  
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/descriptor/BaseDescriptor.java
  
  
  
  
  1.3       +6 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptor.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/ContainerValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/SecurityValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/CleanupValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/AggregateValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/LocalizationValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/AbstractValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/PageProfilerValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/LayoutValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/ValveContext.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/ActionValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/Valve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/CapabilityValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/ContentValve.java
  
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/valve/UserProfilerValve.java
  
  
  
  
  1.4       +1 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/PipelineException.java
  
  
  
  
  1.5       +2 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/pipeline/Pipeline.java
  
  
  
  
  1.1                  jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptorApi.java
  
  Index: PipelineDescriptorApi.java
  ===================================================================
  /*
   * Copyright 2000-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.jetspeed.pipeline.descriptor;
  
  import java.util.List;
  
  import org.apache.jetspeed.pipeline.descriptor.ValveDescriptorApi;
  
  
  public interface PipelineDescriptorApi
  {
      /**
       * Add a ValveDescriptor to the Pipeline
       * descriptor
       *
       * @param ValveDescriptor
       */    
      public void addValveDescriptor(ValveDescriptorApi valveDescriptor);
  
      /**
       * Return a list of ValveDesccriptors
       *
       * @return List of ValveDesccriptors
       */
      public List getValveDescriptors();
  
      /**
       * Sets the name attribute
       *
       * @param name the new name value
       */
      public void setName(String name);
      /**
       * Gets the name attribute
       *
       * @return the name attribute 
       */
      public String getName();
      
      /**
       * Sets the id attribute of the BaseDescriptor object
       *
       * @param id the new id value
       */
      public void setId(String id);
      
      /**
       * Gets the id attribute
       *
       * @return the id attribute
       */
      public String getId();
      
  }    
  
  
  1.1                  jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptorApi.java
  
  Index: ValveDescriptorApi.java
  ===================================================================
  /*
   * Copyright 2000-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.jetspeed.pipeline.descriptor;
  
  public interface ValveDescriptorApi
  {
      /**
       * This is the full package/class name of the
       * class used for the valve.
       *
       * @param s the full package/class name used for the valve
       */
      public void setClassName(String className);
   
      /**
       * @return the full package/class name used for the valve
       */
      public String getClassName();
      
  }
  
  
  
  1.27      +6 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
  
  Index: JetspeedEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- JetspeedEngine.java	1 Jun 2004 16:48:14 -0000	1.26
  +++ JetspeedEngine.java	5 Jun 2004 05:13:09 -0000	1.27
  @@ -458,15 +458,18 @@
           PipelineDescriptor descriptor;
           try
           {
  +            System.out.println("Class loader is " + Thread.currentThread().getContextClassLoader().getClass().getName());
               pipeline = (Pipeline) pipelineClass.newInstance();
               XmlReader reader = new XmlReader(PipelineDescriptor.class);
               descriptor = (PipelineDescriptor) reader.parse(new FileInputStream(
                       file));
           }
  -        catch (Exception e)
  +        catch (Throwable e)
           {
  +            System.out.println("Failure *****************************");
  +            e.printStackTrace();
               throw new CPSInitializationException(
  -                    "Failed to read pipeline descriptor from deployment");
  +                    "Failed to read pipeline descriptor from deployment", e);
           }
           try
           {
  
  
  

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