svn commit: r1153113 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/ org.apache.uima.tm.dltk.debug.ui/src/main/java/org
Author: joern
Date: Tue Aug 2 13:21:08 2011
New Revision: 1153113
URL: http://svn.apache.org/viewvc?rev=1153113&view=rev
Log:
UIMA-2195 Fixed broken imports
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
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.launching/META-INF/MANIFEST.MF
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=1153113&r1=1153112&r2=1153113&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
Tue Aug 2 13:21:08 2011
@@ -2,7 +2,7 @@ package org.apache.uima.tm.dltk.internal
import org.eclipse.dltk.console.ui.ScriptConsole;
-import org.apache.uima.tm.dltk.console.TextMarkerInterpreter;
+import org.apache.uima.tm.dltk.textmarker.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=1153113&r1=1153112&r2=1153113&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
Tue Aug 2 13:21:08 2011
@@ -8,8 +8,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.console.TextMarkerConsoleConstants;
-import org.apache.uima.tm.dltk.console.TextMarkerInterpreter;
+import org.apache.uima.tm.dltk.textmarker.console.TextMarkerConsoleConstants;
+import org.apache.uima.tm.dltk.textmarker.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=1153113&r1=1153112&r2=1153113&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
Tue Aug 2 13:21:08 2011
@@ -74,7 +74,7 @@ import org.eclipse.ui.model.WorkbenchCon
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceSorter;
-import org.apache.uima.tm.dltk.launching.TextMarkerLaunchingPlugin;
+import org.apache.uima.tm.dltk.textmarker.l
svn commit: r1153329 - in /uima/build/trunk/uima-build-resources: LICENSE NOTICE pom.xml
Author: schor Date: Wed Aug 3 03:24:28 2011 New Revision: 1153329 URL: http://svn.apache.org/viewvc?rev=1153329&view=rev Log: [UIMA-2194] roll back version; change parent to UIMA parent-pom; remove stuff no longer needed because of inheriting from uima parent pom; add license and notice to svn since this project is being individually released. Fix name of jiraVersion property; add issues fixed. Added: uima/build/trunk/uima-build-resources/LICENSE (with props) uima/build/trunk/uima-build-resources/NOTICE (with props) Modified: uima/build/trunk/uima-build-resources/pom.xml Added: uima/build/trunk/uima-build-resources/LICENSE URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/LICENSE?rev=1153329&view=auto == --- uima/build/trunk/uima-build-resources/LICENSE (added) +++ uima/build/trunk/uima-build-resources/LICENSE Wed Aug 3 03:24:28 2011 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Pat
svn commit: r1153330 - /uima/build/trunk/uima-build-resources/
Author: schor Date: Wed Aug 3 03:25:33 2011 New Revision: 1153330 URL: http://svn.apache.org/viewvc?rev=1153330&view=rev Log: no Jira - add issuesFixed to svn:ignore Modified: uima/build/trunk/uima-build-resources/ (props changed) Propchange: uima/build/trunk/uima-build-resources/ -- --- svn:ignore (original) +++ svn:ignore Wed Aug 3 03:25:33 2011 @@ -2,3 +2,4 @@ target .classpath .project +issuesFixed
svn commit: r1153331 - /uima/build/trunk/uima-build-resources/pom.xml
Author: schor
Date: Wed Aug 3 03:31:12 2011
New Revision: 1153331
URL: http://svn.apache.org/viewvc?rev=1153331&view=rev
Log:
[maven-release-plugin] prepare release uima-build-resources-2-rc2
Modified:
uima/build/trunk/uima-build-resources/pom.xml
Modified: uima/build/trunk/uima-build-resources/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/pom.xml?rev=1153331&r1=1153330&r2=1153331&view=diff
==
--- uima/build/trunk/uima-build-resources/pom.xml (original)
+++ uima/build/trunk/uima-build-resources/pom.xml Wed Aug 3 03:31:12 2011
@@ -24,12 +24,12 @@
org.apache.uima
parent-pom
2
-
+
org.apache.uima
uima-build-resources
- 2-SNAPSHOT
+ 2
UIMA ${project.artifactId}
This Jar contains resources
@@ -41,13 +41,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc2
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc2
- http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources
+ http://svn.apache.org/viewvc/uima/build/tags/uima-build-resources-2-rc2
svn commit: r1153332 - /uima/build/tags/uima-build-resources-2-rc2/
Author: schor Date: Wed Aug 3 03:31:22 2011 New Revision: 1153332 URL: http://svn.apache.org/viewvc?rev=1153332&view=rev Log: [maven-release-plugin] copy for tag uima-build-resources-2-rc2 Added: uima/build/tags/uima-build-resources-2-rc2/ (props changed) - copied from r1153331, uima/build/trunk/uima-build-resources/ Propchange: uima/build/tags/uima-build-resources-2-rc2/ -- --- svn:ignore (added) +++ svn:ignore Wed Aug 3 03:31:22 2011 @@ -0,0 +1,5 @@ +.settings +target +.classpath +.project +issuesFixed Propchange: uima/build/tags/uima-build-resources-2-rc2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 3 03:31:22 2011 @@ -0,0 +1 @@ +/uima/build/branches/depend-on-july-9-build-tools/uima-build-resources:963164-964460
svn commit: r1153333 - /uima/build/trunk/uima-build-resources/pom.xml
Author: schor
Date: Wed Aug 3 03:31:26 2011
New Revision: 115
URL: http://svn.apache.org/viewvc?rev=115&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/uima-build-resources/pom.xml
Modified: uima/build/trunk/uima-build-resources/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/pom.xml?rev=115&r1=1153332&r2=115&view=diff
==
--- uima/build/trunk/uima-build-resources/pom.xml (original)
+++ uima/build/trunk/uima-build-resources/pom.xml Wed Aug 3 03:31:26 2011
@@ -29,7 +29,7 @@
org.apache.uima
uima-build-resources
- 2
+ 3-SNAPSHOT
UIMA ${project.artifactId}
This Jar contains resources
@@ -41,13 +41,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc2
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc2
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
- http://svn.apache.org/viewvc/uima/build/tags/uima-build-resources-2-rc2
+ http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources
