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/webapp/WEB-INF/conf jetspeed.properties
Date Wed, 10 Mar 2004 03:11:50 GMT
taylor      2004/03/09 19:11:50

  Modified:    portal   project.xml
               portal/src/java/org/apache/jetspeed/engine
                        JetspeedEngine.java
               portal/src/webapp/WEB-INF/conf jetspeed.properties
  Log:
  made assembly file location configurable
  we may move the assembly file into the classpath in the future
  however it is up to discussion since i see a fundamental problem with doing that
  If someone wants to swap a service, they need to put a new assembly in the classpath
  this is more complicated than simply editing a property file
  
  Revision  Changes    Path
  1.46      +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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- project.xml	10 Mar 2004 02:06:33 -0000	1.45
  +++ project.xml	10 Mar 2004 03:11:50 -0000	1.46
  @@ -401,7 +401,7 @@
     </dependencies>
     <build>
       <sourceDirectory>src/java</sourceDirectory>
  -    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  +    <unitTestSourceDirectory>src/xtest</unitTestSourceDirectory>
       <unitTest>
         <excludes>
           <exclude>org/apache/jetspeed/aggregator/TestAggregator.java</exclude>
  
  
  
  1.18      +5 -4      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JetspeedEngine.java	8 Mar 2004 00:26:46 -0000	1.17
  +++ JetspeedEngine.java	10 Mar 2004 03:11:50 -0000	1.18
  @@ -115,7 +115,7 @@
               //
               // bootstrap the initable services
               //
  -            initComponents();
  +            initComponents(configuration);
               log.info("Components initialization complete");            
               initServices();
               log.info("Service initialization complete");            
  @@ -286,10 +286,11 @@
           }
           return base.concat(path);
       }
  -    private void initComponents() throws IOException, ClassNotFoundException, NamingException
  +    private void initComponents(Configuration configuration) throws IOException, ClassNotFoundException,
NamingException
       {
           String applicationRoot = getRealPath("/");
  -        File containerAssembler = new File(applicationRoot + "/WEB-INF/assembly/jetspeed.groovy");
  +        String assemblyScript = configuration.getString("jetspeed.root.assembly", "/WEB-INF/assembly/jetspeed.groovy");
  +        File containerAssembler = new File(applicationRoot + assemblyScript);
           componentManager = new ComponentManager(containerAssembler);
           ObjectReference rootContainerRef = new SimpleReference();
           componentManager.getContainerBuilder().buildContainer(rootContainerRef, null, "PORTAL_SCOPE");
  
  
  
  1.44      +7 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- jetspeed.properties	6 Mar 2004 18:41:31 -0000	1.43
  +++ jetspeed.properties	10 Mar 2004 03:11:50 -0000	1.44
  @@ -149,4 +149,9 @@
   #services.autodeployment.staging.dir=WEB-INF/deploy
   #services.autodeployment.target.dir=../
   #services.autodeployment.delay=10000
  -#services.autodeployment.earlyInit = true
  \ No newline at end of file
  +#services.autodeployment.earlyInit = true
  +
  +#-------------------------------------------------------------------------
  +# A S S E M B L Y (note may move this to class path)
  +#-------------------------------------------------------------------------
  +jetspeed.root.assembly = /WEB-INF/assembly/jetspeed.groovy
  
  
  

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