You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/08/04 16:52:02 UTC

svn commit: r1153896 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev.html/ org.apache.uima.tm.cev/ org.apache.uima.tm.cev/META-INF/ org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/ org.apache.uima.tm.dltk.core/ or...

Author: joern
Date: Thu Aug  4 14:51:55 2011
New Revision: 1153896

URL: http://svn.apache.org/viewvc?rev=1153896&view=rev
Log:
Applied UIMA-2201 patch. TextMarker IDE functionality missing due to renaming

Added:
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/console/
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/launching/
Removed:
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/TextMarkerConsoleConstants.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/TextMarkerConsoleUtil.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/TextMarkerInterpreter.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/GenericTextMarkerInstall.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/GenericTextMarkerInstallType.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/JavaLocalApplicationLaunchConfigurationDelegate.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/JavaLocalApplicationTabGroup.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/TextMarkerInterpreterRunner.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/builtins.tm
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/IConfigurableRunner.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/ITextMarkerInterpreterRunnerConfig.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerDebuggingEngineSelector.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerLaunchConfigurationConstants.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerLaunchConfigurationDelegate.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerLaunchingPlugin.java
Modified:
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/AllXmlInProjectStrategy.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/META-INF/MANIFEST.MF
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchConfigurationDelegate.java
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/build.properties
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/build.properties

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF Thu Aug  4 14:51:55 2011
@@ -16,6 +16,8 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/htmlparser.jar
+Bundle-Vendor: University of Würzburg
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.apache.uima.tm.cev;
   uses:="org.eclipse.jface.resource,
    org.eclipse.core.runtime.jobs,
@@ -129,5 +131,3 @@ Export-Package: org.apache.uima.tm.cev;
    org.apache.uima.tm.cev.extension,
    org.eclipse.ui.part,
    org.eclipse.swt.widgets"
-Bundle-Vendor: University of Würzburg
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/AllXmlInProjectStrategy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/AllXmlInProjectStrategy.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/AllXmlInProjectStrategy.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/AllXmlInProjectStrategy.java Thu Aug  4 14:51:55 2011
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 
 package org.apache.uima.tm.cev.searchStrategy;
 
@@ -35,7 +35,6 @@ import org.eclipse.jface.viewers.LabelPr
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.dialogs.ListDialog;
 
