svn commit: r945136 - in /uima/build/trunk: parent-poms/ parent-poms/parent-pom-annotator/ parent-poms/parent-pom-distr/ parent-poms/parent-pom-docbook/ parent-poms/parent-pom-eclipse-plugins-ibm-noti

2010-05-17 Thread schor
Author: schor
Date: Mon May 17 13:17:28 2010
New Revision: 945136

URL: http://svn.apache.org/viewvc?rev=945136view=rev
Log:
[UIMA-1756] add xml header to poms - specifying xml version 1.0 and utf-8 
encoding

Added:
uima/build/trunk/parent-poms/target/
uima/build/trunk/parent-poms/target/rat.txt
Modified:
uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
uima/build/trunk/parent-poms/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-olink/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/pom.xml

Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=945136r1=945135r2=945136view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Mon May 17 
13:17:28 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=945136r1=945135r2=945136view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Mon May 17 13:17:28 
2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=945136r1=945135r2=945136view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Mon May 17 13:17:28 
2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: 
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml?rev=945136r1=945135r2=945136view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml 
(original)
+++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml 
Mon May 17 13:17:28 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml?rev=945136r1=945135r2=945136view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml Mon May 17 
13:17:28 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml?rev=945136r1=945135r2=945136view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml Mon May 17 
13:17:28 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
URL: 

svn commit: r945137 - in /uima/uima-as/trunk: aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-distr/ uima-as-distr/src/main/examples/run_configuration/ uima-as-docbooks/ uimaj-as-activem

2010-05-17 Thread schor
Author: schor
Date: Mon May 17 13:17:35 2010
New Revision: 945137

URL: http://svn.apache.org/viewvc?rev=945137view=rev
Log:
[UIMA-1756] add xml header to poms - specifying xml version 1.0 and utf-8 
encoding

Modified:
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/trunk/aggregate-uima-as/pom.xml
uima/uima-as/trunk/uima-as-distr/pom.xml
uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA 
Deploy AS Service.launch
uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA 
Run Remote Async AE.launch
uima/uima-as/trunk/uima-as-docbooks/pom.xml
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-core/pom.xml
uima/uima-as/trunk/uimaj-as-jms/pom.xml
uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml

Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Mon May 17 
13:17:35 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
specific language governing permissions and limitations
under the License.
 --
-
 project xmlns=http://maven.apache.org/POM/4.0.0;
   xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;

Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Mon May 17 13:17:35 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: uima/uima-as/trunk/uima-as-distr/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-distr/pom.xml Mon May 17 13:17:35 2010
@@ -1,3 +1,4 @@
+?xml version=1.0 encoding=UTF-8?
 !--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file

Modified: 
uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA 
Deploy AS Service.launch
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA%20Deploy%20AS%20Service.launch?rev=945137r1=945136r2=945137view=diff
==
--- uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA 
Deploy AS Service.launch (original)
+++ uima/uima-as/trunk/uima-as-distr/src/main/examples/run_configuration/UIMA 
Deploy AS Service.launch Mon May 17 13:17:35 2010
@@ -1,39 +1,23 @@
-?xml version=1.0 encoding=UTF-8?
-!--
-   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 standalone=no?
 launchConfiguration type=org.eclipse.jdt.launching.localJavaApplication
-stringAttribute key=org.eclipse.jdt.launching.MAIN_TYPE 
value=org.apache.uima.adapter.jms.service.UIMA_Service/
-stringAttribute key=org.eclipse.jdt.launching.PROGRAM_ARGUMENTS 
value=-saxonURL quot;file:${env_var:UIMA_HOME}/saxon/saxon8.jarquot; -xslt 
quot;${env_var:UIMA_HOME}/bin/dd2spring.xslquot; -dd 

svn commit: r945266 - /uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java

2010-05-17 Thread cwiklik
Author: cwiklik
Date: Mon May 17 17:40:32 2010
New Revision: 945266

URL: http://svn.apache.org/viewvc?rev=945266view=rev
Log:
UIMA-1786 modified handleProcessReplyFromCasMultiplier() to send free cas 
request before checking if the CAS has already expired due to a previous 
timeout.

Modified:

uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java

