1.1 --- a/lib/jedit/plugin/Isabelle.props	Sun Aug 24 17:23:42 2008 +0200
     1.2 +++ b/lib/jedit/plugin/Isabelle.props	Sun Aug 24 18:11:20 2008 +0200
     1.3 @@ -2,21 +2,21 @@
     1.4  ## $Id$
     1.5  
     1.6  #identification
     1.7 -plugin.isabelle.IsabellePlugin.name = Isabelle
     1.8 -plugin.isabelle.IsabellePlugin.author = Makarius
     1.9 -plugin.isabelle.IsabellePlugin.version = 0.0.1
    1.10 -plugin.isabelle.IsabellePlugin.description = Basic Isabelle support
    1.11 +plugin.isabelle.jedit.IsabellePlugin.name = Isabelle
    1.12 +plugin.isabelle.jedit.IsabellePlugin.author = Makarius
    1.13 +plugin.isabelle.jedit.IsabellePlugin.version = 0.0.1
    1.14 +plugin.isabelle.jedit.IsabellePlugin.description = Basic Isabelle support
    1.15  
    1.16  #system parameters
    1.17 -plugin.isabelle.IsabellePlugin.activate = defer
    1.18 -plugin.isabelle.IsabellePlugin.usePluginHome = false
    1.19 +plugin.isabelle.jedit.IsabellePlugin.activate = defer
    1.20 +plugin.isabelle.jedit.IsabellePlugin.usePluginHome = false
    1.21  
    1.22  #dependencies
    1.23 -plugin.isabelle.IsabellePlugin.depend.0 = jdk 1.5
    1.24 -plugin.isabelle.IsabellePlugin.depend.1 = jedit 04.03.00.00
    1.25 -plugin.isabelle.IsabellePlugin.depend.2 = plugin errorlist.ErrorListPlugin 1.7
    1.26 -plugin.isabelle.IsabellePlugin.depend.3 = plugin sidekick.SideKickPlugin 0.7.4
    1.27 -plugin.isabelle.IsabellePlugin.depend.4 = plugin console.ConsolePlugin 4.3.4
    1.28 +plugin.isabelle.jedit.IsabellePlugin.depend.0 = jdk 1.5
    1.29 +plugin.isabelle.jedit.IsabellePlugin.depend.1 = jedit 04.03.00.00
    1.30 +plugin.isabelle.jedit.IsabellePlugin.depend.2 = plugin errorlist.ErrorListPlugin 1.7
    1.31 +plugin.isabelle.jedit.IsabellePlugin.depend.3 = plugin sidekick.SideKickPlugin 0.7.4
    1.32 +plugin.isabelle.jedit.IsabellePlugin.depend.4 = plugin console.ConsolePlugin 4.3.4
    1.33  
    1.34  #dockable component
    1.35  isabelle.label = Isabelle

     2.1 --- a/lib/jedit/plugin/dockables.xml	Sun Aug 24 17:23:42 2008 +0200
     2.2 +++ b/lib/jedit/plugin/dockables.xml	Sun Aug 24 18:11:20 2008 +0200
     2.3 @@ -4,7 +4,7 @@
     2.4  
     2.5  <DOCKABLES>
     2.6  	<DOCKABLE NAME="isabelle" MOVABLE="TRUE">
     2.7 -		new isabelle.IsabelleDock(view, position);
     2.8 +		new isabelle.jedit.IsabelleDock(view, position);
     2.9  	</DOCKABLE>
    2.10  </DOCKABLES>
    2.11  

     3.1 --- a/lib/jedit/plugin/isabelle/IsabelleDock.scala	Sun Aug 24 17:23:42 2008 +0200
     3.2 +++ b/lib/jedit/plugin/isabelle/IsabelleDock.scala	Sun Aug 24 18:11:20 2008 +0200
     3.3 @@ -5,7 +5,7 @@
     3.4  Dockable window for Isabelle process control.
     3.5  */
     3.6  
     3.7 -package isabelle
     3.8 +package isabelle.jedit
     3.9  
    3.10  import org.gjt.sp.jedit.View
    3.11  import org.gjt.sp.jedit.gui.DefaultFocusComponent

     4.1 --- a/lib/jedit/plugin/isabelle/IsabelleParser.scala	Sun Aug 24 17:23:42 2008 +0200
     4.2 +++ b/lib/jedit/plugin/isabelle/IsabelleParser.scala	Sun Aug 24 18:11:20 2008 +0200
     4.3 @@ -5,7 +5,7 @@
     4.4  Isabelle parser setup for Sidekick plugin.
     4.5  */
     4.6  
     4.7 -package isabelle
     4.8 +package isabelle.jedit
     4.9  
    4.10  import javax.swing.text.Position
    4.11  import javax.swing.tree.DefaultMutableTreeNode

     5.1 --- a/lib/jedit/plugin/isabelle/IsabellePlugin.scala	Sun Aug 24 17:23:42 2008 +0200
     5.2 +++ b/lib/jedit/plugin/isabelle/IsabellePlugin.scala	Sun Aug 24 18:11:20 2008 +0200
     5.3 @@ -5,7 +5,7 @@
     5.4  Isabelle/jEdit plugin -- main setup.
     5.5  */
     5.6  
     5.7 -package isabelle
     5.8 +package isabelle.jedit
     5.9  
    5.10  import org.gjt.sp.jedit.EditPlugin
    5.11  import org.gjt.sp.util.Log

     6.1 --- a/lib/jedit/plugin/mk	Sun Aug 24 17:23:42 2008 +0200
     6.2 +++ b/lib/jedit/plugin/mk	Sun Aug 24 18:11:20 2008 +0200
     6.3 @@ -16,7 +16,7 @@
     6.4  && (
     6.5    cp *.xml *.props build/
     6.6    cd build
     6.7 -  jar cf ../../isabelle.jar isabelle/*.class *.xml *.props
     6.8 +  jar cf ../../isabelle.jar .
     6.9  )
    6.10  
    6.11  rm -rf build/

     7.1 --- a/lib/jedit/plugin/services.xml	Sun Aug 24 17:23:42 2008 +0200
     7.2 +++ b/lib/jedit/plugin/services.xml	Sun Aug 24 18:11:20 2008 +0200
     7.3 @@ -4,7 +4,7 @@
     7.4  
     7.5  <SERVICES>
     7.6    <SERVICE CLASS="sidekick.SideKickParser" NAME="isabelle">
     7.7 -    new isabelle.IsabelleParser();
     7.8 +    new isabelle.jedit.IsabelleParser();
     7.9    </SERVICE>
    7.10  </SERVICES>
    7.11