avalon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze WindozeWindowManager1.xinfo WindozeWindowManager2.xinfo
Date Tue, 06 Nov 2001 11:08:36 GMT
hammant     01/11/06 03:08:36

  Modified:    apps/jesktop build.xml
               apps/jesktop/src/conf jesktop-assembly.xml
                        jesktop-config.xml jesktop-server.xml
               apps/jesktop/src/java/org/apache/avalon/jesktop/core
                        ConfigManagerImpl.java ConfigManagerImpl.xinfo
                        DesktopKernelImpl.java DesktopKernelImpl.xinfo
               apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze
                        WindozeWindowManager1.xinfo
                        WindozeWindowManager2.xinfo
  Log:
  Lookup fixes following ConfigManager changes
  
  Revision  Changes    Path
  1.14      +9 -15     jakarta-avalon-cornerstone/apps/jesktop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	2001/11/05 13:55:53	1.13
  +++ build.xml	2001/11/06 11:08:36	1.14
  @@ -42,13 +42,8 @@
          ===================================================================
     -->
     <property name="phoenix.home" value="../../../jakarta-avalon-phoenix/dist"/>
  -  <property name="phoenix.apps" value="${phoenix.home}/apps"/>
  -  <property name="install.dir" value="${phoenix.home}"/>
  -  <property name="install.bin.dir" value="${install.dir}/bin"/>
  -  <property name="install.var.dir" value="${install.dir}/var"/>  
  -  <property name="install.lib.dir" value="${install.dir}/lib"/>
  -  <property name="install.data.dir" value="${install.dir}/conf"/>
  -  <property name="install.doc.dir" value="${install.dir}/docs"/>
  +  <property name="install.dir" value="${phoenix.home}/apps"/>
  +  <property name="installvar.dir" value="${phoenix.home}/var"/>
   
     <!--
          ===================================================================
  @@ -448,20 +443,19 @@
                       Phoenix should have been shut down first
          ===================================================================
     -->
  -  <target name="install" depends="all,check-phoenix" description="Installs Jesktop into
Phoenix">
  +  <target name="install" depends="main" description="Installs into Phoenix">
  +    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
       <echo message="Installing to ${install.dir}" />    
       <copy file="${build.lib}/jesktop.sar" todir="${install.dir}" />
  -    <delete file="${install.var.dir}/jesktop-install.log" />     
  +    <delete file="${installvar.dir}/jesktop-install.log" />     
       <delete dir="${install.dir}/jesktop" />
     </target>
   
  -  <target name="check-phoenix" unless="phoenix.apps">
  -    <fail message="phoenix.apps not specified." />
  -  </target>
  +  <target name="uninstall" description="Uninstalls from Phoenix">
   
  -  <target name="uninstall" depends="check-phoenix" description="Uninstalls Jesktop from
Phoenix">
  -    <delete dir="${phoenix.apps}/${jar.name}/" />
  -    <delete file="${jar.name}.sar" dir="${phoenix.apps}"/>
  +    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  +    <delete dir="${install.dir}/jesktop/" />
  +    <delete file="jesktop.sar" dir="${install.dir}"/>
     </target>
   
     <!--
  
  
  
  1.5       +1 -1      jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-assembly.xml
  
  Index: jesktop-assembly.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-assembly.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jesktop-assembly.xml	2001/11/05 13:55:53	1.4
  +++ jesktop-assembly.xml	2001/11/06 11:08:36	1.5
  @@ -1,4 +1,4 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   
   <assembly>
   
  
  
  
  1.5       +5 -1      jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-config.xml
  
  Index: jesktop-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-config.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jesktop-config.xml	2001/11/05 13:55:53	1.4
  +++ jesktop-config.xml	2001/11/06 11:08:36	1.5
  @@ -1,4 +1,4 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <!--
                                   README!
   
  @@ -89,6 +89,10 @@
     </jesktop-kernel>
       
     <cfg-mgr>
  +      <repository destinationURL="file://./ConfigurationStore/"
  +                type="OBJECT"
  +                model="SYNCHRONOUS">
  +      </repository>  
     </cfg-mgr>
       
     <dom-builder-factory>
  
  
  
  1.4       +1 -1      jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-server.xml
  
  Index: jesktop-server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-server.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jesktop-server.xml	2001/10/28 09:29:59	1.3
  +++ jesktop-server.xml	2001/11/06 11:08:36	1.4
  @@ -1,4 +1,4 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <!--
                                   README!
   
  
  
  
  1.8       +13 -4     jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/ConfigManagerImpl.java
  
  Index: ConfigManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/ConfigManagerImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ConfigManagerImpl.java	2001/11/05 20:12:59	1.7
  +++ ConfigManagerImpl.java	2001/11/06 11:08:36	1.8
  @@ -20,6 +20,7 @@
   import org.jesktop.api.Decorator;
   
   import org.apache.avalon.cornerstone.services.store.ObjectRepository;
  +import org.apache.avalon.cornerstone.services.store.Store;
   import org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -31,6 +32,7 @@
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.jesktop.services.KernelConfigManager;
   import org.apache.avalon.jesktop.services.DesktopKernelService;
  @@ -55,20 +57,22 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class ConfigManagerImpl extends AbstractLoggable
  -        implements Block, KernelConfigManager, ConfigManager, Contextualizable, Composable,
