Revision: 15076
http://gate.svn.sourceforge.net/gate/?rev=15076&view=rev
Author: valyt
Date: 2012-01-16 15:28:06 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
GUK-ectomy complete.
Modified Paths:
--------------
gate/trunk/.classpath
gate/trunk/build.xml
gate/trunk/src/gate/gui/MainFrame.java
Removed Paths:
-------------
gate/trunk/lib/ext/
Modified: gate/trunk/.classpath
===================================================================
--- gate/trunk/.classpath 2012-01-16 15:13:32 UTC (rev 15075)
+++ gate/trunk/.classpath 2012-01-16 15:28:06 UTC (rev 15076)
@@ -27,13 +27,11 @@
<classpathentry kind="src" output="plugins/LingPipe/build"
path="plugins/LingPipe/src"/>
<classpathentry kind="src" output="plugins/Ontology/build"
path="plugins/Ontology/src"/>
<classpathentry exported="true" kind="lib" path="lib/Bib2HTML.jar"/>
- <classpathentry kind="lib" path="lib/ext/nl.mpi.lookup.jar"/>
<classpathentry kind="lib" path="lib/plugins/rdf_backend.jar"/>
<classpathentry kind="lib" path="lib/plugins/query_tab.jar"/>
<classpathentry kind="lib" path="lib/plugins/rdf-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
- <classpathentry kind="lib" path="lib/ext/guk.jar"/>
<classpathentry exported="true" kind="lib" path="lib/GnuGetOpt.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mail.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lubm.jar"/>
Modified: gate/trunk/build.xml
===================================================================
--- gate/trunk/build.xml 2012-01-16 15:13:32 UTC (rev 15075)
+++ gate/trunk/build.xml 2012-01-16 15:28:06 UTC (rev 15076)
@@ -91,9 +91,6 @@
<!-- Libraries directory for the build process -->
<property name="libDir" location="lib"/>
- <!-- Extensions directory for the build process -->
- <property name="extDir" location="lib/ext"/>
-
<!-- Documentation directory -->
<property name="docDir" location="doc"/>
@@ -117,12 +114,6 @@
<include name="*.zip"/>
</fileset>
- <!-- The extensions -->
- <fileset id="exts" dir="${extDir}">
- <include name="*.jar"/>
- </fileset>
-
-
<!-- tools.jar path -->
<!-- GATE will attempt to guess where the Sun Javac classes live -->
@@ -196,7 +187,6 @@
<path id="build.class.path">
<path refid="tools.jar.path"/>
<fileset refid="libs"/>
- <fileset refid="exts"/>
</path>
<!-- The run CLASSPATH -->
@@ -452,6 +442,7 @@
-->
</target>
+
<!-- Make gate.jar archive -->
<target name="bigjar" depends="compile,resources">
<jar destfile="${binDir}/gate.jar"
@@ -550,13 +541,6 @@
</target>
<target name="run-pre">
- <!-- Prepend extDir to the java.ext.dirs path -->
- <pathconvert property="ext.dirs">
- <path>
- <pathelement location="${extDir}" />
- <path path="${java.ext.dirs}" />
- </path>
- </pathconvert>
<!-- Find if the platform is MAC -->
<condition property="running.on.mac">
<os family="mac"/>
@@ -572,7 +556,6 @@
maxmemory="${runtime.max.memory}">
<jvmarg value="${server.or.client}"/>
<jvmarg value="-splash:bin/splash.png" />
- <sysproperty key="java.ext.dirs" value="${ext.dirs}"/>
</java>
</target>
@@ -600,7 +583,6 @@
dir="."
maxmemory="${runtime.max.memory}">
<jvmarg value="${server.or.client}"/>
- <sysproperty key="java.ext.dirs" value="${ext.dirs}"/>
<sysproperty key="sun.java2d.opengl" value="true"/>
<sysproperty key="apple.laf.useScreenMenuBar" value="true"/>
<sysproperty key="apple.awt.antialiasing" value="true"/>
@@ -642,13 +624,6 @@
<propertyref prefix="os.${os.name}." />
<mapper type="glob" from="os.${os.name}.*" to="*" />
</propertyset>
- <!-- Prepend extDir to the java.ext.dirs path -->
- <pathconvert property="ext.dirs">
- <path>
- <pathelement location="${extDir}" />
- <path path="${java.ext.dirs}" />
- </path>
- </pathconvert>
<!-- Find if the platform is MAC -->
<condition property="running.on.mac">
<os family="mac"/>
@@ -666,7 +641,6 @@
<!-- <jvmarg value="-Xms${runtime.start.memory}"/> -->
<jvmarg value="${server.or.client}"/>
<sysproperty key="gate.home" value="${basedir}"/>
- <sysproperty key="java.ext.dirs" value="${ext.dirs}"/>
<!--<sysproperty key="awt.toolkit" value="sun.awt.motif.MToolkit"/>-->
<!-- <sysproperty key="sun.java2d.opengl" value="true"/>-->
<syspropertyset refid="run.properties" />
@@ -699,7 +673,6 @@
maxmemory="${runtime.max.memory}">
<!-- <jvmarg value="-Xms${runtime.start.memory}"/> -->
<sysproperty key="gate.home" value="${basedir}"/>
- <sysproperty key="java.ext.dirs" value="${ext.dirs}"/>
<sysproperty key="sun.java2d.opengl" value="true"/>
<sysproperty key="apple.laf.useScreenMenuBar" value="true"/>
<sysproperty key="apple.awt.antialiasing" value="true"/>
@@ -737,7 +710,6 @@
<javadoc access="protected"
destdir="${docDir}/javadoc"
classpathref="run.class.path"
- Extdirs="${extDir}"
Encoding="UTF-8"
Use="yes"
Windowtitle="GATE JavaDoc"
@@ -775,7 +747,6 @@
<javadoc access="private"
destdir="${docDir}/javadoc/internal"
classpathref="run.class.path"
- Extdirs="${extDir}"
Encoding="UTF-8"
Use="yes"
Windowtitle="GATE JavaDoc (including private members)"
@@ -871,7 +842,6 @@
<sysproperty key="gate.config" value="${buildDir}/gate.xml"/>
<sysproperty key="gate.home" value="${basedir}"/>
<sysproperty key="load.plugin.path"
value="file:${basedir}/plugins/ANNIE;file:${basedir}/plugins/Information_Retrieval;file:${basedir}/plugins/Ontology_Tools;file:${basedir}/plugins/Tools;file:${basedir}/plugins/WordNet"/>
- <sysproperty key="java.ext.dirs" value="${extDir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<!-- set this property to run just a single test case -->
<syspropertyset>
@@ -919,7 +889,6 @@
<sysproperty key="gate.home" value="${basedir}"/>
<sysproperty key="gate.config" value="${buildDir}/gate.xml"/>
<sysproperty key="load.plugin.path"
value="file:${basedir}/plugins/ANNIE;file:${basedir}/plugins/Information_Retrieval;file:${basedir}/plugins/Machine_Learning;file:${basedir}/plugins/Obsolete;file:${basedir}/plugins/Ontology_Tools;file:${basedir}/plugins/Tools;file:${basedir}/plugins/WordNet"/>
- <sysproperty key="java.ext.dirs" value="${extDir}"/>
<syspropertyset refid="run.properties" />
<arg value="gate.TestGate"/>
</java>
Modified: gate/trunk/src/gate/gui/MainFrame.java
===================================================================
--- gate/trunk/src/gate/gui/MainFrame.java 2012-01-16 15:13:32 UTC (rev
15075)
+++ gate/trunk/src/gate/gui/MainFrame.java 2012-01-16 15:28:06 UTC (rev
15076)
@@ -697,58 +697,6 @@
optionsMenuHasEntries = true;
}
- JMenu imMenu = null;
- List<Locale> installedLocales = new ArrayList<Locale>();
- try {
- // if this fails guk is not present
- Class.forName("guk.im.GateIMDescriptor");
- // add the Gate input methods
- installedLocales.addAll(Arrays.asList(new guk.im.GateIMDescriptor()
- .getAvailableLocales()));
- }
- catch(Exception e) {
- // something happened; most probably guk not present.
- // just drop it, is not vital.
- }
- try {
- // add the MPI IMs
- // if this fails mpi IM is not present
- Class.forName("mpi.alt.java.awt.im.spi.lookup.LookupDescriptor");
-
- installedLocales.addAll(Arrays
- .asList(new mpi.alt.java.awt.im.spi.lookup.LookupDescriptor()
- .getAvailableLocales()));
- }
- catch(Exception e) {
- // something happened; most probably MPI not present.
- // just drop it, is not vital.
- }
-
- Collections.sort(installedLocales, new Comparator<Locale>() {
- public int compare(Locale o1, Locale o2) {
- return o1.getDisplayName().compareTo(o2.getDisplayName());
- }
- });
- JMenuItem item;
- if(!installedLocales.isEmpty()) {
- imMenu = new XJMenu("Input Methods");
- ButtonGroup bg = new ButtonGroup();
- item = new LocaleSelectorMenuItem();
- imMenu.add(item);
- item.setSelected(true);
- imMenu.addSeparator();
- bg.add(item);
- for(Locale locale : installedLocales) {
- item = new LocaleSelectorMenuItem(locale);
- imMenu.add(item);
- bg.add(item);
- }
- }
- if(imMenu != null) {
- optionsMenu.add(imMenu);
- optionsMenuHasEntries = true;
- }
-
if(optionsMenuHasEntries) {
menuBar.add(optionsMenu);
}
@@ -966,14 +914,6 @@
verboseModeItem =
new JCheckBoxMenuItem(new VerboseModeCorpusEvalToolAction());
corpusEvalMenu.add(verboseModeItem);
- toolsMenu.add(new XJMenuItem(
- new AbstractAction("Unicode Editor", getIcon("unicode")) {
- { putValue(SHORT_DESCRIPTION, "Editor for testing character encoding"); }
- private static final long serialVersionUID = 1L;
- public void actionPerformed(ActionEvent evt) {
- new guk.Editor();
- }
- }, this));
// add separator. plugin menu items will appear after this separator
toolsMenu.addSeparator();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