Modified: 
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=945266r1=945265r2=945266view=diff
==
--- 
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
 (original)
+++ 
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
 Mon May 17 17:40:32 2010
@@ -1214,27 +1214,6 @@ public abstract class BaseUIMAAsynchrono
 // exists in the client's cache.
 // Fetch the input CAS Reference Id from which the CAS being processed was 
generated from
 String inputCasReferenceId = 
message.getStringProperty(AsynchAEMessage.InputCasReference);
-// Fetch an entry from the client cache for a given input CAS id. This 
would be an id
-// of the CAS that the client sent out to the service.
-ClientRequest inputCasCachedRequest = (ClientRequest) 
clientCache.get(inputCasReferenceId);
-if (inputCasCachedRequest == null) {
-  if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
-// Most likely expired message. Already handled as timeout. Discard 
the message and move on
-// to the next
-UIMAFramework.getLogger(CLASS_NAME).logrb(
-Level.INFO,
-CLASS_NAME.getName(),
-handleProcessReplyFromCasMultiplier,
-JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
-UIMAJMS_received_expired_msg_INFO,
-new Object[] { 
message.getStringProperty(AsynchAEMessage.MessageFrom),
-message.getStringProperty(AsynchAEMessage.CasReference) });
-  }
-  return;
-}
-if (inputCasCachedRequest.isSynchronousInvocation()) {
-  handleProcessReplyFromSynchronousCall(inputCasCachedRequest, message);
-}
 // Fetch the destination for Free CAS notification
 Destination freeCASNotificationDestination = message.getJMSReplyTo();
 if (freeCASNotificationDestination != null) {
@@ -1267,6 +1246,28 @@ public abstract class BaseUIMAAsynchrono
 }
   }
 }
