forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/resources/forrestbar/content/forrestbar forrestbarOverlay.xul
Date Tue, 25 Feb 2003 23:30:48 GMT
nicolaken    2003/02/25 15:30:46

  Modified:    .        build.xml properties.xml status.xml
               src/resources/forrestbar/content/forrestbar
                        forrestbarOverlay.xul
  Log:
        <action dev="NKB" type="update" context="forrestbar">
          Added links for both possible local forrests (port 8080 and 8888),
          and make them configurable in properties.xml.
          Thanks to Mark Vovsi for pointing it out.
        </action>
  
  Revision  Changes    Path
  1.59      +18 -2     xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- build.xml	12 Jan 2003 12:30:19 -0000	1.58
  +++ build.xml	25 Feb 2003 23:30:46 -0000	1.59
  @@ -475,11 +475,27 @@
     <target name="forrestbar" depends="init">
       <mkdir dir="${build.dir}" />
       <mkdir dir="${build.dir}/work/forrestbar" />
  +    <mkdir dir="${build.dir}/work/forrestbar-jar" />
  +    <copy todir="${build.dir}/work/forrestbar-jar" overwrite="true">
  +      <fileset dir="src/resources/forrestbar" 
  +               includes="content/**/*.xul" />
  +      <filterset>
  +        <filter token="EMBEDDED_NAME" value="${forrestbot.links.forrest.local-embedded.name}"/>
  +        <filter token="EMBEDDED_URL" value="${forrestbot.links.forrest.local-embedded.url}"/>

  +        <filter token="WEBAPP_NAME" value="${forrestbot.links.forrest.local-webapp.name}"/>
  +        <filter token="WEBAPP_URL" value="${forrestbot.links.forrest.local-webapp.url}"/>

  +      </filterset>
  +    </copy>
  +    <copy todir="${build.dir}/work/forrestbar-jar" overwrite="true">
  +      <fileset dir="src/resources/forrestbar" 
  +               excludes="content/**/*.xul" />
  +    </copy>
       <jar jarfile="${build.dir}/work/forrestbar/forrestbar.jar">
  -      <fileset dir="src/resources/forrestbar" includes="content/**/*" />
  +      <fileset dir="${build.dir}/work/forrestbar-jar" includes="content/**/*" />
       </jar>
       <copy file="src/resources/forrestbar/install.js" 
  -      todir="${build.dir}/work/forrestbar" overwrite="true" />
  +          todir="${build.dir}/work/forrestbar" overwrite="true">
  +    </copy>
       <zip zipfile="${build.dir}/forrestbar.xpi" 
         basedir="${build.dir}/work/forrestbar" />
     </target>
  
  
  
  1.4       +9 -0      xml-forrest/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/properties.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- properties.xml	12 Feb 2003 12:40:12 -0000	1.3
  +++ properties.xml	25 Feb 2003 23:30:46 -0000	1.4
  @@ -20,6 +20,15 @@
          vm="1.2" />
      </build>
   
  +   <forrestbot>
  +     <links>
  +       <forrest>
  +         <local-embedded name="Local Forrest (embedded)" url="http://127.0.0.1:8888/"/>
  +         <local-webapp name="Local Forrest (webapp)" url="http://127.0.0.1:8080/"/>

  +       </forrest>   
  +     </links>
  +   </forrestbot>
  +      
      <centipede>
         <tools>
            <cents repository="http://krysalis.org/jjar/">
  
  
  
  1.131     +5 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- status.xml	18 Feb 2003 12:30:21 -0000	1.130
  +++ status.xml	25 Feb 2003 23:30:46 -0000	1.131
  @@ -24,6 +24,11 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="NKB" type="update" context="forrestbar">
  +        Added links for both possible local forrests (port 8080 and 8888),
  +        and make them configurable in properties.xml.
  +        Thanks to Mark Vovsi for pointing it out.
  +      </action>
         <action dev="JT" type="fix" context="shbat">
           Fix a bug with forrest.antproxy.xml introduced in 0.4, which caused
           unresolved '${project.home}' variables.
  
  
  
  1.10      +7 -1      xml-forrest/src/resources/forrestbar/content/forrestbar/forrestbarOverlay.xul
  
  Index: forrestbarOverlay.xul
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbar/content/forrestbar/forrestbarOverlay.xul,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- forrestbarOverlay.xul	23 Jan 2003 14:44:28 -0000	1.9
  +++ forrestbarOverlay.xul	25 Feb 2003 23:30:46 -0000	1.10
  @@ -83,7 +83,8 @@
        <menupopup>
          <menuitem label="Home" onclick="navigate('http://xml.apache.org/forrest/');"
/>
          <menuseparator />
  -       <menuitem label="Local Forrest" onclick="navigate('http://127.0.0.1:8888/');"
hidden="false" />
  +       <menuitem label="@EMBEDDED_NAME@" onclick="navigate('@EMBEDDED_URL@');" hidden="false"
/>
  +       <menuitem label="@WEBAPP_NAME@" onclick="navigate('@WEBAPP_URL@');" hidden="false"
/>    
          <menuitem label="Browse" onclick="navigate('http://127.0.0.1:8888/edit/');" hidden="false"
/>
          <menuseparator />       
          <menuitem label="Edit Page Content-View" onclick="editPage(window._content.document.location.href+'?cocoon-view=content',
window, false);" hidden="false" />
  @@ -92,6 +93,11 @@
        </menupopup>
      </toolbarbutton>
   
  +
  +
  +   
  +   
  +   
      <toolbarbutton class="forrestbar" id="forrestbar-gump-nightly"   label="Gump"  hidden="false"
type="menu">
       <menupopup>
         <menuitem label="Home" onclick="navigate('http://jakarta.apache.org/gump/');"
/>
  
  
  

Mime
View raw message