Author: schor
Date: Thu Mar 28 18:42:38 2013
New Revision: 1462251
URL: http://svn.apache.org/r1462251
Log:
[UIMA-2498] merge in from trunk (nothing merged)
Modified:
uima/uimaj/branches/filteredCompress-uima-2498/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/PearPackagingMavenPlugin/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-docbooks/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-eclipse-plugins/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/jVinci/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/src/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/src/main/scripts/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-overview-and-setup/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tools/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tutorials-and-users-guides/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-soap/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-bootstrap/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-component-test-util/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/ (props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-runtime/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-update-site/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/document.png
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/explorer.png
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/fsview.png
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/plugin.xml
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/pom.xml
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/TypeSystemLocationPropertyPage.java
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/resources/org/apache/uima/caseditor/ide/wizards/ts.xml
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-debug/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-jcasgen/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-pear-packager/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-runtime/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-internal-tools/
(props changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-test-util/ (props
changed)
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/ (props
changed)
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/PearPackagingMavenPlugin/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/PearPackagingMavenPlugin:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/aggregate-uimaj:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-docbooks/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/aggregate-uimaj-docbooks:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/aggregate-uimaj-eclipse-plugins/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/jVinci/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/jVinci:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/src/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/src:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/src/main/scripts/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/src/main/scripts:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-overview-and-setup/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-overview-and-setup:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-references:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uima-docbook-tools:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-tutorials-and-users-guides/
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-soap/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-adapter-soap:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-adapter-vinci:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-bootstrap/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-bootstrap:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-component-test-util/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-component-test-util:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-core:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-core/src/main/java:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-cpe:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-document-annotation:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-eclipse-feature-runtime:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-eclipse-feature-tools:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-eclipse-update-site:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/document.png
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/icons/svgicons/document.png:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/explorer.png
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/icons/svgicons/explorer.png:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/icons/svgicons/fsview.png
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/icons/svgicons/fsview.png:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/plugin.xml
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/pom.xml
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/pom.xml:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/TypeSystemLocationPropertyPage.java
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/TypeSystemLocationPropertyPage.java:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide/src/main/resources/org/apache/uima/caseditor/ide/wizards/ts.xml
------------------------------------------------------------------------------
Merged
/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/resources/org/apache/uima/caseditor/ide/wizards/ts.xml:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-configurator:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-debug/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-debug:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-jcasgen:r1462243-1462247
Propchange:
uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-pear-packager/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-pear-packager:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-runtime/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-ep-runtime:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-examples:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-internal-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-internal-tools:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-test-util/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-test-util:r1462243-1462247
Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/
------------------------------------------------------------------------------
Merged /uima/uimaj/trunk/uimaj-tools:r1462243-1462247