Configurable  {
  +        implements Block, KernelConfigManager, ConfigManager, Contextualizable, Composable,
Configurable, Initializable  {
   
       private final static String CFG = "cfg-";
       private ObjectRepository mObjectRepository;
  +    private Store mStore;
       private LaunchableTargetHolder mLaunchableTargetHolder;
       private PropertyChangeSupport propChgSupport = new PropertyChangeSupport("DummyBean");
       //private HashMap configListeners = new HashMap();
       private DocumentBuilderFactory mDocumentBuilderFactory;
       private DocumentBuilder mDocumentBuilder;
  +    private Configuration mRepository;
   
  -    private ConfigManagerImpl() {
  +    public ConfigManagerImpl() {
       }
   
       public void setLaunchableTargetHolder(final LaunchableTargetHolder lth) {
  @@ -81,6 +85,7 @@
   
       public void configure(Configuration configuration)
               throws ConfigurationException {
  +        mRepository = configuration.getChild("repository");
       }
   
       /**
  @@ -93,7 +98,7 @@
        *
        */
       public void compose(ComponentManager componentManager) throws ComponentException {
  -        mObjectRepository = (ObjectRepository) componentManager.lookup(ObjectRepository.class.getName());
  +        mStore = (Store) componentManager.lookup(Store.class.getName());
           mDocumentBuilderFactory =
               (DocumentBuilderFactory) componentManager.lookup(DocumentBuilderFactory.class.getName());
           try
  @@ -106,6 +111,10 @@
           }
       }
   
  +    public void initialize()
  +            throws Exception {
  +        mObjectRepository = (ObjectRepository) mStore.select(mRepository);
  +    }
   
       /**
        * Method getObjConfig
  
  
  
  1.2       +17 -20    jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/ConfigManagerImpl.xinfo
  
  Index: ConfigManagerImpl.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/ConfigManagerImpl.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigManagerImpl.xinfo	2001/11/05 13:55:53	1.1
  +++ ConfigManagerImpl.xinfo	2001/11/06 11:08:36	1.2
  @@ -1,22 +1,19 @@
  -<?xml version="1.0"?>
  -
  +<?xml version="1.0" encoding="UTF-8"?>
   <blockinfo>
  -
  -  <!-- section to describe block -->
  -  <block>
  -    <version>1.0</version>
  -  </block>
  -
  -  <!-- services that are offered by this block -->
  -  <services>
  -    <service name="org.jesktop.config.ConfigManager" version="1.0" />
  -  </services>
  -  <dependencies>
  -    <dependency>
  -      <service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
  -    </dependency>    
  -    <dependency>
  -      <service name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
version="1.0"/>
  -    </dependency>    
  -  </dependencies> 
  +	<!-- section to describe block -->
  +	<block>
  +		<version>1.0</version>
  +	</block>
  +	<!-- services that are offered by this block -->
  +	<services>
  +		<service name="org.apache.avalon.jesktop.services.KernelConfigManager" version="1.0"/>
  +	</services>
  +	<dependencies>
  +		<dependency>
  +			<service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
  +		</dependency>
  +		<dependency>
  +			<service name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
version="1.0"/>
  +		</dependency>
  +	</dependencies>
   </blockinfo>
  
  
  
  1.12      +9 -6      jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.java
  
  Index: DesktopKernelImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DesktopKernelImpl.java	2001/11/05 13:55:53	1.11
  +++ DesktopKernelImpl.java	2001/11/06 11:08:36	1.12
  @@ -16,6 +16,7 @@
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.cornerstone.services.store.Store;
  @@ -103,6 +104,7 @@
       protected MimeManager mMimeManager;
       protected MimeManager mMimeManagerProxy;
       private File mBaseDirectory;
  +    private Configuration mRepository;
   
       /**
        * Constructor DesktopKernelImpl
  @@ -188,8 +190,9 @@
        * @param confManager
        *
        */
  -    public void configure(final Configuration confManager) {
  +    public void configure(final Configuration confManager) throws ConfigurationException
{
           this.phoenixConfiguration = confManager;
  +        mRepository = phoenixConfiguration.getChild("repository");
       }
   
       /**
  @@ -231,14 +234,14 @@
               mWindowManager = (WindowManager) mCompManager.lookup(WindowManager.ROLE);
               mJesktopStore =  (Store) mCompManager.lookup(Store.ROLE);
               mThreadManager = (ThreadManager) mCompManager.lookup(ThreadManager.ROLE);
  -            mConfigManager = (KernelConfigManager) mCompManager.lookup(ConfigManager.class.getName());
  +            mConfigManager = (KernelConfigManager) mCompManager.lookup(KernelConfigManager.class.getName());
   
               Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
   
  -            Configuration repConf = phoenixConfiguration.getChild("repository");
   
  +
               if (mJesktopStore != null) {
  -                repository = (ObjectRepository) mJesktopStore.select(repConf);
  +                repository = (ObjectRepository) mJesktopStore.select(mRepository);
   
                   if (LOG) {
                       getLogger().info("Got repository");
  @@ -783,7 +786,7 @@
        *
        *
        * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  -     * @version $Revision: 1.11 $
  +     * @version $Revision: 1.12 $
        */
       private class KernelLaunchedTarget extends LaunchedTargetImpl {
   
  @@ -844,7 +847,7 @@
        *
        *
        * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  -     * @version $Revision: 1.11 $
  +     * @version $Revision: 1.12 $
        */
       private class KernelFrimbleListener extends FrimbleAdapter {
   
  
  
  
  1.7       +23 -26    jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.xinfo
  
  Index: DesktopKernelImpl.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.xinfo,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DesktopKernelImpl.xinfo	2001/11/05 23:28:00	1.6
  +++ DesktopKernelImpl.xinfo	2001/11/06 11:08:36	1.7
  @@ -1,28 +1,25 @@
  -<?xml version="1.0"?>
  -
  +<?xml version="1.0"  encoding="UTF-8"?>
   <blockinfo>
  -
  -  <!-- section to describe block -->
  -  <block>
  -    <version>1.0</version>
  -  </block>
  -
  -  <!-- services that are offered by this block -->
  -  <services>
  -    <service name="org.apache.avalon.jesktop.services.DesktopKernelService" version="1.0"/>
  -  </services>
  -  <dependencies>
  -    <dependency>
  -      <service name="org.jesktop.api.WindowManager" version="1.0"/>
  -    </dependency>
  -    <dependency>
  -      <service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
  -    </dependency>
  -    <dependency>
  -      <service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
  -    </dependency>
  -    <dependency>
  -      <service name="org.apache.avalon.jesktop.services.KernelConfigManager" version="1.0"/>
  -    </dependency>
  -  </dependencies> 
  +	<!-- section to describe block -->
  +	<block>
  +		<version>1.0</version>
  +	</block>
  +	<!-- services that are offered by this block -->
  +	<services>
  +		<service name="org.apache.avalon.jesktop.services.DesktopKernelService" version="1.0"/>
  +	</services>
  +	<dependencies>
  +		<dependency>
  +			<service name="org.jesktop.api.WindowManager" version="1.0"/>
  +		</dependency>
  +		<dependency>
  +			<service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
  +		</dependency>
  +		<dependency>
  +			<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
  +		</dependency>
  +		<dependency>
  +			<service name="org.apache.avalon.jesktop.services.KernelConfigManager" version="1.0"/>
  +		</dependency>
  +	</dependencies>
   </blockinfo>
  
  
  
  1.3       +9 -13     jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager1.xinfo
  
  Index: WindozeWindowManager1.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager1.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WindozeWindowManager1.xinfo	2001/09/20 15:15:55	1.2
  +++ WindozeWindowManager1.xinfo	2001/11/06 11:08:36	1.3
  @@ -1,15 +1,11 @@
  -<?xml version="1.0"?>
  -
  +<?xml version="1.0"  encoding="UTF-8"?>
   <blockinfo>
  -
  -  <!-- section to describe block -->
  -  <block>
  -    <version>1.0</version>
  -  </block>
  -
  -  <!-- services that are offered by this block -->
  -  <services>
  -    <service name="org.jesktop.api.WindowManager" version="1.0" />
  -  </services>
  -
  +	<!-- section to describe block -->
  +	<block>
  +		<version>1.0</version>
  +	</block>
  +	<!-- services that are offered by this block -->
  +	<services>
  +		<service name="org.jesktop.api.WindowManager" version="1.0"/>
  +	</services>
   </blockinfo>
  
  
  
  1.3       +9 -13     jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager2.xinfo
  
  Index: WindozeWindowManager2.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager2.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WindozeWindowManager2.xinfo	2001/09/20 15:15:55	1.2
  +++ WindozeWindowManager2.xinfo	2001/11/06 11:08:36	1.3
  @@ -1,15 +1,11 @@
  -<?xml version="1.0"?>
  -
  +<?xml version="1.0"  encoding="UTF-8"?>
   <blockinfo>
  -
  -  <!-- section to describe block -->
  -  <block>
  -    <version>1.0</version>
  -  </block>
  -
  -  <!-- services that are offered by this block -->
  -  <services>
  -    <service name="org.jesktop.api.WindowManager" version="1.0" />
  -  </services>
  -
  +	<!-- section to describe block -->
  +	<block>
  +		<version>1.0</version>
  +	</block>
  +	<!-- services that are offered by this block -->
  +	<services>
  +		<service name="org.jesktop.api.WindowManager" version="1.0"/>
  +	</services>
   </blockinfo>
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-dev-help@jakarta.apache.org>


Mime
View raw message