You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by oc...@apache.org on 2011/05/02 08:46:35 UTC

svn commit: r1098512 [1/2] - in /incubator/npanday/trunk: components/dotnet-artifact/src/main/java/npanday/artifact/ components/dotnet-artifact/src/main/java/npanday/artifact/impl/ components/dotnet-assembler/src/main/java/npanday/assembler/ components...

Author: oching
Date: Mon May  2 08:46:33 2011
New Revision: 1098512

URL: http://svn.apache.org/viewvc?rev=1098512&view=rev
Log:
improve exception handling in npanday components and plugins

Added:
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NPandayArtifactResolutionException.java
    incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDaoException.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/NPandayRepositoryException.java
Modified:
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/AssemblyResolver.java
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java
    incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java
    incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblyInfoMarshaller.java
    incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java
    incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/DefaultAssemblyInfoMarshaller.java
    incubator/npanday/trunk/components/dotnet-assembler/src/test/java/npanday/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java
    incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayRepositoryRegistry.java
    incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/impl/NPandayRepositoryRegistryImpl.java
    incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDao.java
    incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java
    incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
    incubator/npanday/trunk/components/dotnet-dao-project/src/test/java/npanday/dao/impl/ProjectDaoImplTest.java
    incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java
    incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java
    incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
    incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/impl/ConfigurationAppendersRepository.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/PropertyRepository.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RegistryLoader.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/Repository.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryLoader.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryRegistry.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/RepositoryRegistryImpl.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRegistryLoader.java
    incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java
    incubator/npanday/trunk/components/dotnet-repository/src/main/java/npanday/repository/RepositoryConverter.java
    incubator/npanday/trunk/components/dotnet-repository/src/main/java/npanday/repository/impl/RepositoryConverterImpl.java
    incubator/npanday/trunk/components/dotnet-repository/src/test/java/npanday/repository/impl/RepositoryConverterImplTest.java
    incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java
    incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/SettingsRepository.java
    incubator/npanday/trunk/components/dotnet-vendor/src/test/java/npanday/vendor/impl/RepositoryRegistryTestStub.java
    incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
    incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopAggregateMojo.java
    incubator/npanday/trunk/plugins/maven-fxcop-plugin/src/main/java/npanday/plugin/fxcop/FxCopMojo.java
    incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
    incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/ArtifactManagerMojo.java
    incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryAssemblerMojo.java
    incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryConverterForArtifactMojo.java
    incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
    incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
    incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
    incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java
    incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java
    incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java Mon May  2 08:46:33 2011
@@ -77,6 +77,7 @@ public interface ArtifactInstaller
      * specified .NET and java dependencies. If a profile is specified, this method will includes dependencies
      * with that profile.
      *
+     *
      * @param profile          the specified profile to resolve. This value may be null.
      * @param netDependencies  additional .NET artifacts to resolve and install.
      * @param javaDependencies the Java Dependencies to resolve. Typically these should be the java bindings for the
@@ -85,7 +86,7 @@ public interface ArtifactInstaller
      */
     void resolveAndInstallNetDependenciesForProfile( String profile, List<Dependency> netDependencies,
                                                      List<Dependency> javaDependencies )
-        throws IOException;
+            throws IOException, NPandayArtifactResolutionException;
 
     /**
      * Installs both the artifact and all of its dependencies into the private application base.

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/AssemblyResolver.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/AssemblyResolver.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/AssemblyResolver.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/AssemblyResolver.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.artifact;
 
+import npanday.dao.ProjectDaoException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -53,9 +54,10 @@ public interface AssemblyResolver
      *                            resolving assemblies that the source artifact needs to compile against, this value
      *                            should be set to true.
      * @throws IOException
+     * @throws NPandayArtifactResolutionException
      */
     void resolveTransitivelyFor( MavenProject mavenProject, List<Dependency> dependencies,
                                  List<ArtifactRepository> remoteArtifactRepositories, File localArtifactRepository,
                                  boolean addResolvedDependenciesToProject )
-        throws IOException;
+            throws IOException, NPandayArtifactResolutionException;
 }

Added: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NPandayArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NPandayArtifactResolutionException.java?rev=1098512&view=auto
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NPandayArtifactResolutionException.java (added)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NPandayArtifactResolutionException.java Mon May  2 08:46:33 2011
@@ -0,0 +1,30 @@
+package npanday.artifact;
+
+/**
+ * Wrapper for exceptions caught during artifact resolution.
+ *
+ * @author Maria Odea Ching
+ */
+public class NPandayArtifactResolutionException
+    extends Exception
+{
+    public NPandayArtifactResolutionException()
+    {
+        super();
+    }
+
+    public NPandayArtifactResolutionException( String message )
+    {
+        super( message );
+    }
+
+    public NPandayArtifactResolutionException( String message, Throwable t )
+    {
+        super( message, t );
+    }
+
+    public NPandayArtifactResolutionException( Throwable t )
+    {
+        super( t );
+    }
+}

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/NetDependenciesRepository.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.artifact;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryRegistry;
 import org.apache.maven.model.Dependency;
@@ -39,7 +40,7 @@ public interface NetDependenciesReposito
      * @see npanday.registry.Repository#load(java.io.InputStream, java.util.Hashtable)
      */
     void load( InputStream inputStream, Hashtable properties )
-        throws IOException;
+        throws NPandayRepositoryException;
 
     /**
      * @see npanday.registry.Repository#setRepositoryRegistry(npanday.registry.RepositoryRegistry)

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java Mon May  2 08:46:33 2011
@@ -19,19 +19,11 @@
 package npanday.artifact.impl;
 
 import npanday.ArtifactTypeHelper;
-import npanday.artifact.ArtifactContext;
-import npanday.artifact.ApplicationConfig;
+import npanday.artifact.*;
 import npanday.ArtifactType;
 import npanday.PathUtil;
-import npanday.artifact.NetDependencyMatchPolicy;
-import npanday.artifact.NetDependenciesRepository;
-import npanday.artifact.AssemblyResolver;
 import npanday.registry.RepositoryRegistry;
 import npanday.model.netdependency.NetDependency;
-import npanday.dao.ProjectDao;
-import npanday.dao.Project;
-import npanday.dao.ProjectFactory;
-import npanday.dao.ProjectDependency;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.versioning.VersionRange;
@@ -141,11 +133,11 @@ public class ArtifactInstallerImpl
     }
 
     /**
-     * @see npanday.artifact.ArtifactInstaller#resolveAndInstallNetDependenciesForProfile(String, java.util.List<org.apache.maven.model.Dependency>, java.util.List<org.apache.maven.model.Dependency>)
+     * @see npanday.artifact.ArtifactInstaller#resolveAndInstallNetDependenciesForProfile(String, java.util.List, java.util.List)
      */
     public void resolveAndInstallNetDependenciesForProfile( String profile, List<Dependency> netDependencies,
                                                             List<Dependency> javaDependencies )
