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/pages default-page.psml p001.psml p002.psml
Date Thu, 11 Mar 2004 21:45:55 GMT
taylor      2004/03/11 13:45:55

  Modified:    portal   project.xml
               portal/src/java/org/apache/jetspeed/engine
                        JetspeedEngine.java
               portal/src/test/org/apache/jetspeed/services/jmx
                        TestJMX.java
               portal/src/webapp/WEB-INF/conf jetspeed.properties
               portal/src/webapp/WEB-INF/pages default-page.psml p001.psml
                        p002.psml
  Log:
  removed JMX
  
  Revision  Changes    Path
  1.48      +1 -0      jakarta-jetspeed-2/portal/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- project.xml	10 Mar 2004 03:16:28 -0000	1.47
  +++ project.xml	11 Mar 2004 21:45:54 -0000	1.48
  @@ -407,6 +407,7 @@
           <exclude>org/apache/jetspeed/aggregator/TestAggregator.java</exclude>
           <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
           <exclude>org/apache/jetspeed/test/JetspeedTestSuite</exclude>
  +        <exclude>org/apache/jetspeed/services/jmx/TestJMX</exclude>
           <!-- Excluded due to persistence plugin issues -->
           <exclude>org/apache/jetspeed/security/Test*.java</exclude>
           <!-- End Excluded due to persistence plugin issues -->
  
  
  
  1.19      +4 -5      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JetspeedEngine.java	10 Mar 2004 03:11:50 -0000	1.18
  +++ JetspeedEngine.java	11 Mar 2004 21:45:54 -0000	1.19
  @@ -45,7 +45,6 @@
   import org.apache.jetspeed.services.factory.FactoryManager;
   import org.apache.jetspeed.services.information.InformationProviderManager;
   import org.apache.jetspeed.services.information.InformationProviderServiceService;
  -import org.apache.jetspeed.services.jmx.JMX;
   import org.apache.log4j.PropertyConfigurator;
   import org.apache.pluto.PortletContainer;
   import org.apache.pluto.PortletContainerException;
  @@ -137,9 +136,9 @@
               // 
               // Make sure JMX is init'd
               //
  -            log.info("Jump starting JMX MBean services...");
  -            JMX.startJMX();
  -            log.info("JMX services sucessfully started.");
  +            // log.info("Jump starting JMX MBean services...");
  +            // JMX.startJMX();
  +            // log.info("JMX services sucessfully started.");
           }
           catch (Throwable e)
           {
  
  
  
  1.4       +6 -2      jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/jmx/TestJMX.java
  
  Index: TestJMX.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/jmx/TestJMX.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestJMX.java	8 Mar 2004 00:38:17 -0000	1.3
  +++ TestJMX.java	11 Mar 2004 21:45:54 -0000	1.4
  @@ -87,6 +87,8 @@
        */
       public void testJMX() throws Exception
       {
  +        
  +/* fucking maven!        
           try
           {
               String[] beans = JMX.getManagedBeans();
  @@ -108,11 +110,12 @@
               e.printStackTrace();
               assertNotNull(errmsg, null);
           }
  +*/        
       }
   
       public void testRemoteJMX()
       {
  -
  +/*
           try
           {
               JMX.startJMX();
  @@ -145,6 +148,7 @@
               //  e.printStackTrace();
               fail(e.getMessage());
           }
  +*/        
       }
   
       private String lastGroup = "";
  
  
  
  1.45      +4 -4      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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- jetspeed.properties	10 Mar 2004 03:11:50 -0000	1.44
  +++ jetspeed.properties	11 Mar 2004 21:45:55 -0000	1.45
  @@ -128,9 +128,9 @@
   #-------------------------------------------------------------------------
   # J M X   S E R V I C E 
   #-------------------------------------------------------------------------
  -services.JMXService.classname=org.apache.jetspeed.services.jmx.JetspeedJMXService
  -services.JMXService.mbeans=Registry
  -services.JMXService.mbeans.Registry=org.apache.jetspeed.mbeans.registry.RegistryMBeanImpl
  +# services.JMXService.classname=org.apache.jetspeed.services.jmx.JetspeedJMXService
  +# services.JMXService.mbeans=Registry
  +# services.JMXService.mbeans.Registry=org.apache.jetspeed.mbeans.registry.RegistryMBeanImpl
   
   #-------------------------------------------------------------------------
   # C A P A B I L I T Y,  C O N T E N T  E N C O D I N G  
  
  
  
  1.9       +3 -7      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml
  
  Index: default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- default-page.psml	10 Mar 2004 07:55:28 -0000	1.8
  +++ default-page.psml	11 Mar 2004 21:45:55 -0000	1.9
  @@ -10,21 +10,17 @@
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>                                
  -    <fragment id="pe002" entity="4" type="portlet" name="HW_App::JMXPortlet">
  +    <fragment id="pe002" entity="5" type="portlet" name="HW_App::PreferencePortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  -    <fragment id="pe003" entity="5" type="portlet" name="HW_App::PreferencePortlet">
  +    <fragment id="pe003" entity="9" type="portlet" name="HW_App::CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" entity="9" type="portlet" name="HW_App::CustomerList">
  +    <fragment id="pe004" entity="13" type="portlet" name="PAM::PortletApplicationBrowser">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
  -    </fragment>
  -    <fragment id="pe005" entity="13" type="portlet" name="PAM::PortletApplicationBrowser">
  -      <property layout="TwoColumns" name="row" value="1" />
  -      <property layout="TwoColumns" name="column" value="2" />
       </fragment>
     </fragment>
   </page>
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- p001.psml	10 Mar 2004 07:55:28 -0000	1.4
  +++ p001.psml	11 Mar 2004 21:45:55 -0000	1.5
  @@ -11,7 +11,7 @@
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe002" entity="4" type="portlet" name="HW_App::JMXPortlet">
  +    <fragment id="pe002" entity="4" type="portlet" name="PAM::PortletApplicationBrowser">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml
  
  Index: p002.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- p002.psml	10 Mar 2004 07:55:28 -0000	1.4
  +++ p002.psml	11 Mar 2004 21:45:55 -0000	1.5
  @@ -13,7 +13,7 @@
       <fragment id="p002-04" entity="9" type="portlet" name="HW_App::CustomerList"/>
       <fragment id="p002-05" entity="10" type="portlet" name="HW_App::CustomerInfo"/>
       <fragment id="p002-06" entity="11" type="portlet" name="HW_App::CustomerDetail"/>
  -    <fragment id="p002-07" entity="4" type="portlet" name="HW_App::JMXPortlet"/>
  +    <fragment id="p002-07" entity="4" type="portlet" name="PAM::PortletApplicationBrowser"/>
       <fragment id="p002-08" entity="5" type="portlet" name="HW_App::PreferencePortlet"/>
     </fragment>
   </page>
  
  
  

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