You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2008/08/30 00:11:30 UTC

svn commit: r690405 [19/26] - in /incubator/uima/uimaj/trunk/uimaj-core: ./ src/main/java/org/apache/uima/ src/main/java/org/apache/uima/analysis_component/ src/main/java/org/apache/uima/analysis_engine/ src/main/java/org/apache/uima/analysis_engine/an...

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java?rev=690405&r1=690404&r2=690405&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java Fri Aug 29 15:10:52 2008
@@ -1,264 +1,264 @@
-/*
- * 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.
- */
-package org.apache.uima.pear.tools;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.jar.JarFile;
-
-import org.apache.uima.UIMAFramework;
-import org.apache.uima.pear.util.MessageRouter;
-import org.apache.uima.util.Level;
-import org.xml.sax.SAXException;
-
-/**
- * The <code>PackageInstaller</code> class is the main user API for installing
- * PEAR packages. The class has a static method <code>installPackage</code> to
- * install PEAR packages that returns a <code>PackageBrowser</code> object
- * containing all the needed information about the installed PEAR package.
- * 
- * @see org.apache.uima.pear.tools.PackageBrowser
- * 
- */
-public class PackageInstaller {
-
-   private static final String PEAR_MESSAGE_RESOURCE_BUNDLE = "org.apache.uima.pear.pear_messages";
-
-   /**
-    * Installs the specified PEAR package to the specified install location.
-    * After the installation is completed, an optional installation verification
-    * step can be executed. This verification uses the main component descriptor
-    * to instantiate the UIMA resource, encapsulated in the PEAR package, and
-    * may run some additional tests, if applicable
-    * 
-    * @param installDir
-    *           PEAR package install location
-    * @param pearPackage
-    *           PEAR package file location to install
-    * @param verify
-    *           If true the PEAR package verification is done after the
-    *           installation
-    * 
-    * @return Returns a <code>PackageBrowser</code> object containing all PEAR
-    *         package install settings
-    * 
-    * @throws PackageInstallerException
-    *            If an error occurred during the pear installation or
-    *            verification.
-    */
-   public static PackageBrowser installPackage(File installDir,
-         File pearPackage, boolean verify) throws PackageInstallerException {
-      return PackageInstaller.installPackage(installDir, pearPackage, verify,
-            true);
-
-   }
-
-   /**
-    * Installs the specified PEAR package to the specified install location.
-    * After the installation is completed, an optional installation verification
-    * step can be executed. This verification uses the main component descriptor
-    * to instantiate the UIMA resource, encapsulated in the PEAR package, and
-    * may run some additional tests, if applicable
-    * 
-    * @param installDir
-    *           PEAR package install location
-    * @param pearPackage
-    *           PEAR package file location to install
-    * @param verify
-    *           If true the PEAR package verification is done after the
-    *           installation
-    * @param cleanInstallDir
-    *           If <code>true</code>, the target installation directory will
-    *           be cleaned before the PEAR file is installed.
-    * @return Returns a <code>PackageBrowser</code> object containing all PEAR
-    *         package install settings
-    * 
-    * @throws PackageInstallerException
-    *            If an error occurred during the pear installation or
-    *            verification.
-    */
-   public static PackageBrowser installPackage(File installDir,
-         File pearPackage, boolean verify, boolean cleanInstallDir)
-         throws PackageInstallerException {
-
-      // componentId for the given pear package
-      String componentId;
-
-      JarFile jarFile = null;
-
-      // get componentId from the given pear package, componentId needed to
-      // install the package
-      // correctly
-      try {
-         // check if pear file exists
-         if (!pearPackage.canRead()) {
-            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-                  "error_pear_package_path_invalid", new Object[] { pearPackage
-                        .getAbsolutePath() });
-         }
-
-         // get installDescriptor from pear file
-         jarFile = new JarFile(pearPackage);
-         InstallationDescriptorHandler insdHandler = new InstallationDescriptorHandler();
-         insdHandler.parseInstallationDescriptor(jarFile);
-         InstallationDescriptor instObj = insdHandler
-               .getInstallationDescriptor();
-         if (instObj != null) {
-            componentId = instObj.getMainComponentId();
-         } else {
-            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-                  "error_parsing_pear_package_desc", new Object[] { pearPackage
-                        .getAbsolutePath() });
-         }
-      } catch (IOException ex) {
-         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-               "error_parsing_pear_package_desc", new Object[] { pearPackage
-                     .getAbsolutePath() }, ex);
-      } catch (SAXException ex) {
-         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-               "error_parsing_pear_package_desc", new Object[] { pearPackage
-                     .getAbsolutePath() }, ex);
-      } finally {
-         if (jarFile != null)
-            try {
-               jarFile.close();
-            } catch (IOException ioe) {
-               throw new PackageInstallerException(
-                     PEAR_MESSAGE_RESOURCE_BUNDLE,
-                     "Can't close open PEAR file : " + jarFile.getName());
-            }
-      }
-
-      // create message listener for the pear installer
-      MessageRouter.StdChannelListener msgListener = new MessageRouter.StdChannelListener() {
-         public void errMsgPosted(String errMsg) {
-            UIMAFramework.getLogger(PackageInstaller.class).logrb(Level.SEVERE,
-                  "PackageInstaller", "installPackage",
-                  PEAR_MESSAGE_RESOURCE_BUNDLE, "package_installer_error",
-                  errMsg);
-         }
-
-         public void outMsgPosted(String outMsg) {
-            UIMAFramework.getLogger(PackageInstaller.class).logrb(Level.INFO,
-                  "PackageInstaller", "installPackage",
-                  PEAR_MESSAGE_RESOURCE_BUNDLE, "package_installer_message",
-                  outMsg);
-         }
-      };
-
-      // create installation controller and to install the pear package
-      InstallationController controller = new InstallationController(
-            componentId, pearPackage, installDir, false, msgListener,
-            cleanInstallDir);
-
-      // install main component
-      if (controller.installComponent() == null) {
-
-         // installation failed
-         String errorMessage = controller.getInstallationMsg();
-
-         // stop controller messaging service
-         controller.terminate();
-
-         if (errorMessage != null) {
-            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-                  "error_installing_main_component", new Object[] {
-                        componentId, errorMessage });
-         } else {
-            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-                  "error_installing_main_component_unknown",
-                  new Object[] { componentId });
-         }
-      }
-
-      // installation now complete !!
-
-      // save modified installation descriptor file
-      try {
-         controller.saveInstallationDescriptorFile();
-      } catch (IOException ex) {
-
-         // stop controller messaging service
-         controller.terminate();
-
-         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-               "error_installing_main_component", new Object[] { componentId,
-                     ex.getMessage() }, ex);
-      }
-
-      // create package browser object with the installed pear
-      PackageBrowser pkgBrowser = null;
-
-      try {
-         // initialize package browser object
-         pkgBrowser = new PackageBrowser(new File(installDir, componentId));
-
-         // check if package browser could be initialized
-         if (pkgBrowser == null) {
-
-            // stop controller messaging service
-            controller.terminate();
-
-            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-                  "error_reading_installed_pear_settings",
-                  new Object[] { componentId });
-         }
-      } catch (IOException ex) {
-         // stop controller messaging service
-         controller.terminate();
-
-         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
-               "error_reading_installed_pear_settings",
-               new Object[] { componentId }, ex);
-      }
-
-      // installation verification
-      if (verify) {
-         if (!controller.verifyComponent()) {
-
-            // verification failed
-            String errorMessage = controller.getVerificationMsg();
-
-            // stop controller messaging service
-            controller.terminate();
-
-            if (errorMessage != null) {
-               throw new PackageInstallerException(
-                     PEAR_MESSAGE_RESOURCE_BUNDLE, "error_verify_installation",
-                     new Object[] { componentId, errorMessage });
-            } else {
-               throw new PackageInstallerException(
-                     PEAR_MESSAGE_RESOURCE_BUNDLE,
-                     "error_verify_installation_unknown",
-                     new Object[] { componentId });
-            }
-         } else {
-            UIMAFramework.getLogger(PackageInstaller.class).logrb(Level.INFO,
-                  "PackageInstaller", "installPackage",
-                  PEAR_MESSAGE_RESOURCE_BUNDLE,
-                  "installation_verification_completed", componentId);
-         }
-      }
-
-      // stop controller messaging service
-      controller.terminate();
-
-      return pkgBrowser;
-   }
-}
+/*
+ * 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.
+ */
+package org.apache.uima.pear.tools;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.jar.JarFile;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.pear.util.MessageRouter;
+import org.apache.uima.util.Level;
+import org.xml.sax.SAXException;
+
+/**
+ * The <code>PackageInstaller</code> class is the main user API for installing
+ * PEAR packages. The class has a static method <code>installPackage</code> to
+ * install PEAR packages that returns a <code>PackageBrowser</code> object
+ * containing all the needed information about the installed PEAR package.
+ * 
+ * @see org.apache.uima.pear.tools.PackageBrowser
+ * 
+ */
+public class PackageInstaller {
+
+   private static final String PEAR_MESSAGE_RESOURCE_BUNDLE = "org.apache.uima.pear.pear_messages";
+
+   /**
+    * Installs the specified PEAR package to the specified install location.
+    * After the installation is completed, an optional installation verification
+    * step can be executed. This verification uses the main component descriptor
+    * to instantiate the UIMA resource, encapsulated in the PEAR package, and
+    * may run some additional tests, if applicable
+    * 
+    * @param installDir
+    *           PEAR package install location
+    * @param pearPackage
+    *           PEAR package file location to install
+    * @param verify
+    *           If true the PEAR package verification is done after the
+    *           installation
+    * 
+    * @return Returns a <code>PackageBrowser</code> object containing all PEAR
+    *         package install settings
+    * 
+    * @throws PackageInstallerException
+    *            If an error occurred during the pear installation or
+    *            verification.
+    */
+   public static PackageBrowser installPackage(File installDir,
+         File pearPackage, boolean verify) throws PackageInstallerException {
+      return PackageInstaller.installPackage(installDir, pearPackage, verify,
+            true);
+
+   }
+
+   /**
+    * Installs the specified PEAR package to the specified install location.
+    * After the installation is completed, an optional installation verification
+    * step can be executed. This verification uses the main component descriptor
+    * to instantiate the UIMA resource, encapsulated in the PEAR package, and
+    * may run some additional tests, if applicable
+    * 
+    * @param installDir
+    *           PEAR package install location
+    * @param pearPackage
+    *           PEAR package file location to install
+    * @param verify
+    *           If true the PEAR package verification is done after the
+    *           installation
+    * @param cleanInstallDir
+    *           If <code>true</code>, the target installation directory will
+    *           be cleaned before the PEAR file is installed.
+    * @return Returns a <code>PackageBrowser</code> object containing all PEAR
+    *         package install settings
+    * 
+    * @throws PackageInstallerException
+    *            If an error occurred during the pear installation or
+    *            verification.
+    */
+   public static PackageBrowser installPackage(File installDir,
+         File pearPackage, boolean verify, boolean cleanInstallDir)
+         throws PackageInstallerException {
+
+      // componentId for the given pear package
+      String componentId;
+
+      JarFile jarFile = null;
+
+      // get componentId from the given pear package, componentId needed to
+      // install the package
+      // correctly
+      try {
+         // check if pear file exists
+         if (!pearPackage.canRead()) {
+            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+                  "error_pear_package_path_invalid", new Object[] { pearPackage
+                        .getAbsolutePath() });
+         }
+
+         // get installDescriptor from pear file
+         jarFile = new JarFile(pearPackage);
+         InstallationDescriptorHandler insdHandler = new InstallationDescriptorHandler();
+         insdHandler.parseInstallationDescriptor(jarFile);
+         InstallationDescriptor instObj = insdHandler
+               .getInstallationDescriptor();
+         if (instObj != null) {
+            componentId = instObj.getMainComponentId();
+         } else {
+            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+                  "error_parsing_pear_package_desc", new Object[] { pearPackage
+                        .getAbsolutePath() });
+         }
+      } catch (IOException ex) {
+         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+               "error_parsing_pear_package_desc", new Object[] { pearPackage
+                     .getAbsolutePath() }, ex);
+      } catch (SAXException ex) {
+         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+               "error_parsing_pear_package_desc", new Object[] { pearPackage
+                     .getAbsolutePath() }, ex);
+      } finally {
+         if (jarFile != null)
+            try {
+               jarFile.close();
+            } catch (IOException ioe) {
+               throw new PackageInstallerException(
+                     PEAR_MESSAGE_RESOURCE_BUNDLE,
+                     "Can't close open PEAR file : " + jarFile.getName());
+            }
+      }
+
+      // create message listener for the pear installer
+      MessageRouter.StdChannelListener msgListener = new MessageRouter.StdChannelListener() {
+         public void errMsgPosted(String errMsg) {
+            UIMAFramework.getLogger(PackageInstaller.class).logrb(Level.SEVERE,
+                  "PackageInstaller", "installPackage",
+                  PEAR_MESSAGE_RESOURCE_BUNDLE, "package_installer_error",
+                  errMsg);
+         }
+
+         public void outMsgPosted(String outMsg) {
+            UIMAFramework.getLogger(PackageInstaller.class).logrb(Level.INFO,
+                  "PackageInstaller", "installPackage",
+                  PEAR_MESSAGE_RESOURCE_BUNDLE, "package_installer_message",
+                  outMsg);
+         }
+      };
+
+      // create installation controller and to install the pear package
+      InstallationController controller = new InstallationController(
+            componentId, pearPackage, installDir, false, msgListener,
+            cleanInstallDir);
+
+      // install main component
+      if (controller.installComponent() == null) {
+
+         // installation failed
+         String errorMessage = controller.getInstallationMsg();
+
+         // stop controller messaging service
+         controller.terminate();
+
+         if (errorMessage != null) {
+            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+                  "error_installing_main_component", new Object[] {
+                        componentId, errorMessage });
+         } else {
+            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+                  "error_installing_main_component_unknown",
+                  new Object[] { componentId });
+         }
+      }
+
+      // installation now complete !!
+
+      // save modified installation descriptor file
+      try {
+         controller.saveInstallationDescriptorFile();
+      } catch (IOException ex) {
+
+         // stop controller messaging service
+         controller.terminate();
+
+         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+               "error_installing_main_component", new Object[] { componentId,
+                     ex.getMessage() }, ex);
+      }
+
+      // create package browser object with the installed pear
+      PackageBrowser pkgBrowser = null;
+
+      try {
+         // initialize package browser object
+         pkgBrowser = new PackageBrowser(new File(installDir, componentId));
+
+         // check if package browser could be initialized
+         if (pkgBrowser == null) {
+
+            // stop controller messaging service
+            controller.terminate();
+
+            throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+                  "error_reading_installed_pear_settings",
+                  new Object[] { componentId });
+         }
+      } catch (IOException ex) {
+         // stop controller messaging service
+         controller.terminate();
+
+         throw new PackageInstallerException(PEAR_MESSAGE_RESOURCE_BUNDLE,
+               "error_reading_installed_pear_settings",
+               new Object[] { componentId }, ex);
+      }
+
+      // installation verification
+      if (verify) {
+         if (!controller.verifyComponent()) {
+
+            // verification failed
+            String errorMessage = controller.getVerificationMsg();
+
+            // stop controller messaging service
+            controller.terminate();
+
+            if (errorMessage != null) {
+               throw new PackageInstallerException(
+                     PEAR_MESSAGE_RESOURCE_BUNDLE, "error_verify_installation",
+                     new Object[] { componentId, errorMessage });
+            } else {
+               throw new PackageInstallerException(
+                     PEAR_MESSAGE_RESOURCE_BUNDLE,
+                     "error_verify_installation_unknown",
+                     new Object[] { componentId });
+            }
+         } else {
+            UIMAFramework.getLogger(PackageInstaller.class).logrb(Level.INFO,
+                  "PackageInstaller", "installPackage",
+                  PEAR_MESSAGE_RESOURCE_BUNDLE,
+                  "installation_verification_completed", componentId);
+         }
+      }
+
+      // stop controller messaging service
+      controller.terminate();
+
+      return pkgBrowser;
+   }
+}

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java?rev=690405&r1=690404&r2=690405&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java Fri Aug 29 15:10:52 2008
@@ -1,101 +1,101 @@
-/*
- * 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.
- */
-package org.apache.uima.pear.tools;
-
-import org.apache.uima.InternationalizedRuntimeException;
-
-/**
- * Exception thrown if PEAR installation fails.
- */
-public class PackageInstallerException extends InternationalizedRuntimeException {
-  private static final long serialVersionUID = 6261840563059646801L;
-
-  /**
-   * Creates a new <code>PackageInstallerException</code> with the specified message.
-   * 
-   * @param aResourceBundleName
-   *          the base name of the resource bundle in which the message for this exception is
-   *          located.
-   * @param aMessageKey
-   *          an identifier that maps to the message for this exception. The message may contain
-   *          placeholders for arguments as defined by the
-   *          {@link java.text.MessageFormat MessageFormat} class.
-   * @param aArguments
-   *          The arguments to the message. <code>null</code> may be used if the message has no
-   *          arguments.
-   */
-  public PackageInstallerException(String aResourceBundleName, String aMessageKey,
-          Object[] aArguments) {
-    super(aResourceBundleName, aMessageKey, aArguments, null);
-  }
-
-  /**
-   * Creates a new <code>PackageInstallerException</code> with the specified message.
-   * 
-   * @param aResourceBundleName
-   *          the base name of the resource bundle in which the message for this exception is
-   *          located.
-   * @param aMessageKey
-   *          an identifier that maps to the message for this exception. The message may contain
-   *          placeholders for arguments as defined by the
-   *          {@link java.text.MessageFormat MessageFormat} class.
-   */
-  public PackageInstallerException(String aResourceBundleName, String aMessageKey) {
-    super(aResourceBundleName, aMessageKey, null, null);
-  }
-
-  /**
-   * Creates a new <code>PackageInstallerException</code> with the specified message and cause.
-   * 
-   * @param aResourceBundleName
-   *          the base name of the resource bundle in which the message for this exception is
-   *          located.
-   * @param aMessageKey
-   *          an identifier that maps to the message for this exception. The message may contain
-   *          placeholders for arguments as defined by the
-   *          {@link java.text.MessageFormat MessageFormat} class.
-   * @param aCause
-   *          the original exception that caused this exception to be thrown, if any
-   */
-  public PackageInstallerException(String aResourceBundleName, String aMessageKey, Throwable aCause) {
-    super(aResourceBundleName, aMessageKey, null, aCause);
-  }
-
-  /**
-   * Creates a new <code>PackageInstallerException</code> with the specified message and cause.
-   * 
-   * @param aResourceBundleName
-   *          the base name of the resource bundle in which the message for this exception is
-   *          located.
-   * @param aMessageKey
-   *          an identifier that maps to the message for this exception. The message may contain
-   *          placeholders for arguments as defined by the
-   *          {@link java.text.MessageFormat MessageFormat} class.
-   * @param aArguments
-   *          The arguments to the message. <code>null</code> may be used if the message has no
-   *          arguments.
-   * @param aCause
-   *          the original exception that caused this exception to be thrown, if any
-   */
-  public PackageInstallerException(String aResourceBundleName, String aMessageKey,
-          Object[] aArguments, Throwable aCause) {
-    super(aResourceBundleName, aMessageKey, aArguments, aCause);
-  }
-
-}
+/*
+ * 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.
+ */
+package org.apache.uima.pear.tools;
+
+import org.apache.uima.InternationalizedRuntimeException;
+
+/**
+ * Exception thrown if PEAR installation fails.
+ */
+public class PackageInstallerException extends InternationalizedRuntimeException {
+  private static final long serialVersionUID = 6261840563059646801L;
+
+  /**
+   * Creates a new <code>PackageInstallerException</code> with the specified message.
+   * 
+   * @param aResourceBundleName
+   *          the base name of the resource bundle in which the message for this exception is
+   *          located.
+   * @param aMessageKey
+   *          an identifier that maps to the message for this exception. The message may contain
+   *          placeholders for arguments as defined by the
+   *          {@link java.text.MessageFormat MessageFormat} class.
+   * @param aArguments
+   *          The arguments to the message. <code>null</code> may be used if the message has no
+   *          arguments.
+   */
+  public PackageInstallerException(String aResourceBundleName, String aMessageKey,
+          Object[] aArguments) {
+    super(aResourceBundleName, aMessageKey, aArguments, null);
+  }
+
+  /**
+   * Creates a new <code>PackageInstallerException</code> with the specified message.
+   * 
+   * @param aResourceBundleName
+   *          the base name of the resource bundle in which the message for this exception is
+   *          located.
+   * @param aMessageKey
+   *          an identifier that maps to the message for this exception. The message may contain
+   *          placeholders for arguments as defined by the
+   *          {@link java.text.MessageFormat MessageFormat} class.
+   */
+  public PackageInstallerException(String aResourceBundleName, String aMessageKey) {
+    super(aResourceBundleName, aMessageKey, null, null);
+  }
+
+  /**
+   * Creates a new <code>PackageInstallerException</code> with the specified message and cause.
+   * 
+   * @param aResourceBundleName
+   *          the base name of the resource bundle in which the message for this exception is
+   *          located.
+   * @param aMessageKey
+   *          an identifier that maps to the message for this exception. The message may contain
+   *          placeholders for arguments as defined by the
+   *          {@link java.text.MessageFormat MessageFormat} class.
+   * @param aCause
+   *          the original exception that caused this exception to be thrown, if any
+   */
+  public PackageInstallerException(String aResourceBundleName, String aMessageKey, Throwable aCause) {
+    super(aResourceBundleName, aMessageKey, null, aCause);
+  }
+
+  /**
+   * Creates a new <code>PackageInstallerException</code> with the specified message and cause.
+   * 
+   * @param aResourceBundleName
+   *          the base name of the resource bundle in which the message for this exception is
+   *          located.
+   * @param aMessageKey
+   *          an identifier that maps to the message for this exception. The message may contain
+   *          placeholders for arguments as defined by the
+   *          {@link java.text.MessageFormat MessageFormat} class.
+   * @param aArguments
+   *          The arguments to the message. <code>null</code> may be used if the message has no
+   *          arguments.
+   * @param aCause
+   *          the original exception that caused this exception to be thrown, if any
+   */
+  public PackageInstallerException(String aResourceBundleName, String aMessageKey,
+          Object[] aArguments, Throwable aCause) {
+    super(aResourceBundleName, aMessageKey, aArguments, aCause);
+  }
+
+}

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageInstallerException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/MessageRouter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/StringUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java?rev=690405&r1=690404&r2=690405&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java Fri Aug 29 15:10:52 2008
@@ -1,268 +1,268 @@
-/*
- * 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.
- */
-
-package org.apache.uima.pear.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Hashtable;
-
-import org.apache.uima.UIMAException;
-import org.apache.uima.UIMAFramework;
-import org.apache.uima.UIMARuntimeException;
-import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.collection.CasConsumerDescription;
-import org.apache.uima.collection.CasInitializerDescription;
-import org.apache.uima.collection.CollectionReaderDescription;
-import org.apache.uima.resource.CustomResourceSpecifier;
-import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.util.XMLInputSource;
-import org.apache.uima.util.XMLParser;
-
-/**
- * The <code>UIMAUtil</code> class provides convenient methods for handling UIMA specific objects.
- * 
- */
-
-public class UIMAUtil {
-  // UIMA component categories
-  /**
-   * Analysis Engine
-   */
-  public static final String ANALYSIS_ENGINE_CTG = "AE";
-
-  /**
-   * CAS Consumer
-   */
-  public static final String CAS_CONSUMER_CTG = "CC";
-
-  /**
-   * CAS Initializer
-   */
-  public static final String CAS_INITIALIZER_CTG = "CI";
-
-  /**
-   * Collection Reader
-   */
-  public static final String COLLECTION_READER_CTG = "CR";
-
-  /**
-   * CPE Configuration
-   */
-  public static final String CPE_CONFIGURATION_CTG = "CPE";
-
-  /**
-   * Type System
-   */
-  public static final String TYPE_SYSTEM_CTG = "TS";
-
-  /**
-   * Reusable Resource
-   */
-  public static final String REUSABLE_RESOURCE_CTG = "RR";
-
-  // static attributes
-  private static Hashtable __errTableByUri = new Hashtable();
-
-  /**
-   * Returns the last logged <code>Exception</code> object associated with a given XML descriptor
-   * file.
-   * 
-   * @param xmlDescFile
-   *          The given XML descriptor file.
-   * @return The last logged <code>Exception</code> object associated with the given XML
-   *         descriptor file.
-   */
-  public static Exception getLastErrorForXmlDesc(File xmlDescFile) {
-    return (Exception) __errTableByUri.get(xmlDescFile.getAbsolutePath());
-  }
-
-  /**
-   * Returns the last logged <code>Exception</code> object associated with a given XML descriptor
-   * URL.
-   * 
-   * @param xmlDescUrl
-   *          The given XML descriptor URL.
-   * @return The last logged <code>Exception</code> object associated with the given XML
-   *         descriptor URL.
-   */
-  public static Exception getLastErrorForXmlDesc(URL xmlDescUrl) {
-    return (Exception) __errTableByUri.get(xmlDescUrl.toString());
-  }
-
-  /**
-   * Identifies a given UIMA component/resource category based on its XML descriptor. If succeeded,
-   * returns appropriate UIMA component category ID, otherwise returns <code>null</code>. If the
-   * UIMA component category cannot be identified based on the given XML descriptor file, the
-   * associated UIMA exception is logged and can be retrieved later by using the
-   * <code>getLastErrorForXmlDesc()</code> method.
-   * 
-   * @param xmlDescFile
-   *          The given component XML descriptor file.
-   * @return UIMA component category ID or <code>null</code>, if the category cannot be idetified
-   *         based on the given XML descriptor file.
-   * @throws IOException
-   *           If any I/O exception occurred.
-   */
-  public static synchronized String identifyUimaComponentCategory(File xmlDescFile)
-          throws IOException {
-    return identifyUimaComponentCategory(xmlDescFile, null);
-  }
-
-  /**
-   * Identifies a given UIMA component/resource category based on its XML descriptor. If succeeded,
-   * returns appropriate UIMA component category ID, otherwise returns <code>null</code>. If the
-   * UIMA component category cannot be identified based on the given XML descriptor file, the
-   * associated UIMA exception is logged and can be retrieved later by using the
-   * <code>getLastErrorForXmlDesc()</code> method.
-   * 
-   * @param xmlDescUrl
-   *          The given component XML descriptor URL.
-   * @return UIMA component category ID or <code>null</code>, if the category cannot be idetified
-   *         based on the given XML descriptor file.
-   * @throws IOException
-   *           If any I/O exception occurred.
-   */
-  public static synchronized String identifyUimaComponentCategory(URL xmlDescUrl)
-          throws IOException {
-    return identifyUimaComponentCategory(null, xmlDescUrl);
-  }
-
-  /**
-   * Internal method that identifies a given UIMA component/resource category based on its XML
-   * descriptor, passed as File or URL. If succeeded, returns appropriate UIMA component category
-   * ID, otherwise returns <code>null</code>. If the UIMA component category cannot be identified
-   * based on the given XML descriptor file, the associated UIMA exception is logged and can be
-   * retrieved later by using the <code>getLastErrorForXmlDesc()</code> method.
-   * 
-   * @param xmlDescFile
-   *          The given component XML descriptor file.
-   * @param xmlDescUrl
-   *          The given component XML descriptor URL.
-   * @return UIMA component category ID or <code>null</code>, if the category cannot be idetified
-   *         based on the given XML descriptor file.
-   * @throws IOException
-   *           If any I/O exception occurred.
-   */
-  private static synchronized String identifyUimaComponentCategory(File xmlDescFile, URL xmlDescUrl)
-          throws IOException {
-    String uimaCompCtg = null;
-    XMLInputSource xmlSource = null;
-    String xmlDescUri = (xmlDescFile != null) ? xmlDescFile.getAbsolutePath() : xmlDescUrl.toString();
-    try {
-      // clean error message
-      __errTableByUri.remove(xmlDescUri);
-      // get XMLParser
-      XMLParser xmlParser = UIMAFramework.getXMLParser();
-      // create XML source
-      xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(
-              xmlDescUrl);
-      // parse XML source and create resource specifier
-      ResourceSpecifier resourceSpec = null;
-      try {
-        resourceSpec = xmlParser.parseResourceSpecifier(xmlSource);
-      } catch (UIMAException err) {
-				__errTableByUri.put( xmlDescUri, err );
-      } catch (UIMARuntimeException exc) {
-				__errTableByUri.put( xmlDescUri, exc );
-      }
-      if (resourceSpec != null) { // AE | CR | CI | CC | CustomResourceSpecifier ?
-        // identify UIMA resource category
-        if (resourceSpec instanceof AnalysisEngineDescription) {
-          uimaCompCtg = ANALYSIS_ENGINE_CTG;
-        } else if (resourceSpec instanceof CollectionReaderDescription) {
-          uimaCompCtg = COLLECTION_READER_CTG;
-        } else if (resourceSpec instanceof CasInitializerDescription) {
-          uimaCompCtg = CAS_INITIALIZER_CTG;
-        } else if (resourceSpec instanceof CasConsumerDescription) {
-          uimaCompCtg = CAS_CONSUMER_CTG;
-        } else if (resourceSpec instanceof CustomResourceSpecifier) {
-           // try to treat custom resource specifiers as AE
-           uimaCompCtg = ANALYSIS_ENGINE_CTG;
-        }
-      }
-      if (uimaCompCtg == null) { // CPE ?
-        // refresh XML source object
-        try {
-          xmlSource.getInputStream().close();
-        } catch (Exception e) {
-        }
-        xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(xmlDescUrl);
-        try {
-          // try parsing CPE configuration
-          xmlParser.parseCpeDescription(xmlSource);
-          uimaCompCtg = CPE_CONFIGURATION_CTG;
-          __errTableByUri.remove( xmlDescUri );
-        } catch (UIMAException err) {
-          __errTableByUri.put( xmlDescUri, err );
-        } catch (UIMARuntimeException exc) {
-          __errTableByUri.put( xmlDescUri, exc );
-        }
-      }
-      if (uimaCompCtg == null) { // TS ?
-        // refresh XML source object
-        try {
-          xmlSource.getInputStream().close();
-        } catch (Exception e) {
-        }
-        xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(xmlDescUrl);
-        try {
-          // try parsing TS description
-          xmlParser.parseTypeSystemDescription(xmlSource);
-          uimaCompCtg = TYPE_SYSTEM_CTG;
-          __errTableByUri.remove( xmlDescUri );
-        } catch (UIMAException err) {
-          __errTableByUri.put( xmlDescUri, err );
-        } catch (UIMARuntimeException exc) {
-          __errTableByUri.put( xmlDescUri, exc );
-        }
-      }
-      if (uimaCompCtg == null) { // RR ?
-        // refresh XML source object
-        try {
-          xmlSource.getInputStream().close();
-        } catch (Exception e) {
-        }
-        xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(xmlDescUrl);
-        try {
-          // try parsing RES manager configuration
-          xmlParser.parseResourceManagerConfiguration(xmlSource);
-          uimaCompCtg = REUSABLE_RESOURCE_CTG;
-          __errTableByUri.remove( xmlDescUri );
-        } catch (UIMAException err) {
-          __errTableByUri.put( xmlDescUri, err );
-        } catch (UIMARuntimeException exc) {
-          __errTableByUri.put( xmlDescUri, exc );
-        }
-      }
-    } catch (IOException exc) {
-      throw exc;
-    } catch (Exception err) {
-      __errTableByUri.put( xmlDescUri, err );
-    } finally {
-      if (xmlSource != null && xmlSource.getInputStream() != null)
-        try {
-          xmlSource.getInputStream().close();
-        } catch (Exception e) {
-        }
-    }
-    return uimaCompCtg;
-  }
-}
+/*
+ * 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.
+ */
+
+package org.apache.uima.pear.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Hashtable;
+
+import org.apache.uima.UIMAException;
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.UIMARuntimeException;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.collection.CasConsumerDescription;
+import org.apache.uima.collection.CasInitializerDescription;
+import org.apache.uima.collection.CollectionReaderDescription;
+import org.apache.uima.resource.CustomResourceSpecifier;
+import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.util.XMLInputSource;
+import org.apache.uima.util.XMLParser;
+
+/**
+ * The <code>UIMAUtil</code> class provides convenient methods for handling UIMA specific objects.
+ * 
+ */
+
+public class UIMAUtil {
+  // UIMA component categories
+  /**
+   * Analysis Engine
+   */
+  public static final String ANALYSIS_ENGINE_CTG = "AE";
+
+  /**
+   * CAS Consumer
+   */
+  public static final String CAS_CONSUMER_CTG = "CC";
+
+  /**
+   * CAS Initializer
+   */
+  public static final String CAS_INITIALIZER_CTG = "CI";
+
+  /**
+   * Collection Reader
+   */
+  public static final String COLLECTION_READER_CTG = "CR";
+
+  /**
+   * CPE Configuration
+   */
+  public static final String CPE_CONFIGURATION_CTG = "CPE";
+
+  /**
+   * Type System
+   */
+  public static final String TYPE_SYSTEM_CTG = "TS";
+
+  /**
+   * Reusable Resource
+   */
+  public static final String REUSABLE_RESOURCE_CTG = "RR";
+
+  // static attributes
+  private static Hashtable __errTableByUri = new Hashtable();
+
+  /**
+   * Returns the last logged <code>Exception</code> object associated with a given XML descriptor
+   * file.
+   * 
+   * @param xmlDescFile
+   *          The given XML descriptor file.
+   * @return The last logged <code>Exception</code> object associated with the given XML
+   *         descriptor file.
+   */
+  public static Exception getLastErrorForXmlDesc(File xmlDescFile) {
+    return (Exception) __errTableByUri.get(xmlDescFile.getAbsolutePath());
+  }
+
+  /**
+   * Returns the last logged <code>Exception</code> object associated with a given XML descriptor
+   * URL.
+   * 
+   * @param xmlDescUrl
+   *          The given XML descriptor URL.
+   * @return The last logged <code>Exception</code> object associated with the given XML
+   *         descriptor URL.
+   */
+  public static Exception getLastErrorForXmlDesc(URL xmlDescUrl) {
+    return (Exception) __errTableByUri.get(xmlDescUrl.toString());
+  }
+
+  /**
+   * Identifies a given UIMA component/resource category based on its XML descriptor. If succeeded,
+   * returns appropriate UIMA component category ID, otherwise returns <code>null</code>. If the
+   * UIMA component category cannot be identified based on the given XML descriptor file, the
+   * associated UIMA exception is logged and can be retrieved later by using the
+   * <code>getLastErrorForXmlDesc()</code> method.
+   * 
+   * @param xmlDescFile
+   *          The given component XML descriptor file.
+   * @return UIMA component category ID or <code>null</code>, if the category cannot be idetified
+   *         based on the given XML descriptor file.
+   * @throws IOException
+   *           If any I/O exception occurred.
+   */
+  public static synchronized String identifyUimaComponentCategory(File xmlDescFile)
+          throws IOException {
+    return identifyUimaComponentCategory(xmlDescFile, null);
+  }
+
+  /**
+   * Identifies a given UIMA component/resource category based on its XML descriptor. If succeeded,
+   * returns appropriate UIMA component category ID, otherwise returns <code>null</code>. If the
+   * UIMA component category cannot be identified based on the given XML descriptor file, the
+   * associated UIMA exception is logged and can be retrieved later by using the
+   * <code>getLastErrorForXmlDesc()</code> method.
+   * 
+   * @param xmlDescUrl
+   *          The given component XML descriptor URL.
+   * @return UIMA component category ID or <code>null</code>, if the category cannot be idetified
+   *         based on the given XML descriptor file.
+   * @throws IOException
+   *           If any I/O exception occurred.
+   */
+  public static synchronized String identifyUimaComponentCategory(URL xmlDescUrl)
+          throws IOException {
+    return identifyUimaComponentCategory(null, xmlDescUrl);
+  }
+
+  /**
+   * Internal method that identifies a given UIMA component/resource category based on its XML
+   * descriptor, passed as File or URL. If succeeded, returns appropriate UIMA component category
+   * ID, otherwise returns <code>null</code>. If the UIMA component category cannot be identified
+   * based on the given XML descriptor file, the associated UIMA exception is logged and can be
+   * retrieved later by using the <code>getLastErrorForXmlDesc()</code> method.
+   * 
+   * @param xmlDescFile
+   *          The given component XML descriptor file.
+   * @param xmlDescUrl
+   *          The given component XML descriptor URL.
+   * @return UIMA component category ID or <code>null</code>, if the category cannot be idetified
+   *         based on the given XML descriptor file.
+   * @throws IOException
+   *           If any I/O exception occurred.
+   */
+  private static synchronized String identifyUimaComponentCategory(File xmlDescFile, URL xmlDescUrl)
+          throws IOException {
+    String uimaCompCtg = null;
+    XMLInputSource xmlSource = null;
+    String xmlDescUri = (xmlDescFile != null) ? xmlDescFile.getAbsolutePath() : xmlDescUrl.toString();
+    try {
+      // clean error message
+      __errTableByUri.remove(xmlDescUri);
+      // get XMLParser
+      XMLParser xmlParser = UIMAFramework.getXMLParser();
+      // create XML source
+      xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(
+              xmlDescUrl);
+      // parse XML source and create resource specifier
+      ResourceSpecifier resourceSpec = null;
+      try {
+        resourceSpec = xmlParser.parseResourceSpecifier(xmlSource);
+      } catch (UIMAException err) {
+				__errTableByUri.put( xmlDescUri, err );
+      } catch (UIMARuntimeException exc) {
+				__errTableByUri.put( xmlDescUri, exc );
+      }
+      if (resourceSpec != null) { // AE | CR | CI | CC | CustomResourceSpecifier ?
+        // identify UIMA resource category
+        if (resourceSpec instanceof AnalysisEngineDescription) {
+          uimaCompCtg = ANALYSIS_ENGINE_CTG;
+        } else if (resourceSpec instanceof CollectionReaderDescription) {
+          uimaCompCtg = COLLECTION_READER_CTG;
+        } else if (resourceSpec instanceof CasInitializerDescription) {
+          uimaCompCtg = CAS_INITIALIZER_CTG;
+        } else if (resourceSpec instanceof CasConsumerDescription) {
+          uimaCompCtg = CAS_CONSUMER_CTG;
+        } else if (resourceSpec instanceof CustomResourceSpecifier) {
+           // try to treat custom resource specifiers as AE
+           uimaCompCtg = ANALYSIS_ENGINE_CTG;
+        }
+      }
+      if (uimaCompCtg == null) { // CPE ?
+        // refresh XML source object
+        try {
+          xmlSource.getInputStream().close();
+        } catch (Exception e) {
+        }
+        xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(xmlDescUrl);
+        try {
+          // try parsing CPE configuration
+          xmlParser.parseCpeDescription(xmlSource);
+          uimaCompCtg = CPE_CONFIGURATION_CTG;
+          __errTableByUri.remove( xmlDescUri );
+        } catch (UIMAException err) {
+          __errTableByUri.put( xmlDescUri, err );
+        } catch (UIMARuntimeException exc) {
+          __errTableByUri.put( xmlDescUri, exc );
+        }
+      }
+      if (uimaCompCtg == null) { // TS ?
+        // refresh XML source object
+        try {
+          xmlSource.getInputStream().close();
+        } catch (Exception e) {
+        }
+        xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(xmlDescUrl);
+        try {
+          // try parsing TS description
+          xmlParser.parseTypeSystemDescription(xmlSource);
+          uimaCompCtg = TYPE_SYSTEM_CTG;
+          __errTableByUri.remove( xmlDescUri );
+        } catch (UIMAException err) {
+          __errTableByUri.put( xmlDescUri, err );
+        } catch (UIMARuntimeException exc) {
+          __errTableByUri.put( xmlDescUri, exc );
+        }
+      }
+      if (uimaCompCtg == null) { // RR ?
+        // refresh XML source object
+        try {
+          xmlSource.getInputStream().close();
+        } catch (Exception e) {
+        }
+        xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(xmlDescUrl);
+        try {
+          // try parsing RES manager configuration
+          xmlParser.parseResourceManagerConfiguration(xmlSource);
+          uimaCompCtg = REUSABLE_RESOURCE_CTG;
+          __errTableByUri.remove( xmlDescUri );
+        } catch (UIMAException err) {
+          __errTableByUri.put( xmlDescUri, err );
+        } catch (UIMARuntimeException exc) {
+          __errTableByUri.put( xmlDescUri, exc );
+        }
+      }
+    } catch (IOException exc) {
+      throw exc;
+    } catch (Exception err) {
+      __errTableByUri.put( xmlDescUri, err );
+    } finally {
+      if (xmlSource != null && xmlSource.getInputStream() != null)
+        try {
+          xmlSource.getInputStream().close();
+        } catch (Exception e) {
+        }
+    }
+    return uimaCompCtg;
+  }
+}

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableDataResourceSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CustomResourceSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/DataResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDependency.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ExternalResourceDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/FileLanguageResourceSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/FileResourceSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/JMSMessagingSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/MQMessagingSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/MailMessagingSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java?rev=690405&r1=690404&r2=690405&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java Fri Aug 29 15:10:52 2008
@@ -1,41 +1,41 @@
-/*
- * 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.
- */
-package org.apache.uima.resource;
-
-/**
- * Base interface for objects that expose a monitoring and management interface to a 
- * UIMA component or some part of the UIMA framework.
- * <p>
- * In this implementation, objects implementing this interface will always be JMX-compatible MBeans
- * that you can register with an MBeanServer. For information on JMX see <a
- * href="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/package-summary.html"/>
- */
-public interface ManagementObject {
-  /**
-   * Gets a valid JMX MBean name that is unique among all ManagementObjects in this
-   * JVM. (Technically, it is unique only among ManagementObjects objects loaded by the same
-   * ClassLoader, which is whatever ClassLoader was used to load the UIMA Framework classes.)
-   * <p>
-   * If you are running with JRE 1.5, this is the name used to register this object with the
-   * platform MBeanServer.
-   * 
-   * @return a unique MBean name
-   */
-  String getUniqueMBeanName();
-}
+/*
+ * 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.
+ */
+package org.apache.uima.resource;
+
+/**
+ * Base interface for objects that expose a monitoring and management interface to a 
+ * UIMA component or some part of the UIMA framework.
+ * <p>
+ * In this implementation, objects implementing this interface will always be JMX-compatible MBeans
+ * that you can register with an MBeanServer. For information on JMX see <a
+ * href="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/package-summary.html"/>
+ */
+public interface ManagementObject {
+  /**
+   * Gets a valid JMX MBean name that is unique among all ManagementObjects in this
+   * JVM. (Technically, it is unique only among ManagementObjects objects loaded by the same
+   * ClassLoader, which is whatever ClassLoader was used to load the UIMA Framework classes.)
+   * <p>
+   * If you are running with JRE 1.5, this is the name used to register this object with the
+   * platform MBeanServer.
+   * 
+   * @return a unique MBean name
+   */
+  String getUniqueMBeanName();
+}

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ManagementObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/MessagingSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Parameter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ParameterizedDataResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/PearSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/RelativePathResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceStub.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Session.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/SharedResourceObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/URISpecifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java?rev=690405&r1=690404&r2=690405&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java Fri Aug 29 15:10:52 2008
@@ -1,80 +1,80 @@
-/*
- * 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.
- */
-package org.apache.uima.resource.impl;
-
-import org.apache.uima.resource.CustomResourceSpecifier;
-import org.apache.uima.resource.Parameter;
-import org.apache.uima.resource.metadata.impl.MetaDataObject_impl;
-import org.apache.uima.resource.metadata.impl.PropertyXmlInfo;
-import org.apache.uima.resource.metadata.impl.XmlizationInfo;
-
-/**
- * Implementation of {@link CustomResourceSpecifier}.
- */
-public class CustomResourceSpecifier_impl extends MetaDataObject_impl implements
-        CustomResourceSpecifier {
-  private static final long serialVersionUID = 8922306013278525153L;
-  
-  private Parameter[] mParameters = new Parameter[0];
-  private String mResourceClassName;
-  
-  /* (non-Javadoc)
-   * @see org.apache.uima.resource.CustomResourceSpecifier#getParameters()
-   */
-  public Parameter[] getParameters() {
-    return mParameters;
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.uima.resource.CustomResourceSpecifier#getResourceClassName()
-   */
-  public String getResourceClassName() {
-    return mResourceClassName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.uima.resource.CustomResourceSpecifier#setParameters(org.apache.uima.resource.Parameter[])
-   */
-  public void setParameters(Parameter[] aParameters) {
-    if (aParameters != null) {
-      mParameters = aParameters;
-    } else {
-      mParameters = new Parameter[0];
-    }
-    
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.uima.resource.CustomResourceSpecifier#setResourceClassName(java.lang.String)
-   */
-  public void setResourceClassName(String aResourceClassName) {
-    mResourceClassName = aResourceClassName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.uima.resource.metadata.impl.MetaDataObject_impl#getXmlizationInfo()
-   */
-  protected XmlizationInfo getXmlizationInfo() {
-    return XMLIZATION_INFO;
-  }
-
-  static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("customResourceSpecifier",
-          new PropertyXmlInfo[] { new PropertyXmlInfo("resourceClassName"),
-              new PropertyXmlInfo("parameters")});
-}
+/*
+ * 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.
+ */
+package org.apache.uima.resource.impl;
+
+import org.apache.uima.resource.CustomResourceSpecifier;
+import org.apache.uima.resource.Parameter;
+import org.apache.uima.resource.metadata.impl.MetaDataObject_impl;
+import org.apache.uima.resource.metadata.impl.PropertyXmlInfo;
+import org.apache.uima.resource.metadata.impl.XmlizationInfo;
+
+/**
+ * Implementation of {@link CustomResourceSpecifier}.
+ */
+public class CustomResourceSpecifier_impl extends MetaDataObject_impl implements
+        CustomResourceSpecifier {
+  private static final long serialVersionUID = 8922306013278525153L;
+  
+  private Parameter[] mParameters = new Parameter[0];
+  private String mResourceClassName;
+  
+  /* (non-Javadoc)
+   * @see org.apache.uima.resource.CustomResourceSpecifier#getParameters()
+   */
+  public Parameter[] getParameters() {
+    return mParameters;
+  }
+
+  /* (non-Javadoc)
+   * @see org.apache.uima.resource.CustomResourceSpecifier#getResourceClassName()
+   */
+  public String getResourceClassName() {
+    return mResourceClassName;
+  }
+
+  /* (non-Javadoc)
+   * @see org.apache.uima.resource.CustomResourceSpecifier#setParameters(org.apache.uima.resource.Parameter[])
+   */
+  public void setParameters(Parameter[] aParameters) {
+    if (aParameters != null) {
+      mParameters = aParameters;
+    } else {
+      mParameters = new Parameter[0];
+    }
+    
+  }
+
+  /* (non-Javadoc)
+   * @see org.apache.uima.resource.CustomResourceSpecifier#setResourceClassName(java.lang.String)
+   */
+  public void setResourceClassName(String aResourceClassName) {
+    mResourceClassName = aResourceClassName;
+  }
+
+  /* (non-Javadoc)
+   * @see org.apache.uima.resource.metadata.impl.MetaDataObject_impl#getXmlizationInfo()
+   */
+  protected XmlizationInfo getXmlizationInfo() {
+    return XMLIZATION_INFO;
+  }
+
+  static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("customResourceSpecifier",
+          new PropertyXmlInfo[] { new PropertyXmlInfo("resourceClassName"),
+              new PropertyXmlInfo("parameters")});
+}

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CustomResourceSpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/SessionNamespaceView_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/URISpecifier_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/AllowedValue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterSettings.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ExternalResourceBinding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FeatureDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexKeyDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Import.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/LanguagePrecondition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MimeTypePrecondition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/NameValuePair.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/OperationalProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Precondition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceMetaData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/SimplePrecondition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorityList.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ExternalResourceBinding_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FeatureDescription_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/NameValuePair_impl.java
------------------------------------------------------------------------------
    svn:eol-style = native