-
 public class AllXmlInProjectStrategy implements ICEVSearchStrategy {
 
   private int priority;
@@ -89,11 +88,15 @@ public class AllXmlInProjectStrategy imp
     for (IResource each : folder.members()) {
       if (each instanceof IContainer) {
         result.addAll(collectTypeSystems((IContainer) each));
-      } else if (each instanceof IFile
-              && each.getFileExtension().equals("xml")
-              && !each.getFullPath().removeFileExtension().lastSegment().toLowerCase().endsWith(
-                      "stylemap")) {
-        result.add((IFile) each);
+      } else {
+        String fileExtension = each.getFileExtension();
+        if (each instanceof IFile
+                && fileExtension != null
+                && fileExtension.equals("xml")
+                && !each.getFullPath().removeFileExtension().lastSegment().toLowerCase()
+                        .endsWith("stylemap")) {
+          result.add((IFile) each);
+        }
       }
     }
     return result;

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml Thu Aug  4 14:51:55 2011
@@ -42,8 +42,8 @@ under the License.
          point="org.eclipse.dltk.validators.core.validator">
       <validatorType
             class="org.apache.uima.tm.dltk.internal.core.packages.TextMarkerPackageCheckerType"
-            id="org.apache.uima.dltk.textmarker.packageChecker"
-            nature="org.apache.uima.dltk.textmarker.core.nature">
+            id="org.apache.uima.tm.dltk.packageChecker"
+            nature="org.apache.uima.tm.dltk.core.nature">
       </validatorType>
    </extension>
    
@@ -51,13 +51,13 @@ under the License.
          point="org.eclipse.dltk.core.language">
       <language
             class="org.apache.uima.tm.dltk.core.TextMarkerLanguageToolkit"
-            nature="org.apache.uima.dltk.textmarker.core.nature"/>
+            nature="org.apache.uima.tm.dltk.core.nature"/>
    </extension>
    <extension
          point="org.eclipse.dltk.core.sourceElementParsers">
       <parser
             class="org.apache.uima.tm.dltk.internal.core.parser.TextMarkerSourceElementParser"
-            nature="org.apache.uima.dltk.textmarker.core.nature"
+            nature="org.apache.uima.tm.dltk.core.nature"
             priority="0">
       </parser>
    </extension>
@@ -65,7 +65,7 @@ under the License.
          point="org.eclipse.dltk.core.selectionEngine">
       <selectionEngine
             class="org.apache.uima.tm.dltk.internal.core.codeassist.TextMarkerSelectionEngine"
-            nature="org.apache.uima.dltk.textmarker.core.nature"
+            nature="org.apache.uima.tm.dltk.core.nature"
             priority="0">
       </selectionEngine>
    </extension>
@@ -73,15 +73,15 @@ under the License.
          point="org.eclipse.dltk.core.completionEngine">
       <completionEngine
             class="org.apache.uima.tm.dltk.internal.core.codeassist.TextMarkerCompletionEngine"
-            nature="org.apache.uima.dltk.textmarker.core.nature"
+            nature="org.apache.uima.tm.dltk.core.nature"
             priority="0">
       </completionEngine>
    </extension>
    <extension
          point="org.eclipse.dltk.core.search">
       <seachFactory
-            class="org.apache.uima.dltk.textmarker.internal.core.TextMarkerSearchFactory"
-            nature="org.apache.uima.dltk.textmarker.core.nature"
+            class="org.apache.uima.tm.dltk.internal.core.TextMarkerSearchFactory"
+            nature="org.apache.uima.tm.dltk.core.nature"
             priority="0">
       </seachFactory>
    </extension>
@@ -89,7 +89,7 @@ under the License.
          point="org.eclipse.dltk.core.callHierarchy">
       <callHerarchiesFactory
             class="org.apache.uima.tm.dltk.internal.core.TextMarkerCallHierarchyFactory"
-            nature="org.apache.uima.dltk.textmarker.core.nature"
+            nature="org.apache.uima.tm.dltk.core.nature"
             priority="0">
       </callHerarchiesFactory>
    </extension>
@@ -98,23 +98,23 @@ under the License.
      <content-type
            base-type="org.eclipse.core.runtime.text"
            file-extensions="tm"
-           id="org.apache.uima.dltk.tmContentType"
+           id="org.apache.uima.tm.dltk.tmContentType"
            name="%tmContentType"
            priority="high">
         <describer
               class="org.apache.uima.tm.dltk.core.TextMarkerContentDescriber"
-              plugin="org.apache.uima.dltk.textmarker.core">
+              plugin="org.apache.uima.tm.dltk.core">
         </describer>       
      </content-type>
   </extension>
    <extension
          point="org.eclipse.dltk.core.sourceParsers">
       <parserContribution
-            natureId="org.apache.uima.dltk.textmarker.core.nature">
+            natureId="org.apache.uima.tm.dltk.core.nature">
          <parser
                class="org.apache.uima.tm.dltk.internal.core.parser.TextMarkerSourceParserFactory"
                description="%sourceParser.description"
-               id="org.apache.uima.dltk.textmarker.sourceParser"
+               id="org.apache.uima.tm.dltk.sourceParser"
                name="%sourceParser.name"
                priority="0" />
       </parserContribution>
@@ -122,69 +122,69 @@ under the License.
    <extension
          point="org.apache.uima.tm.dltk.core.tmkeywords">
       <keywords
-            class="org.apache.uima.dltk.textmarker.core.TextMarkerKeywords">
+            class="org.apache.uima.tm.dltk.core.TextMarkerKeywords">
       </keywords>
    </extension>
  <extension
          name="tm commands"
          point="org.apache.uima.tm.dltk.core.tmCommandProcessor">
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerNamespaceProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerNamespaceProcessor"
             id="namespace"></processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerProcProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerProcProcessor"
             id="proc">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerVariableProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerVariableProcessor"
             id="set">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerUpvarProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerUpvarProcessor"
             id="upvar">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerGlobalVariableProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerGlobalVariableProcessor"
             id="global">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerPackageProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerPackageProcessor"
             id="package">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerCatchProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerCatchProcessor"
             id="catch">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerIfProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerIfProcessor"
             id="if">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerNamespaceVariableProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerNamespaceVariableProcessor"
             id="variable">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerSwitchCommandProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerSwitchCommandProcessor"
             id="switch">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerForCommandProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerForCommandProcessor"
             id="for">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerForeachCommandProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerForeachCommandProcessor"
             id="foreach">
       </processor>
       <processor
-            class="org.apache.uima.dltk.textmarker.internal.core.parser.processors.tm.TextMarkerWhileCommandProcessor"
+            class="org.apache.uima.tm.dltk.internal.core.parser.processors.tm.TextMarkerWhileCommandProcessor"
             id="while">
       </processor>
    </extension>
  <extension
          point="org.eclipse.dltk.core.mixin">
       <mixin
-            class="org.apache.uima.dltk.textmarker.internal.core.mixin.TextMarkerMixinParser"
-            nature="org.apache.uima.dltk.textmarker.core.nature"
+            class="org.apache.uima.tm.dltk.internal.core.mixin.TextMarkerMixinParser"
+            nature="org.apache.uima.tm.dltk.core.nature"
             priority="0">
       </mixin>
    </extension>
@@ -197,8 +197,8 @@ under the License.
  <extension
        point="org.eclipse.dltk.core.interpreterContainerExtension">
     <interpreterContainerExtension
-          class="org.apache.uima.dltk.textmarker.internal.core.packages.TextMarkerPackagesInterpreterContainerExtension"
-          nature="org.apache.uima.dltk.textmarker.core.nature"
+          class="org.apache.uima.tm.dltk.internal.core.packages.TextMarkerPackagesInterpreterContainerExtension"
+          nature="org.apache.uima.tm.dltk.core.nature"
           priority="0">
     </interpreterContainerExtension>
  </extension>
@@ -206,32 +206,32 @@ under the License.
          point="org.eclipse.dltk.core.buildpathContainerInitializer">
       <buildpathContainerInitializer
             class="org.apache.uima.tm.dltk.internal.core.packages.TextMarkerPackagesBuildpathContainerInitializer"
-            id="org.apache.uima.dltk.textmarker.core.PACKAGES">
+            id="org.apache.uima.tm.dltk.core.PACKAGES">
       </buildpathContainerInitializer>
    </extension>
    <extension
-         id="org.apache.uima.dltk.textmarker.core.builder"
+         id="org.apache.uima.tm.dltk.core.builder"
          point="org.eclipse.dltk.core.builder">
       <builder
             class="org.apache.uima.tm.dltk.internal.core.builder.TextMarkerBuilder"
-            nature="org.apache.uima.dltk.textmarker.core.nature">
+            nature="org.apache.uima.tm.dltk.core.nature">
       </builder>
    </extension>
 <extension
     point="org.eclipse.dltk.core.buildParticipant">
       <buildParticipant
             class="org.eclipse.dltk.core.builder.ParserBuildParticipantFactory"
-            id="org.apache.uima.dltk.textmarker.buildParticipant.parser"
+            id="org.apache.uima.tm.dltk.buildParticipant.parser"
             name="%parserBuildParticipant.name"
-            nature="org.apache.uima.dltk.textmarker.core.nature">
+            nature="org.apache.uima.tm.dltk.core.nature">
       </buildParticipant>
     <buildParticipant
       class="org.apache.uima.tm.dltk.internal.core.parser.TextMarkerTodoParserType"
-      id="org.apache.uima.dltk.textmarker.todo"
+      id="org.apache.uima.tm.dltk.todo"
       name="%taskTagsBuildParticipant.name"
-      nature="org.apache.uima.dltk.textmarker.core.nature">
+      nature="org.apache.uima.tm.dltk.core.nature">
       <requires
-            id="org.apache.uima.dltk.textmarker.buildParticipant.parser">
+            id="org.apache.uima.tm.dltk.buildParticipant.parser">
       </requires>
     </buildParticipant>
   </extension>

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java Thu Aug  4 14:51:55 2011
@@ -21,7 +21,7 @@ package org.apache.uima.tm.dltk.internal
 
 import org.eclipse.dltk.console.ui.ScriptConsole;
 
-import org.apache.uima.tm.dltk.textmarker.console.TextMarkerInterpreter;
+import org.apache.uima.tm.dltk.console.TextMarkerInterpreter;
 
 public class TextMarkerConsole extends ScriptConsole {
   public static final String CONSOLE_TYPE = "tm_console";

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java Thu Aug  4 14:51:55 2011
@@ -27,8 +27,8 @@ import org.eclipse.dltk.console.ui.Scrip
 import org.eclipse.dltk.console.ui.ScriptConsoleFactoryBase;
 import org.eclipse.jface.preference.IPreferenceStore;
 
-import org.apache.uima.tm.dltk.textmarker.console.TextMarkerConsoleConstants;
-import org.apache.uima.tm.dltk.textmarker.console.TextMarkerInterpreter;
+import org.apache.uima.tm.dltk.console.TextMarkerConsoleConstants;
+import org.apache.uima.tm.dltk.console.TextMarkerInterpreter;
 import org.apache.uima.tm.dltk.internal.debug.ui.TextMarkerDebugUIPlugin;
 
 public class TextMarkerConsoleFactory extends ScriptConsoleFactoryBase implements

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java Thu Aug  4 14:51:55 2011
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchingPlugin;
+import org.apache.uima.tm.dltk.launching.TextMarkerLaunchingPlugin;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java Thu Aug  4 14:51:55 2011
@@ -23,7 +23,7 @@ import org.eclipse.debug.core.ILaunchCon
 import org.eclipse.dltk.internal.debug.ui.launcher.AbstractScriptLaunchShortcut;
 
 import org.apache.uima.tm.dltk.core.TextMarkerNature;
-import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchConfigurationConstants;
+import org.apache.uima.tm.dltk.launching.TextMarkerLaunchConfigurationConstants;
 
 public class TextMarkerLaunchShortcut extends AbstractScriptLaunchShortcut {
   @Override

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java Thu Aug  4 14:51:55 2011
@@ -22,7 +22,7 @@ package org.apache.uima.tm.dltk.internal
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
 
-import org.apache.uima.tm.dltk.textmarker.console.TextMarkerConsoleConstants;
+import org.apache.uima.tm.dltk.console.TextMarkerConsoleConstants;
 import org.apache.uima.tm.dltk.internal.debug.ui.TextMarkerDebugUIPlugin;
 
 public class TextMarkerConsolePreferenceInitializer extends AbstractPreferenceInitializer {

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java Thu Aug  4 14:51:55 2011
@@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
-import org.apache.uima.tm.dltk.textmarker.console.TextMarkerConsoleConstants;
+import org.apache.uima.tm.dltk.console.TextMarkerConsoleConstants;
 import org.apache.uima.tm.dltk.internal.debug.ui.TextMarkerDebugUIPlugin;
 
 public class TextMarkerConsolePreferences extends PreferencePage implements

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java Thu Aug  4 14:51:55 2011
@@ -21,9 +21,9 @@ package org.apache.uima.tm.dltk.debugger
 
 import org.apache.uima.tm.dltk.internal.debug.TextMarkerDebugConstants;
 import org.apache.uima.tm.dltk.internal.debug.TextMarkerDebugPlugin;
-import org.apache.uima.tm.dltk.textmarker.internal.launching.TextMarkerInterpreterRunner;
-import org.apache.uima.tm.dltk.textmarker.launching.IConfigurableRunner;
-import org.apache.uima.tm.dltk.textmarker.launching.ITextMarkerInterpreterRunnerConfig;
+import org.apache.uima.tm.dltk.internal.launching.TextMarkerInterpreterRunner;
+import org.apache.uima.tm.dltk.launching.IConfigurableRunner;
+import org.apache.uima.tm.dltk.launching.ITextMarkerInterpreterRunnerConfig;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunch;

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java Thu Aug  4 14:51:55 2011
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 
 package org.apache.uima.tm.dltk.debugger.preferences;
 
@@ -31,13 +31,12 @@ import org.eclipse.swt.widgets.Composite
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 
-
 public class TextMarkerDebuggerPreferencePage extends
         AbstractConfigurationBlockPropertyAndPreferencePage {
 
-  private static String PREFERENCE_PAGE_ID = "org.apache.uima.tm.dltk.textmarker.preferences.debug.engines.debugger";
+  private static String PREFERENCE_PAGE_ID = "org.apache.uima.tm.dltk.preferences.debug.engines.debugger";
 
-  private static String PROPERTY_PAGE_ID = "org.apache.uima.tm.dltk.textmarker.propertyPage.debug.engines.debugger";
+  private static String PROPERTY_PAGE_ID = "org.apache.uima.tm.dltk.propertyPage.debug.engines.debugger";
 
   /*
    * @seeorg.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage#

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/META-INF/MANIFEST.MF?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/META-INF/MANIFEST.MF Thu Aug  4 14:51:55 2011
@@ -23,10 +23,9 @@ Require-Bundle: org.eclipse.core.runtime
  org.apache.uima.tm.textmarker.engine,
  org.apache.uima.runtime;bundle-version="2.3.0"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.apache.uima.tm.dltk.textmarker.console,
+Export-Package: org.apache.uima.tm.dltk.console,
  org.apache.uima.tm.dltk.internal.launching,
- org.apache.uima.tm.dltk.textmarker.launching,
- org.apache.uima.tm.dltk.textmarker.internal.launching 
+ org.apache.uima.tm.dltk.launching
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: University of Würzburg

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/plugin.xml Thu Aug  4 14:51:55 2011
@@ -38,7 +38,7 @@ under the License.
       <launchConfigurationTypeImage
             configTypeID="org.apache.uima.tm.dltk.testing.launchConfig"
             icon="icons/full/obj16/textmarker.png"
-            id="org.apache.uima.tm.dltk.textmarker.testing.launchConfigImage">
+            id="org.apache.uima.tm.dltk.testing.launchConfigImage">
       </launchConfigurationTypeImage>
    </extension>
    <extension

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchConfigurationDelegate.java?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchConfigurationDelegate.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/src/main/java/org/apache/uima/tm/dltk/internal/testing/TextMarkerTestingLaunchConfigurationDelegate.java Thu Aug  4 14:51:55 2011
@@ -19,8 +19,8 @@
 
 package org.apache.uima.tm.dltk.internal.testing;
 
+import org.apache.uima.tm.dltk.launching.TextMarkerLaunchConfigurationDelegate;
 import org.apache.uima.tm.dltk.testing.ITextMarkerTestingEngine;
-import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchConfigurationDelegate;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunch;

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml Thu Aug  4 14:51:55 2011
@@ -1,22 +1,3 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml Thu Aug  4 14:51:55 2011
@@ -1,22 +1,3 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml Thu Aug  4 14:51:55 2011
@@ -17,27 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
-	<!--
-	 ***************************************************************
-	 * Licensed to the Apache Software Foundation (ASF) under one
-	 * or more contributor license agreements.  See the NOTICE file
-	 * distributed with this work for additional information
-	 * regarding copyright ownership.  The ASF licenses this file
-	 * to you under the Apache License, Version 2.0 (the
-	 * "License"); you may not use this file except in compliance
-	 * with the License.  You may obtain a copy of the License at
-         *
-	 *   http://www.apache.org/licenses/LICENSE-2.0
-	 * 
-	 * Unless required by applicable law or agreed to in writing,
-	 * software distributed under the License is distributed on an
-	 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	 * KIND, either express or implied.  See the License for the
-	 * specific language governing permissions and limitations
-	 * under the License.
-	 ***************************************************************
-   -->
    
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
 	<name>org.apache.uima.examples.SourceDocumentInformation</name>

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/build.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/build.properties?rev=1153896&r1=1153895&r2=1153896&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/build.properties (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/build.properties Thu Aug  4 14:51:55 2011
@@ -17,7 +17,7 @@
 #  * under the License.
 # ***************************************************************
 
-source.. = src/
+source.. = src/main/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\