[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/install/impl DefaultJBIInstallerIm
Status: Alpha
Brought to you by:
esancho
|
From: Esteban S. <es...@us...> - 2005-07-02 23:05:07
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/install/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/java/org/openbus/jbi/install/impl Modified Files: DefaultJBIInstallerImpl.java Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. Index: DefaultJBIInstallerImpl.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/install/impl/DefaultJBIInstallerImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultJBIInstallerImpl.java 28 Jun 2005 03:02:30 -0000 1.1 --- DefaultJBIInstallerImpl.java 2 Jul 2005 23:04:24 -0000 1.2 *************** *** 83,90 **** throws InstallationException { String libraryName = null; try { ! SharedLibrary lib = new SharedLibrary(getDescriptor(slZipURL_) ! .getSharedLibrary()); libraryName = lib.getUniqueName(); String libRoot = getRepository().storeSharedLibrary(lib, slZipURL_); --- 83,90 ---- throws InstallationException { String libraryName = null; + SharedLibrary lib = null; try { ! lib = new SharedLibrary(getDescriptor(slZipURL_).getSharedLibrary()); libraryName = lib.getUniqueName(); String libRoot = getRepository().storeSharedLibrary(lib, slZipURL_); *************** *** 94,97 **** --- 94,107 ---- getRepository().storeRegistry(getRegistry()); } catch (Exception e) { + if (lib != null) { + try { + abortSharedLibraryInstallation(lib); + } catch (FrameworkException e1) { + // @todo i18n + log.warn("Error aborting installation of library " + + libraryName + + ". System state could be inconsistent.", e); + } + } // @todo i18n throw new InstallationException("Unable to install shared library " *************** *** 181,183 **** --- 191,203 ---- } + protected void abortSharedLibraryInstallation(SharedLibrary library_) + throws FrameworkException { + getRegistry().removeSharedLibrary(library_.getUniqueName()); + getRepository().removeSharedLibrary(library_); + getRepository().storeRegistry(getRegistry()); + } + + protected void abortComponentInstallation(Component component_) { + + } } \ No newline at end of file |