cleaned up build.xml

build.xml

@@ -14,19 +14,8 @@
 
    <property file="local.properties"/>
 
-
-   <!-- 
-        **** CHANGE ME ****
-
-        This setting defines the name of the plugin.
-        This may be the only setting that the developer needs to
-        change.
-     -->
    <property name = "plugin"          value = "de.unibremen.informatik.hets"/>
 
-   <!-- 
-        these properties probably don't need changing
-        -->
    <property name = "src"               location = "./src"/>
    <property name = "build"             location = "./build"/>
    <property name = "bundle.dir"        location = "${build}"/>
@@ -45,7 +34,6 @@
      </tstamp>
      <mkdir dir = "${build}"/>
      <mkdir dir = "${classes}"/>
-<!--     <mkdir dir = "${classes}/lib"/> -->
      <mkdir dir = "${genlib}"/>
    </target>
 
@@ -65,14 +53,6 @@
       <fail message = "missing protege libraries"/>
     </target>
 
-   <!-- 
-        **** CHANGE ME ****
-
-        The following target only needs to be modified if the user
-        needs to change the classpath.  It is preconfigured to use
-        the common protege 4 jars, the lib directory and the
-        libraries that have been uncovered in buildlibs. 
-     -->
    <target name = "checkProtegeLibs" depends="init">
      <echo message="Using Protege Home = ${protege.home} to find protege jars"/>
      <condition property="libs.found">
@@ -80,7 +60,7 @@
          <available file="${protege.osgi}" type="file"/>
 	     <available file="${equinox.common}" type = "file"/>
 	     <available file="${equinox.registry}" type = "file"/>
-<!--	     <available file="${owl.editor.jar}" type = "file"/> -->
+	     <available file="${owl.editor.jar}" type = "file"/>
          <available file="${owl.lib}" type="file"/>
        </and>
      </condition>
@@ -91,21 +71,10 @@
        <pathelement location="${equinox.registry}"/>
        <pathelement location="${owl.editor.jar}"/>
        <pathelement location="${owl.lib}"/>
-<!--       <fileset dir="${lib}"/> -->
        <fileset dir="${genlib}"/>
      </path>
    </target>
 
-
-   <!-- 
-        **** CHANGE ME ****
-
-        The following target only needs to be modified if the
-        developer needs to obtain some jar files that are contained in
-        the Protege bundles.  The contents of these jar files are
-        found when Protege 4 runs but may be needed in order to
-        compile the plugin. 
-     -->
    <target name = "buildlibs" depends="checkProtegeLibsAndReport">
        <unjar dest="${build}"
               src="${common.lib}">
@@ -116,18 +85,6 @@
        </unjar>
    </target>
 
-
-
-   <!-- 
-        **** CHANGE ME ****
-
-        Here is the copy.resources target.  It may need modification
-        to copy the right resources into the classes directory.  By
-        default it already copies non-java files found in the source
-        directory, the libraries needed by the project and the
-        viewconfig and the plugin.xml.  This will be sufficient in
-        many cases. 
-     -->
    <target name="copy.resources" depends="build.manifest">
      <copy todir="${classes}">
        <fileset dir="${src}">
@@ -137,9 +94,6 @@
          <exclude name="**/manifest.mf"/>
        </fileset>
      </copy>
-<!--     <copy todir="${classes}/lib">
-       <fileset dir="${lib}" excludes="junit*.jar"/>
-     </copy> -->
      <copy todir="${classes}">
        <fileset dir="." includes="*.xml">
            <exclude name="build.xml"/>
@@ -152,12 +106,6 @@
    </target>
 
 
-   <!-- 
-        It is less likely that the developer will want to make changes
-        below this line 
-        -->
-   <!-- ============================================================= -->
-
   <target name = "jjtree">
     <jjtree target="./src/de/unibremen/informatik/hets/grammar/HetCASLGrammar.jjt"
             outputdirectory="./src/de/unibremen/informatik/hets/grammar/"
@@ -207,9 +155,10 @@
    </target>
 
    <target name = "run" depends="install">
-       <java fork = "true" 
-             dir = "${protege.home}" 
-             jar = "${protege.osgi}">
+       <java dir = "${protege.home}"
+             classname = "org.protege.osgi.framework.Launcher"
+             classpath = "${protege.osgi}:${protege.launcher}"
+             fork="true">
            <jvmarg value = "-Dfile.encoding=UTF-8"/>
            <jvmarg value = "-Xmx500M"/>
            <jvmarg value = "-Dlog4j.configuration=file:log4j.xml"/>
@@ -243,10 +192,6 @@
      <echo message = "debug - install the plugin and start protege for debug"/>
    </target>
 
-
-   <!-- 
-        Standard properties that should not require changing
-        -->
    <property name="equinox.common"
              location="${protege.common}/org.eclipse.equinox.common.jar"/>
    <property name="equinox.registry"
@@ -261,7 +206,4 @@
 
    <property name="owl.editor.jar"
 	     location="${protege.plugins}/org.protege.editor.owl.jar"/>
-
-
-
 </project>