-        throws IOException
+            throws IOException, NPandayArtifactResolutionException
     {
         if ( netDependencies == null )
         {
@@ -163,7 +155,7 @@ public class ArtifactInstallerImpl
         matchPolicies.add( new ProfileMatchPolicy( profile ) );
         netDependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
 
-        assemblyResolver.resolveTransitivelyFor( new MavenProject(), netDependencies, remoteArtifactRepositories,
+         assemblyResolver.resolveTransitivelyFor( new MavenProject(), netDependencies, remoteArtifactRepositories,
                                                  localRepository, false );
 
         //Do Library Installs for Net Dependencies
@@ -194,13 +186,13 @@ public class ArtifactInstallerImpl
                 }
                 catch ( ArtifactResolutionException e )
                 {
-                    throw new IOException(
-                        "NPANDAY-001-000: Problem resolving artifact for java binding: Message = " + e.getMessage() );
+                    throw new NPandayArtifactResolutionException(
+                        "NPANDAY-001-001: Problem resolving artifact for java binding: Message = " + e.getMessage(), e );
                 }
                 catch ( ArtifactNotFoundException e )
                 {
-                    throw new IOException(
-                        "NPANDAY-001-001: Could not find artifact for java binding: Message =" + e.getMessage() );
+                    throw new NPandayArtifactResolutionException(
+                        "NPANDAY-001-002: Could not find artifact for java binding: Message =" + e.getMessage(), e );
                 }
             }
         }
@@ -217,13 +209,13 @@ public class ArtifactInstallerImpl
             }
             catch ( ArtifactResolutionException e )
             {
-                throw new IOException(
-                    "NPANDAY-001-002: Problem resolving java dependency artifact: Message = " + e.getMessage() );
+                throw new NPandayArtifactResolutionException(
+                    "NPANDAY-001-003: Problem resolving java dependency artifact: Message = " + e.getMessage(), e );
             }
             catch ( ArtifactNotFoundException e )
             {
-                throw new IOException(
-                    "NPANDAY-001-003: Could not find java dependency artifact: Message = " + e.getMessage() );
+                throw new NPandayArtifactResolutionException(
+                    "NPANDAY-001-004: Could not find java dependency artifact: Message = " + e.getMessage(), e );
             }
         }
 
@@ -303,7 +295,7 @@ public class ArtifactInstallerImpl
             {
                 throw new ArtifactInstallationException( "NPANDAY-001-006: Failed to install artifact: ID = " +
                     artifact.getId() + ", File = " +
-                    ( ( artifact.getFile() != null ) ? artifact.getFile().getAbsolutePath() : "" ) );
+                    ( ( artifact.getFile() != null ) ? artifact.getFile().getAbsolutePath() : "" ), e );
             }
         }
 
@@ -430,7 +422,7 @@ public class ArtifactInstallerImpl
     }
 
     /**
-     * @see npanday.artifact.ArtifactInstaller#init(npanday.artifact.ArtifactContext, java.util.List<org.apache.maven.artifact.repository.ArtifactRepository>, java.io.File)
+     * @see npanday.artifact.ArtifactInstaller#init(npanday.artifact.ArtifactContext, java.util.List, java.io.File)
      */
     public void init( ArtifactContext artifactContext, List<ArtifactRepository> remoteArtifactRepositories,
                       File localRepository )

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/AssemblyResolverImpl.java Mon May  2 08:46:33 2011
@@ -19,8 +19,10 @@
 package npanday.artifact.impl;
 
 import npanday.artifact.AssemblyResolver;
+import npanday.artifact.NPandayArtifactResolutionException;
 import npanday.dao.ProjectDao;
 import npanday.dao.Project;
+import npanday.dao.ProjectDaoException;
 import npanday.dao.ProjectDependency;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.artifact.Artifact;
@@ -88,12 +90,12 @@ public class AssemblyResolverImpl
     }
 
     /**
-     * @see AssemblyResolver#resolveTransitivelyFor(org.apache.maven.project.MavenProject, java.util.List<org.apache.maven.model.Dependency>, java.util.List<org.apache.maven.artifact.repository.ArtifactRepository>, java.io.File, boolean)
+     * @see AssemblyResolver#resolveTransitivelyFor(org.apache.maven.project.MavenProject, java.util.List, java.util.List, java.io.File, boolean)
      */
     public void resolveTransitivelyFor( MavenProject mavenProject, List<Dependency> dependencies,
                                         List<ArtifactRepository> remoteArtifactRepositories,
                                         File localArtifactRepository, boolean addResolvedDependenciesToProject )
-        throws IOException
+            throws IOException, NPandayArtifactResolutionException
     {
         //Check that the list of dependencies matches the first level RDF Repo
         //If not, resolve missing dependencies and add to repo or delete additional dependencies from repo
@@ -131,6 +133,10 @@ public class AssemblyResolverImpl
             artifactDependencies =
                 dao.storeProjectAndResolveDependencies( project, localArtifactRepository, remoteArtifactRepositories );
         }