+
+// Fetch an entry from the client cache for a given input CAS id. This 
would be an id
+// of the CAS that the client sent out to the service.
+ClientRequest inputCasCachedRequest = (ClientRequest) 
clientCache.get(inputCasReferenceId);
+if (inputCasCachedRequest == null) {
+  if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
+// Most likely expired message. Already handled as timeout. Discard 
the message and move on
+// to the next
+UIMAFramework.getLogger(CLASS_NAME).logrb(
+Level.INFO,
+CLASS_NAME.getName(),
+handleProcessReplyFromCasMultiplier,
+JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
+UIMAJMS_received_expired_msg_INFO,
+new Object[] { 
message.getStringProperty(AsynchAEMessage.MessageFrom),
+message.getStringProperty(AsynchAEMessage.CasReference) });
+  }
+  return;
+}
+if (inputCasCachedRequest.isSynchronousInvocation()) {
+  handleProcessReplyFromSynchronousCall(inputCasCachedRequest, message);
+}
 CAS cas = null;
 if (message instanceof TextMessage) {
   cas = deserializeCAS(((TextMessage) message).getText(), SHADOW_CAS_POOL);




svn commit: r945313 - /uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml

2010-05-17 Thread cwiklik
Author: cwiklik
Date: Mon May 17 19:05:33 2010
New Revision: 945313

URL: http://svn.apache.org/viewvc?rev=945313view=rev
Log:
UIMA-1786 Added to support testClientProcessTimeoutWithAggregateMultiplier() 
test

Added:

uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml

Added: 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml?rev=945313view=auto
==
--- 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml
 (added)
+++ 
uima/uima-as/trunk/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleTestAggregateCasMultiplierWithDelay.xml
 Mon May 17 19:05:33 2010
@@ -0,0 +1,67 @@
+?xml version=1.0 encoding=UTF-8?
+
+   !--
+***
+* 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.
+***
+   --
+   
+analysisEngineDescription xmlns=http://uima.apache.org/resourceSpecifier;
+  frameworkImplementationorg.apache.uima.java/frameworkImplementation
+  primitivefalse/primitive
+  delegateAnalysisEngineSpecifiers
+
+delegateAnalysisEngine key=TestMultiplier
+  import location=../multiplier/SimpleCasGenerator.xml/
+/delegateAnalysisEngine
+
+
+  delegateAnalysisEngine key=NoOp
+  import location=NoOpAnnotatorWithLongDelay.xml/
+/delegateAnalysisEngine
+  
+  /delegateAnalysisEngineSpecifiers
+  analysisEngineMetaData
+nameTest Aggregate TAE/name
+descriptionDetects Nothing/description
+configurationParameters/
+configurationParameterSettings/
+flowConstraints
+  fixedFlow
+  
+nodeTestMultiplier/node
+nodeNoOp/node 
+  /fixedFlow
+/flowConstraints
+capabilities
+  capability
+inputs/
+outputs
+/outputs
+languagesSupported
+  languageen/language
+/languagesSupported
+  /capability
+/capabilities
+   operationalProperties
+   modifiesCastrue/modifiesCas
+   multipleDeploymentAllowedtrue/multipleDeploymentAllowed
+   outputsNewCASestrue/outputsNewCASes
+   /operationalProperties
+  /analysisEngineMetaData
+/analysisEngineDescription




svn commit: r945442 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards: DocumentImportStructureProvider.java ImportDocumentWizard.java ImportDocumentWizardPa

2010-05-17 Thread joern
Author: joern
Date: Tue May 18 00:07:44 2010
New Revision: 945442

URL: http://svn.apache.org/viewvc?rev=945442view=rev
Log:
UIMA 1784: Added support for user defined CAS format

Modified:

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java

uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java?rev=945442r1=945441r2=945442view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
 Tue May 18 00:07:44 2010
@@ -54,14 +54,17 @@ import org.xml.sax.SAXException;
 final class DocumentImportStructureProvider implements 
IImportStructureProvider {
 
private final Charset importEncoding;
-   
+   
+   private final DocumentFormat casFormat;
   /**
* Constructs a new DocumentImportStructureProvider object.
*
* @param containerFullPath
*/
-  public DocumentImportStructureProvider(String importEncoding) {
+  public DocumentImportStructureProvider(String importEncoding,
+ DocumentFormat casFormat) {
  this.importEncoding = Charset.forName(importEncoding);
+ this.casFormat = casFormat;
   }
 
   public ListObject getChildren(Object element) {
@@ -138,7 +141,7 @@ final class DocumentImportStructureProvi
 in = new FileInputStream((File) element);
 String text = convert(in);
 
-return getDocument(text, DocumentFormat.XMI);
+return getDocument(text, casFormat);
   } catch (FileNotFoundException e) {
 return null;
   } catch (IOException e) {
@@ -169,7 +172,7 @@ final class DocumentImportStructureProvi
   textStringBuffer.append(new String(readBuffer, 0, length, 
importEncoding));
 }
 
-return getDocument(textStringBuffer.toString(), DocumentFormat.XMI);
+return getDocument(textStringBuffer.toString(), casFormat);
   } catch (FileNotFoundException e) {
 return null;
   } catch (IOException e) {
@@ -222,8 +225,19 @@ final class DocumentImportStructureProvi
 if (fileName.endsWith(.rtf) || fileName.endsWith(.txt)) {
   int nameWithouEndingLength = fileName.lastIndexOf(.);
   String nameWithouEnding = fileName.substring(0, nameWithouEndingLength);
-
-  return nameWithouEnding + .xmi;
+  
+  String ending;
+  if (DocumentFormat.XMI.equals(casFormat)) {
+ ending = xmi;
+  }
+  else if (DocumentFormat.XCAS.equals(casFormat)) {
+ ending = xcas;
+  }
+  else {
+ throw new IllegalStateException(Unkown DocumentFormat!);
+  }
+  
+   return nameWithouEnding + . + ending;
 } else {
   return fileName;
 }

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java?rev=945442r1=945441r2=945442view=diff
==
--- 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java
 Tue May 18 00:07:44 2010
@@ -54,7 +54,8 @@ public final class ImportDocumentWizard 
 
   @Override
   public boolean performFinish() {
-IImportStructureProvider importProvider = new 
DocumentImportStructureProvider(mMainPage.getTextEncoding());
+IImportStructureProvider importProvider = new 
DocumentImportStructureProvider(
+   mMainPage.getTextEncoding(), mMainPage.getCasFormat());
 
 ImportOperation operation =
 new ImportOperation(mMainPage.getImportDestinationPath(), 
importProvider, null,

Modified: 
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java?rev=945442r1=945441r2=945442view=diff