+        catch( ProjectDaoException e )
+        {
+            throw new NPandayArtifactResolutionException( "NPANDAY-089-000: " + e.getMessage(), e );
+        }
         finally
         {
             dao.closeConnection();

Modified: incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/NetDependenciesRepositoryImpl.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.artifact.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryRegistry;
 import npanday.model.netdependency.NetDependency;
@@ -74,7 +75,7 @@ public class NetDependenciesRepositoryIm
      * @see Repository#load(java.io.InputStream, java.util.Hashtable)
      */
     public void load( InputStream inputStream, Hashtable properties )
-        throws IOException
+        throws NPandayRepositoryException
     {
         this.properties = properties;
         NetDependencyXpp3Reader xpp3Reader = new NetDependencyXpp3Reader();
@@ -84,9 +85,13 @@ public class NetDependenciesRepositoryIm
         {
             model = xpp3Reader.read( reader );
         }
+        catch( IOException e )
+        {
+            throw new NPandayRepositoryException( "NPANDAY-003-000: An error occurred while reading net-dependencies.xml", e );
+        }
         catch ( XmlPullParserException e )
         {
-            throw new IOException( "NPANDAY-003-000: Could not read net-dependencies.xml" );
+            throw new NPandayRepositoryException( "NPANDAY-003-001: Could not read net-dependencies.xml", e );
         }
         netDependencies = model.getNetDependencies();
         String npandayVersion = (String) properties.get( "npanday.version" );

Modified: incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblyInfoMarshaller.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblyInfoMarshaller.java (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/AssemblyInfoMarshaller.java Mon May  2 08:46:33 2011
@@ -41,7 +41,7 @@ public interface AssemblyInfoMarshaller
      * @throws IOException if there was a problem writing out the class file
      */
     void marshal( AssemblyInfo assemblyInfo, MavenProject mavenProject, OutputStream outputStream )
-        throws IOException;
+        throws IOException, AssemblyInfoException;
 
     /**
      * Unmarshalls an AssemblyInfo.* class file.
@@ -50,7 +50,7 @@ public interface AssemblyInfoMarshaller
      * @return an AssemblyInfo object for the specified input stream
      * @throws IOException if there was a problem reading the AssemblyInfo class file
      */
-    AssemblyInfo unmarshall( InputStream inputStream) throws IOException;    
+    AssemblyInfo unmarshall( InputStream inputStream) throws IOException, AssemblyInfoException;
 
     /**
      * Initializes the marshaller.

Modified: incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/AssemblyPluginsRepository.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.assembler.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryRegistry;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -60,10 +61,10 @@ public final class AssemblyPluginsReposi
      *
      * @param inputStream a stream of the repository file (typically from *.xml)
      * @param properties  additional user-supplied parameters used to customize the behavior of the repository
-     * @throws IOException if there is a problem loading the repository
+     * @throws NPandayRepositoryException if there is a problem loading the repository
      */
     public void load( InputStream inputStream, Hashtable properties )
-        throws IOException
+        throws NPandayRepositoryException
     {
         AssemblyPluginXpp3Reader xpp3Reader = new AssemblyPluginXpp3Reader();
         Reader reader = new InputStreamReader( inputStream );
@@ -72,16 +73,20 @@ public final class AssemblyPluginsReposi
         {
             plugins = xpp3Reader.read( reader );
         }
+        catch( IOException e )
+        {
+            throw new NPandayRepositoryException( "NPANDAY-021-000: An error occurred while reading executable-plugins.xml", e );
+        }
         catch ( XmlPullParserException e )
         {
-            throw new IOException( "NPANDAY-021-000: Could not read plugins-compiler.xml" );
+            throw new NPandayRepositoryException( "NPANDAY-021-001: Could not read plugins-compiler.xml", e );
         }
         assemblyPlugins = plugins.getAssemblyPlugins();
         Set languages = getAssemblyPluginLanguages();
         if ( languages.size() < assemblyPlugins.size() )
         {
-            throw new IOException(
-                "NPANDAY-021-001: Duplicate language entries in the assembly-plugins.xml: Total Language Count = " +
+            throw new NPandayRepositoryException(
+                "NPANDAY-021-002: Duplicate language entries in the assembly-plugins.xml: Total Language Count = " +
                     languages.size() + ", Total Plugins = " + assemblyPlugins.size() );
         }
     }

Modified: incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/DefaultAssemblyInfoMarshaller.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/DefaultAssemblyInfoMarshaller.java (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/main/java/npanday/assembler/impl/DefaultAssemblyInfoMarshaller.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.assembler.impl;
 
+import npanday.assembler.AssemblyInfoException;
 import npanday.assembler.AssemblyInfoMarshaller;
 import npanday.assembler.AssemblyInfo;
 import npanday.model.assembly.plugins.AssemblyPlugin;
@@ -53,7 +54,7 @@ final class DefaultAssemblyInfoMarshalle
      *      java.io.OutputStream)
      */
     public void marshal( AssemblyInfo assemblyInfo, MavenProject mavenProject, OutputStream outputStream )
-        throws IOException
+        throws AssemblyInfoException, IOException
     {
         String src = mavenProject.getBuild().getDirectory() + "/build-sources";
         StringBuffer sb = new StringBuffer();
@@ -108,7 +109,7 @@ final class DefaultAssemblyInfoMarshalle
         }
         catch ( IOException e )
         {
-            throw new IOException( "NPANDAY-022-000: Failed to generate AssemblyInfo" );
+            throw new AssemblyInfoException( "NPANDAY-022-000: Failed to generate AssemblyInfo" );
         }
         finally
         {
@@ -131,7 +132,7 @@ final class DefaultAssemblyInfoMarshalle
      * @see AssemblyInfoMarshaller#unmarshall(java.io.InputStream)
      */
     public AssemblyInfo unmarshall( InputStream inputStream )
-        throws IOException
+        throws IOException, AssemblyInfoException
     {
         AssemblyInfo assemblyInfo = new AssemblyInfo();
         BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
@@ -163,11 +164,11 @@ final class DefaultAssemblyInfoMarshalle
      * @throws IOException if the assembly info is invalid
      */
     private void setAssemblyInfo( AssemblyInfo assemblyInfo, String name, String value )
-        throws IOException
+        throws AssemblyInfoException
     {
         if ( !name.startsWith( "Assembly" ) )
         {
-            throw new IOException(
+            throw new AssemblyInfoException(
                 "NPANDAY-022-001: Invalid assembly info parameter: Name = " + name + ", Value = " + value );
         }
         if ( name.equals( "AssemblyDescription" ) )

Modified: incubator/npanday/trunk/components/dotnet-assembler/src/test/java/npanday/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/test/java/npanday/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/src/test/java/npanday/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/src/test/java/npanday/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java Mon May  2 08:46:33 2011
@@ -50,7 +50,7 @@ public class DefaultAssemblyInfoUnmarsha
             AssemblyInfo assemblyInfo = um.unmarshall( fis );
             assertEquals( "Incorrect Assembly Version", "1.0.0", assemblyInfo.getVersion());
         }
-        catch ( IOException e )
+        catch ( Exception e )
         {
             fail("Problem iwht reading the assembly info input");
         }

Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayRepositoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayRepositoryRegistry.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayRepositoryRegistry.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/NPandayRepositoryRegistry.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.RepositoryRegistry;
 
 import java.io.IOException;
@@ -38,7 +39,8 @@ public interface NPandayRepositoryRegist
      *
      * @return an repository registry
      * @throws IOException
+     * @throws NPandayRepositoryException
      */
     RepositoryRegistry createRepositoryRegistry()
-        throws IOException;
+        throws IOException, NPandayRepositoryException;
 }

Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/impl/NPandayRepositoryRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/impl/NPandayRepositoryRegistryImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/impl/NPandayRepositoryRegistryImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/impl/NPandayRepositoryRegistryImpl.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.RepositoryRegistry;
 import npanday.NPandayRepositoryRegistry;
 
@@ -39,7 +40,7 @@ public final class NPandayRepositoryRegi
      * @throws IOException
      */
     public synchronized RepositoryRegistry createRepositoryRegistry()
-        throws IOException
+        throws IOException, NPandayRepositoryException
     {
         if ( repositoryRegistry.isEmpty() )
         {

Modified: incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDao.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDao.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDao.java (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDao.java Mon May  2 08:46:33 2011
@@ -23,7 +23,6 @@ import npanday.registry.DataAccessObject
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.model.Model;
@@ -45,7 +44,8 @@ public interface ProjectDao
      */
     String ROLE = ProjectDao.class.getName();
 
-    void removeProjectFor( String groupId, String artifactId, String version, String artifactType ) throws IOException;
+    void removeProjectFor( String groupId, String artifactId, String version, String artifactType ) throws ProjectDaoException;
+
     /**
      * Returns a project that matches the specified parameters.
      *
@@ -56,21 +56,21 @@ public interface ProjectDao
      * @param publicKeyTokenId the public key token id. This should match the token id within the manifest of a signed
      *                         .NET assesmbly. This value may be null.
      * @return a project that matches the specified parameters
-     * @throws IOException if there was a problem retrieving the project
+     * @throws ProjectDaoException if there was a problem retrieving the project
      */
     Project getProjectFor( String groupId, String artifactId, String version, String artifactType,
                            String publicKeyTokenId )
-        throws IOException;
+            throws ProjectDaoException;
 
     /**
      * Returns a project that matches the information contained within the specified maven project.
      *
      * @param mavenProject the maven project used in finding the returned project
      * @return a project that matches the information contained within the specified maven project
-     * @throws IOException if there was a problem retrieving the project
+     * @throws ProjectDaoException if there was a problem retrieving the project
      */
     Project getProjectFor( MavenProject mavenProject )
-        throws IOException;
+        throws ProjectDaoException;
 
     /**
      * Method not implemented.
@@ -78,10 +78,10 @@ public interface ProjectDao
      * @param project
      * @param localRepository
      * @param artifactRepositories
-     * @throws IOException
+     * @throws ProjectDaoException
      */
     void storeProject( Project project, File localRepository, List<ArtifactRepository> artifactRepositories )
-        throws IOException;
+        throws ProjectDaoException;
 
     /**
      * Stores the specified project and resolves and stores the project's dependencies.
@@ -94,7 +94,7 @@ public interface ProjectDao
      */
     Set<Artifact> storeProjectAndResolveDependencies( Project project, File localRepository,
                                                       List<ArtifactRepository> artifactRepositories )
-        throws IOException;
+            throws IOException, ProjectDaoException;
 
     /**
      * Stores the project object model and resolves and stores the model's dependencies.
@@ -108,7 +108,7 @@ public interface ProjectDao
      */
     Set<Artifact> storeModelAndResolveDependencies( Model model, File pomFileDirectory, File localArtifactRepository,
                                                     List<ArtifactRepository> artifactRepositories )
-        throws IOException;
+            throws IOException, ProjectDaoException;
 
     /**
      * Initializes the data access object
@@ -122,10 +122,10 @@ public interface ProjectDao
      * Returns all projects.
      *
      * @return all projects
-     * @throws IOException if there is a problem retrieving the projects
+     * @throws ProjectDaoException if there is a problem retrieving the projects
      */
     Set<Project> getAllProjects()
-        throws IOException;
+            throws ProjectDaoException;
 
     /**
      * Sets the repository for the data access object. This method overrides the data source object set in the

Added: incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDaoException.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDaoException.java?rev=1098512&view=auto
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDaoException.java (added)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectDaoException.java Mon May  2 08:46:33 2011
@@ -0,0 +1,30 @@
+package npanday.dao;
+
+/**
+ * Exception thrown by project dao component.
+ *
+ * @author Maria Odea Ching
+ */
+public class ProjectDaoException
+    extends Exception
+{
+    public ProjectDaoException()
+    {
+        super();
+    }
+
+    public ProjectDaoException( String message )
+    {
+        super( message );
+    }
+
+    public ProjectDaoException( String message, Throwable t )
+    {
+        super( message, t );
+    }
+
+    public ProjectDaoException( Throwable t )
+    {
+        super( t );
+    }
+}

Modified: incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/ProjectFactory.java Mon May  2 08:46:33 2011
@@ -34,6 +34,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -132,8 +133,8 @@ public final class ProjectFactory
                 }
                 catch ( XmlPullParserException e )
                 {
+                    logger.log( Level.SEVERE, "Unable to read model.", e );
                     throw new IOException( "NPANDAY-180-000: Unable to read model: Message = " + e.getMessage() );
-
                 }
                 //Project parentProject = createProjectFrom( parentModel, parentPomFile.getParentFile() );
                 //project.setParentProject( parentProject );

Modified: incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java Mon May  2 08:46:33 2011
@@ -21,12 +21,7 @@ package npanday.dao.impl;
 import npanday.ArtifactType;
 import npanday.ArtifactTypeHelper;
 import npanday.PathUtil;
-import npanday.dao.Project;
-import npanday.dao.ProjectDao;
-import npanday.dao.ProjectDependency;
-import npanday.dao.ProjectFactory;
-import npanday.dao.ProjectUri;
-import npanday.dao.Requirement;
+import npanday.dao.*;
 import npanday.registry.RepositoryRegistry;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -142,8 +137,7 @@ public final class ProjectDaoImpl
     }
 
     public Set<Project> getAllProjects()
-        throws IOException
-    {
+            throws ProjectDaoException {
         Set<Project> projects = new HashSet<Project>();
         TupleQueryResult result = null;
         try
@@ -175,15 +169,15 @@ public final class ProjectDaoImpl
         }
         catch ( RepositoryException e )
         {
-            throw new IOException( "NPANDAY-180-000: Message = " + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-000: Message = " + e.getMessage(), e );
         }
         catch ( MalformedQueryException e )
         {
-            throw new IOException( "NPANDAY-180-001: Message = " + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-001: Message = " + e.getMessage(), e );
         }
         catch ( QueryEvaluationException e )
         {
-            throw new IOException( "NPANDAY-180-002: Message = " + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-002: Message = " + e.getMessage(), e );
         }
         finally
         {
@@ -243,7 +237,7 @@ public final class ProjectDaoImpl
     }
 
     public void removeProjectFor( String groupId, String artifactId, String version, String artifactType )
-        throws IOException
+        throws ProjectDaoException
     {
         ValueFactory valueFactory = rdfRepository.getValueFactory();
         URI id = valueFactory.createURI( groupId + ":" + artifactId + ":" + version + ":" + artifactType );
@@ -253,14 +247,13 @@ public final class ProjectDaoImpl
         }
         catch ( RepositoryException e )
         {
-            throw new IOException( e.getMessage() );
+            throw new ProjectDaoException( e.getMessage(), e );
         }
     }
 
     public Project getProjectFor( String groupId, String artifactId, String version, String artifactType,
                                   String publicKeyTokenId )
-        throws IOException
-    {
+            throws ProjectDaoException {
         long startTime = System.currentTimeMillis();
 
         ValueFactory valueFactory = rdfRepository.getValueFactory();
@@ -303,7 +296,7 @@ public final class ProjectDaoImpl
                     
                     if ( !artifact.getFile().exists() )
                     {
-                        throw new IOException( "NPANDAY-180-123: Could not find GAC assembly: Group ID = " + groupId
+                        throw new ProjectDaoException( "NPANDAY-180-123: Could not find GAC assembly: Group ID = " + groupId
                             + ", Artifact ID = " + artifactId + ", Version = " + version + ", Artifact Type = "
                             + artifactType + ", File Path = " + artifact.getFile().getAbsolutePath() );
                     }
@@ -311,7 +304,7 @@ public final class ProjectDaoImpl
                     return project;
                 }
 
-                throw new IOException( "NPANDAY-180-124: Could not find the project: Group ID = " + groupId
+                throw new ProjectDaoException( "NPANDAY-180-124: Could not find the project: Group ID = " + groupId
                     + ", Artifact ID =  " + artifactId + ", Version = " + version + ", Artifact Type = " + artifactType );
             }
 
@@ -351,15 +344,15 @@ public final class ProjectDaoImpl
         }
         catch ( QueryEvaluationException e )
         {
-            throw new IOException( "NPANDAY-180-005: Message = " + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-005: Message = " + e.getMessage(), e );
         }
         catch ( RepositoryException e )
         {
-            throw new IOException( "NPANDAY-180-006: Message = " + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-006: Message = " + e.getMessage(), e );
         }
         catch ( MalformedQueryException e )
         {
-            throw new IOException( "NPANDAY-180-007: Message = " + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-007: Message = " + e.getMessage(), e );
         }
         finally
         {
@@ -383,14 +376,14 @@ public final class ProjectDaoImpl
     }
 
     public Project getProjectFor( MavenProject mavenProject )
-        throws IOException
+        throws ProjectDaoException
     {
         return getProjectFor( mavenProject.getGroupId(), mavenProject.getArtifactId(), mavenProject.getVersion(),
                               mavenProject.getArtifact().getType(), mavenProject.getArtifact().getClassifier() );
     }
 
     public void storeProject( Project project, File localRepository, List<ArtifactRepository> artifactRepositories )
-        throws IOException
+        throws ProjectDaoException
     {
 
     }
@@ -409,7 +402,7 @@ public final class ProjectDaoImpl
 
     public Set<Artifact> storeProjectAndResolveDependencies( Project project, File localRepository,
                                                              List<ArtifactRepository> artifactRepositories )
-        throws IOException, IllegalArgumentException
+            throws IOException, IllegalArgumentException, ProjectDaoException
     {
         return storeProjectAndResolveDependencies( project, localRepository, artifactRepositories,
                                                    new HashMap<String, Set<Artifact>>() );
@@ -418,8 +411,7 @@ public final class ProjectDaoImpl
     public Set<Artifact> storeProjectAndResolveDependencies( Project project, File localRepository,
                                                              List<ArtifactRepository> artifactRepositories,
                                                              Map<String, Set<Artifact>> cache )
-        throws IOException, IllegalArgumentException
-    {
+            throws IOException, IllegalArgumentException, ProjectDaoException {
         String key = getKey( project );
         if ( cache.containsKey( key ) )
         {
@@ -546,7 +538,7 @@ public final class ProjectDaoImpl
                 {
                     if ( projectDependency.getSystemPath() == null )
                     {
-                        throw new IOException( "systemPath required for System Scoped dependencies " + "in Group ID = "
+                        throw new ProjectDaoException( "systemPath required for System Scoped dependencies " + "in Group ID = "
                             + projectDependency.getGroupId() + ", Artiract ID = " + projectDependency.getArtifactId() );
                     }
 
@@ -662,8 +654,9 @@ public final class ProjectDaoImpl
                                 }
                             }
                         }
-                        catch ( IOException e )
+                        catch ( ProjectDaoException e )
                         {
+                            logger.log( Level.WARNING, e.getMessage() );
                             // safe to ignore: dependency not found
                         }
                     }
@@ -758,7 +751,7 @@ public final class ProjectDaoImpl
                             if ( !( g.equals( projectDependency.getGroupId() )
                                 && model.getArtifactId().equals( projectDependency.getArtifactId() ) && v.equals( projectDependency.getVersion() ) ) )
                             {
-                                throw new IOException(
+                                throw new ProjectDaoException(
                                                        "NPANDAY-180-017: Model parameters do not match project dependencies parameters: Model: "
                                                            + g + ":" + model.getArtifactId() + ":" + v + ", Project: "
                                                            + projectDependency.getGroupId() + ":"
@@ -803,20 +796,20 @@ public final class ProjectDaoImpl
                         catch ( ArtifactNotFoundException e )
                         {
                             logger.log(Level.SEVERE, "NPANDAY-180-0201: Error resolving artifact. Reason:", e);
-                            throw new IOException(
+                            throw new ProjectDaoException(
                                                    "NPANDAY-180-020: Problem in resolving artifact: Artifact = "
                                                        + assembly.getId()
-                                                       + ", Message = " + e.getMessage() );
+                                                       + ", Message = " + e.getMessage(), e );
                         }
                         catch ( ArtifactResolutionException e )
                         {
                             logger.log( Level.SEVERE, "NPANDAY-180-019: Problem in resolving artifact: Artifact = "
                                               + assembly.getId()
                                               + ", Message = " + e.getMessage(), e );
-                            throw new IOException(
+                            throw new ProjectDaoException(
                                                    "NPANDAY-180-019: Problem in resolving artifact: Artifact = "
                                                        + assembly.getId()
-                                                       + ", Message = " + e.getMessage() );
+                                                       + ", Message = " + e.getMessage(), e );
                         }
                     }
                     artifactDependencies.add( assembly );
@@ -857,7 +850,7 @@ public final class ProjectDaoImpl
 
                 }
             }
-            throw new IOException( "NPANDAY-180-021: Could not open RDF Repository: Message =" + e.getMessage() );
+            throw new ProjectDaoException( "NPANDAY-180-021: Could not open RDF Repository: Message =" + e.getMessage(), e );
         }
 
         for ( Model model : modelDependencies )
@@ -884,8 +877,7 @@ public final class ProjectDaoImpl
     public Set<Artifact> storeModelAndResolveDependencies( Model model, File pomFileDirectory,
                                                            File localArtifactRepository,
                                                            List<ArtifactRepository> artifactRepositories )
-        throws IOException
-    {
+            throws IOException, ProjectDaoException {
         return storeProjectAndResolveDependencies( ProjectFactory.createProjectFrom( model, pomFileDirectory ),
                                                    localArtifactRepository, artifactRepositories );
     }

Modified: incubator/npanday/trunk/components/dotnet-dao-project/src/test/java/npanday/dao/impl/ProjectDaoImplTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/test/java/npanday/dao/impl/ProjectDaoImplTest.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/test/java/npanday/dao/impl/ProjectDaoImplTest.java (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/test/java/npanday/dao/impl/ProjectDaoImplTest.java Mon May  2 08:46:33 2011
@@ -19,11 +19,7 @@
 package npanday.dao.impl;
 
 import junit.framework.TestCase;
-import npanday.dao.Project;
-import npanday.dao.ProjectDao;
-import npanday.dao.ProjectDependency;
-import npanday.dao.ProjectUri;
-import npanday.dao.Requirement;
+import npanday.dao.*;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -100,7 +96,7 @@ public class ProjectDaoImplTest
         {
             dao.storeProjectAndResolveDependencies( project, localRepository, new ArrayList<ArtifactRepository>() );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not store the project: " + e.getMessage() );
@@ -111,7 +107,7 @@ public class ProjectDaoImplTest
         {
             projects = dao.getAllProjects();
         }
-        catch ( IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not retrieve the project: " + e.getMessage() );
@@ -138,7 +134,7 @@ public class ProjectDaoImplTest
         {
             dao.storeProjectAndResolveDependencies( project, localRepository, new ArrayList<ArtifactRepository>() );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not store the project: " + e.getMessage() );
@@ -149,7 +145,7 @@ public class ProjectDaoImplTest
         {
             projects = dao.getAllProjects();
         }
-        catch ( IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not retrieve the project: " + e.getMessage() );
@@ -191,7 +187,7 @@ public class ProjectDaoImplTest
             artifacts =
                 dao.storeProjectAndResolveDependencies( project, localRepository, new ArrayList<ArtifactRepository>() );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not store the project: " + e.getMessage() );
@@ -202,7 +198,7 @@ public class ProjectDaoImplTest
         {
             proj = dao.getProjectFor( "NPanday.Model", "NPanday.Model.Pom", "0.14.0.0", "library", null );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not query the project: " + e.getMessage() );
@@ -262,7 +258,7 @@ public class ProjectDaoImplTest
             artifacts =
                 dao.storeProjectAndResolveDependencies( project1, localRepository, new ArrayList<ArtifactRepository>() );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not store the project: " + e.getMessage() );
@@ -280,7 +276,7 @@ public class ProjectDaoImplTest
         {
             testProject = dao.getProjectFor( "NPanday", "NPanday.Plugin", "0.14.0.0", "library", null );
         }
-        catch ( IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not retrieve the project: " + e.getMessage() );
@@ -312,7 +308,7 @@ public class ProjectDaoImplTest
             artifacts =
                 dao.storeProjectAndResolveDependencies( project, localRepository, new ArrayList<ArtifactRepository>() );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not store the project: " + e.getMessage() );
@@ -323,7 +319,7 @@ public class ProjectDaoImplTest
         {
             proj = dao.getProjectFor( "NPanday.Model", "NPanday.Model.Pom", "0.14.0.0", "library", null );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( "Could not query the project: " + e.getMessage() );
@@ -352,7 +348,7 @@ public class ProjectDaoImplTest
             dao.storeProjectAndResolveDependencies( project, localRepository, new ArrayList<ArtifactRepository>() );
 
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             fail( e.getMessage() );
@@ -362,7 +358,7 @@ public class ProjectDaoImplTest
         {
             dao.getProjectFor( "NPanday.Model", "NPanday.Model.Pom", "0.15.0.0", "library", null );
         }
-        catch ( java.io.IOException e )
+        catch ( Exception e )
         {
             return;
 

Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerPluginsRepository.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.executable.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryRegistry;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -56,7 +57,7 @@ public final class CompilerPluginsReposi
      * @see Repository#load(java.io.InputStream, java.util.Hashtable)
      */
     public void load( InputStream inputStream, Hashtable properties )
-        throws IOException
+        throws NPandayRepositoryException
     {
         CompilerPluginXpp3Reader xpp3Reader = new CompilerPluginXpp3Reader();
         Reader reader = new InputStreamReader( inputStream );
@@ -65,9 +66,13 @@ public final class CompilerPluginsReposi
         {
             plugins = xpp3Reader.read( reader );
         }
+        catch( IOException e )
+        {
+            throw new NPandayRepositoryException( "NPANDAY-062-000: An error occurred while reading plugins-compiler.xml", e );
+        }
         catch ( XmlPullParserException e )
         {
-            throw new IOException( "NPANDAY-062-000: Could not read plugins-compiler.xml" );
+            throw new NPandayRepositoryException( "NPANDAY-062-001: Could not read plugins-compiler.xml", e );
         }
         compilerPlugins = plugins.getCompilerPlugins();
     }

Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.executable.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryRegistry;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -56,10 +57,10 @@ public final class ExecutablePluginsRepo
      *
      * @param inputStream a stream of the repository file (typically from *.xml)
      * @param properties  additional user-supplied parameters used to customize the behavior of the repository
-     * @throws java.io.IOException if there is a problem loading the repository
+     * @throws npanday.registry.NPandayRepositoryException if there is a problem loading the repository
      */
     public void load( InputStream inputStream, Hashtable properties )
-        throws IOException
+            throws NPandayRepositoryException
     {
         ExecutablePluginXpp3Reader xpp3Reader = new ExecutablePluginXpp3Reader();
         Reader reader = new InputStreamReader( inputStream );
@@ -68,9 +69,13 @@ public final class ExecutablePluginsRepo
         {
             plugins = xpp3Reader.read( reader );
         }
+        catch( IOException e )
+        {
+            throw new NPandayRepositoryException( "NPANDAY-067-000: An error occurred while reading executable-plugins.xml", e );
+        }
         catch ( XmlPullParserException e )
         {
-            throw new IOException( "NPANDAY-067-000: Could not read executable-plugins.xml" );
+            throw new NPandayRepositoryException( "NPANDAY-067-001: Could not read executable-plugins.xml", e );
         }
         executablePlugins = plugins.getExecutablePlugins();
     }

Modified: incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java (original)
+++ incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java Mon May  2 08:46:33 2011
@@ -18,16 +18,18 @@
  */
 package npanday.plugin;
 
+import npanday.artifact.NPandayArtifactResolutionException;
+import npanday.dao.ProjectDao;
+import npanday.dao.Project;
+import npanday.dao.ProjectDaoException;
+import npanday.dao.ProjectFactory;
+import npanday.dao.ProjectDependency;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import npanday.PlatformUnsupportedException;
 import npanday.PathUtil;
 import npanday.artifact.ArtifactContext;
 import npanday.artifact.AssemblyResolver;
-import npanday.dao.Project;
-import npanday.dao.ProjectDao;
-import npanday.dao.ProjectDependency;
-import npanday.dao.ProjectFactory;
 import npanday.executable.ExecutionException;
 import npanday.executable.NetExecutableFactory;
 import npanday.registry.DataAccessObjectRegistry;
@@ -207,14 +209,30 @@ public abstract class AbstractMojo
             dependency.setScope(Artifact.SCOPE_RUNTIME);
             dependency.setType(artifact.getType());
 
-            assemblyResolver.resolveTransitivelyFor(new MavenProject(), Collections.singletonList(dependency), getMavenProject().getRemoteArtifactRepositories(),
+            try
+            {
+                assemblyResolver.resolveTransitivelyFor(new MavenProject(), Collections.singletonList(dependency), getMavenProject().getRemoteArtifactRepositories(),
                     localRepository, false);
+            }
+            catch( NPandayArtifactResolutionException e )
+            {
+                throw new MojoExecutionException( e.getMessage(), e );
+            }
 
             ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
             dao.openConnection();
-            Project project = dao.getProjectFor(dependency.getGroupId(), dependency.getArtifactId(),
+            Project project;
+
+            try
+            {
+                project = dao.getProjectFor(dependency.getGroupId(), dependency.getArtifactId(),
                     dependency.getVersion(), dependency.getType(),
                     dependency.getClassifier());
+            }
+            catch( ProjectDaoException e )
+            {
+                 throw new MojoExecutionException( e.getMessage(), e );
+            }
 
             List<Dependency> sourceArtifactDependencies = new ArrayList<Dependency>();
             for (ProjectDependency projectDependency : project.getProjectDependencies()) {

Modified: incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/impl/ConfigurationAppendersRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/impl/ConfigurationAppendersRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/impl/ConfigurationAppendersRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/impl/ConfigurationAppendersRepository.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.plugin.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryRegistry;
 import npanday.model.configurationappenders.io.xpp3.ConfigurationAppendersXpp3Reader;
@@ -40,7 +41,7 @@ public class ConfigurationAppendersRepos
     private Set<Class> appenderClasses;
 
     public void load( InputStream inputStream, Hashtable properties )
-        throws IOException
+        throws NPandayRepositoryException
     {
         ConfigurationAppendersXpp3Reader xpp3Reader = new ConfigurationAppendersXpp3Reader();
         Reader reader = new InputStreamReader( inputStream );
@@ -49,9 +50,13 @@ public class ConfigurationAppendersRepos
         {
             model = xpp3Reader.read( reader );
         }
+        catch( IOException e )
+        {
+            throw new NPandayRepositoryException( "NPANDAY-062-000: An error occurred while reading plugins-compiler.xml", e );
+        }
         catch ( XmlPullParserException e )
         {
-            throw new IOException( "NPANDAY-062-000: Could not read plugins-compiler.xml" );
+            throw new NPandayRepositoryException( "NPANDAY-062-001: Could not read plugins-compiler.xml", e );
         }
         List<ConfigurationAppender> appenders  = model.getConfigurationAppenders();
         appenderClasses = new HashSet<Class>();
@@ -63,7 +68,7 @@ public class ConfigurationAppendersRepos
             }
             catch ( ClassNotFoundException e )
             {
-                throw new IOException("NPANDAY-xxx-000: Could not load class appender: Name = " + appender.getName() );
+                throw new NPandayRepositoryException("NPANDAY-xxx-000: Could not load class appender: Name = " + appender.getName(), e );
             }
         }
 

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java Mon May  2 08:46:33 2011
@@ -58,9 +58,9 @@ public class ConnectionsRepository
      * ConnectionsRepository.load method, which in this case does nothing more than set the properties. It is up to the
      * developer to explicitly call the lazy load method. This is done for performance reasons.
      *
-     * @throws IOException if there is a problem loading the DAOs
+     * @throws NPandayRepositoryException if there is a problem loading the DAOs
      */
-    public void lazyLoad() throws IOException
+    public void lazyLoad() throws NPandayRepositoryException
     {
        long start = System.currentTimeMillis();
 
@@ -75,7 +75,7 @@ public class ConnectionsRepository
         }
         catch ( RepositoryException e )
         {
-            throw new IOException("NPANDAY-080-005: Failed to initialized repository. Message = " + e.getMessage() );
+            throw new NPandayRepositoryException("NPANDAY-080-005: Failed to initialized repository. Message = " + e.getMessage(), e );
         }
 
         Set<String> keys = properties.keySet();
@@ -90,7 +90,7 @@ public class ConnectionsRepository
                     Object o = c.getConstructor().newInstance();
                     if ( !( o instanceof DataAccessObject ) )
                     {
-                        throw new IOException(
+                        throw new NPandayRepositoryException(
                             "NPANDAY-080-000: dao tag references a class that does not implement the DataAccessObject interface." );
                     }
                     DataAccessObject dao = (DataAccessObject) o;
@@ -102,13 +102,13 @@ public class ConnectionsRepository
                 }
                 catch ( Exception e )
                 {
-                    throw new IOException(
-                        "NPANDAY-080-002: Problem instantiating the DAO Class: Class Name = " + daoClassName );
+                    throw new NPandayRepositoryException(
+                        "NPANDAY-080-002: Problem instantiating the DAO Class: Class Name = " + daoClassName, e );
                 }
                 catch ( Error e )
                 {
-                    throw new IOException(
-                        "NPANDAY-080-003: Problem instantiating the DAO Class: Class Name = " + daoClassName );
+                    throw new NPandayRepositoryException(
+                        "NPANDAY-080-003: Problem instantiating the DAO Class: Class Name = " + daoClassName, e );
                 }
             }
         }
@@ -119,7 +119,7 @@ public class ConnectionsRepository
      * @see Repository#load(java.io.InputStream, java.util.Hashtable)
      */
     public void load( InputStream inputStream, Hashtable properties )
-        throws IOException
+        throws NPandayRepositoryException
     {
         this.properties = properties;
     }

Added: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/NPandayRepositoryException.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/NPandayRepositoryException.java?rev=1098512&view=auto
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/NPandayRepositoryException.java (added)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/NPandayRepositoryException.java Mon May  2 08:46:33 2011
@@ -0,0 +1,30 @@
+package npanday.registry;
+
+/**
+ * Wrapper for exceptions caught in NetDependenciesRepository
+ *
+ * @author Maria Odea Ching
+ */
+public class NPandayRepositoryException
+    extends Exception
+{
+    public NPandayRepositoryException()
+    {
+        super();
+    }
+
+    public NPandayRepositoryException(String message)
+    {
+        super( message );
+    }
+
+    public NPandayRepositoryException(String message, Throwable t)
+    {
+        super( message, t );
+    }
+
+    public NPandayRepositoryException(Throwable t)
+    {
+        super( t );
+    }
+}

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/PropertyRepository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/PropertyRepository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/PropertyRepository.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/PropertyRepository.java Mon May  2 08:46:33 2011
@@ -67,9 +67,16 @@ public class PropertyRepository
      * @see npanday.registry.Repository#load(InputStream inputStream, Hashtable prop)
      */
     public void load( InputStream inputStream, Hashtable prop )
-        throws IOException
+        throws NPandayRepositoryException
     {
-        properties.load( inputStream );
+        try
+        {
+            properties.load( inputStream );
+        }
+        catch( IOException e )
+        {
+            throw new NPandayRepositoryException( "NPANDAY-088-000: Unable to load properties file.", e);
+        }
     }
 
     /**

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RegistryLoader.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RegistryLoader.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RegistryLoader.java Mon May  2 08:46:33 2011
@@ -36,9 +36,10 @@ public interface RegistryLoader
      *
      * @param inputStream of the registry-config.xml. This may be of a custom format.
      * @throws IOException if there is a problem loading the registry
+     * @throws NPandayRepositoryException if there is a problem loading the repository
      */
     void loadRegistry( InputStream inputStream )
-        throws IOException;
+        throws IOException, NPandayRepositoryException;
 
     /**
      * Returns the repositories.

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/Repository.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/Repository.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/Repository.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/Repository.java Mon May  2 08:46:33 2011
@@ -62,11 +62,11 @@ public interface Repository
      *
      * @param inputStream the configuration file
      * @param properties  the properties used to configure the repository
-     * @throws IOException thrown on interrupted I/O. Implementing class may also use this exception to throw
+     * @throws NPandayRepositoryException thrown on interrupted I/O. Implementing class may also use this exception to throw
      *                     other exceptions like invalid properties.
      */
     void load( InputStream inputStream, Hashtable properties )
-        throws IOException;
+        throws NPandayRepositoryException;
 
     /**
      * @param repositoryRegistry
@@ -82,6 +82,6 @@ public interface Repository
     /**
      * Reloads this repository based on the file uri.
      */
-    void reload() throws IOException;
+    void reload() throws IOException, NPandayRepositoryException;
 
 }
\ No newline at end of file

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryLoader.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryLoader.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryLoader.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryLoader.java Mon May  2 08:46:33 2011
@@ -39,10 +39,11 @@ public interface RepositoryLoader
      * @param initParams      <code>Hashtable</code> containing the repository's configuration parameters.
      * @return instance of repository
      * @throws IOException
+     * @throws NPandayRepositoryException
      */
 
     Repository loadRepository( String fileUri, String repositoryClass, Hashtable initParams )
-        throws IOException;
+            throws IOException, NPandayRepositoryException;
 
     /**
      * Accessor for the name of the <code>RepositoryLoader</code>. Typically will be the class name.

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryRegistry.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryRegistry.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/RepositoryRegistry.java Mon May  2 08:46:33 2011
@@ -55,18 +55,20 @@ public interface RepositoryRegistry
      *
      * @param inputStream contains the jvending-config file.
      * @throws java.io.IOException thrown on interrupted I/O
+     * @throws npanday.registry.NPandayRepositoryException
      */
     void loadFromInputStream( InputStream inputStream )
-        throws IOException;
+            throws IOException, NPandayRepositoryException;
 
     /**
      * Convenience method for loading a file off of a file system.
      *
      * @param fileName relative or absolute path of the file
      * @throws IOException thrown on interrupted I/O
+     * @throws npanday.registry.NPandayRepositoryException
      */
     void loadFromFile( String fileName )
-        throws IOException;
+        throws IOException, NPandayRepositoryException;
 
 
     /**
@@ -74,9 +76,10 @@ public interface RepositoryRegistry
      *
      * @param fileName relative or absolute path of the file
      * @throws IOException thrown on interrupted I/O
+     * @throws npanday.registry.NPandayRepositoryException
      */
     void loadFromResource( String fileName, Class sourceClass )
-        throws IOException;
+        throws IOException, NPandayRepositoryException;
 
     /**
      * Adds a repository to the registry. If the repository name already exists, this method will overwrite the old

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java Mon May  2 08:46:33 2011
@@ -18,15 +18,12 @@
  */
 package npanday.registry.impl;
 
-import npanday.registry.RepositoryRegistry;
-import npanday.registry.DataAccessObject;
-import npanday.registry.Repository;
-import npanday.registry.DataAccessObjectRegistry;
-import npanday.registry.ConnectionsRepository;
+import npanday.registry.*;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Collections;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.io.IOException;
 
@@ -61,8 +58,9 @@ public class DataAccessObjectRegistryImp
                         connectionsRepository.lazyLoad();
                         isConnectionsRepoLoaded = true;
                     }
-                    catch ( IOException e )
+                    catch ( NPandayRepositoryException e )
                     {
+                        logger.warning( "NPANDAY-081-003: " + e.getMessage() );
                         return daos;
                     }
                 }
@@ -92,8 +90,9 @@ public class DataAccessObjectRegistryImp
                         connectionsRepository.lazyLoad();
                         isConnectionsRepoLoaded = true;
                     }
-                    catch ( IOException e )
+                    catch ( NPandayRepositoryException e )
                     {
+                        logger.warning( "NPANDAY-081-004: " + e.getMessage() );
                         return null;
                     }
                 }
@@ -130,8 +129,9 @@ public class DataAccessObjectRegistryImp
                         connectionsRepository.lazyLoad();
                         isConnectionsRepoLoaded = true;
                     }
-                    catch ( IOException e )
+                    catch ( NPandayRepositoryException e )
                     {
+                        logger.warning( "NPANDAY-081-005: " + e.getMessage() );
                         return Collections.unmodifiableSet( daoIds );
                     }
                 }

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/RepositoryRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/RepositoryRegistryImpl.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/RepositoryRegistryImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/RepositoryRegistryImpl.java Mon May  2 08:46:33 2011
@@ -18,11 +18,7 @@
  */
 package npanday.registry.impl;
 
-import npanday.registry.RepositoryRegistry;
-import npanday.registry.RepositoryLoader;
-import npanday.registry.RegistryLoader;
-import npanday.registry.Repository;
-import npanday.registry.DataAccessObjectRegistry;
+import npanday.registry.*;
 
 import java.util.Hashtable;
 import java.util.Properties;
@@ -64,6 +60,10 @@ public class RepositoryRegistryImpl
         {
             throw new InitializationException( "NPANDAY-082-000: Message = ", e );
         }
+        catch ( NPandayRepositoryException e )
+        {
+            throw new InitializationException( "NPANDAY-082-010: Message = ", e );
+        }
     }
 
     public boolean isEmpty()
@@ -82,8 +82,7 @@ public class RepositoryRegistryImpl
     }
 
     public synchronized void loadFromInputStream( InputStream inputStream )
-        throws IOException
-    {
+            throws IOException, NPandayRepositoryException {
 
         if ( repositoryLoader == null || registryLoader == null )
         {
@@ -113,11 +112,11 @@ public class RepositoryRegistryImpl
                 }
                 catch ( Exception e )
                 {
-                    throw new IOException( "NPANDAY-082-003: Unable to load repository: " + message );
+                    throw new NPandayRepositoryException( "NPANDAY-082-003: Unable to load repository: " + message, e );
                 }
                 catch ( Error e )
                 {
-                    throw new IOException( "NPANDAY-082-004: Unable to load repository: " + message );
+                    throw new NPandayRepositoryException( "NPANDAY-082-004: Unable to load repository: " + message, e );
                 }
             }
 
@@ -137,11 +136,11 @@ public class RepositoryRegistryImpl
                 }
                 catch ( Exception e )
                 {
-                    throw new IOException( "NPANDAY-082-006: Unable to load registry: " + message );
+                    throw new NPandayRepositoryException( "NPANDAY-082-006: Unable to load registry: " + message, e );
                 }
                 catch ( Error e )
                 {
-                    throw new IOException( "NPANDAY-082-007: Unable to load registry: " + message );
+                    throw new NPandayRepositoryException( "NPANDAY-082-007: Unable to load registry: " + message, e );
                 }
             }
         }
@@ -152,7 +151,7 @@ public class RepositoryRegistryImpl
     }
 
     public synchronized void loadFromFile( String fileName )
-        throws IOException
+        throws IOException, NPandayRepositoryException
     {
         FileInputStream fis = new FileInputStream( fileName );
         loadFromInputStream( fis );
@@ -160,7 +159,7 @@ public class RepositoryRegistryImpl
 
 
     public synchronized void loadFromResource( String fileName, Class sourceClass )
-        throws IOException
+        throws IOException, NPandayRepositoryException
     {
         if ( sourceClass == null )
         {

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRegistryLoader.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRegistryLoader.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRegistryLoader.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.registry.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.RegistryLoader;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryLoader;
@@ -63,7 +64,7 @@ public class StandardRegistryLoader
      * @throws java.io.IOException
      */
     public final void loadRegistry( InputStream inputStream )
-        throws IOException
+        throws IOException, NPandayRepositoryException
     {
 
         KXmlParser parser = new KXmlParser();
@@ -162,7 +163,7 @@ public class StandardRegistryLoader
      * @throws IOException
      */
     private void loadIntoRegistry()
-        throws IOException
+        throws IOException, NPandayRepositoryException
     {
         if ( repositoryLoader == null )
         {

Modified: incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java?rev=1098512&r1=1098511&r2=1098512&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java (original)
+++ incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/StandardRepositoryLoader.java Mon May  2 08:46:33 2011
@@ -18,6 +18,7 @@
  */
 package npanday.registry.impl;
 
+import npanday.registry.NPandayRepositoryException;
 import npanday.registry.Repository;
 import npanday.registry.RepositoryLoader;
 import npanday.registry.RepositoryRegistry;
@@ -51,7 +52,7 @@ public class StandardRepositoryLoader
      */
 
     public Repository loadRepository( String fileUri, String repositoryClass, Hashtable initParams )
-        throws IOException
+            throws IOException, NPandayRepositoryException
     {
         if ( repositoryRegistry == null )
         {
@@ -101,17 +102,17 @@ public class StandardRepositoryLoader
             repository.load( stream, props );
             repository.setSourceUri( fileUri );
         }
-        catch ( IOException e )
+        catch ( NPandayRepositoryException e )
         {
-            throw new IOException( "NPANDAY-084-004: " + e.toString() + " : " + message );
+            throw new NPandayRepositoryException( "NPANDAY-084-004: " + e.toString() + " : " + message, e );
         }
         catch ( Exception e )
         {
-            throw new IOException( "NPANDAY-084-005: " + e.toString() + " : " + message );
+            throw new NPandayRepositoryException( "NPANDAY-084-005: " + e.toString() + " : " + message, e );
         }
         catch ( Error e )
         {
-            throw new IOException( "NPANDAY-084-006: " + e.toString() + " : " + message );
+            throw new NPandayRepositoryException( "NPANDAY-084-006: " + e.toString() + " : " + message, e );
         }
         return repository;
     }