[Ts2-pm-cvs-commit] ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/installer ArtifactInstaller.java,1.2,1.3 DefaultArtifactInstaller.java,1.2,1.3

[Nicolas C. <nch...@us...>]

Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/installer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/installer

Modified Files:
	ArtifactInstaller.java DefaultArtifactInstaller.java 
Log Message:
model general usage

Index: ArtifactInstaller.java
===================================================================
RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/installer/ArtifactInstaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ArtifactInstaller.java	11 May 2005 22:22:36 -0000	1.2
--- ArtifactInstaller.java	27 May 2005 16:32:22 -0000	1.3
***************
*** 22,30 ****
  import java.io.File;
  
- import net.sf.ts2.pm.artifact.Artifact;
  import net.sf.ts2.pm.artifact.handler.ArtifactHandler;
  import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager;
- import net.sf.ts2.pm.artifact.repository.ArtifactRepository;
  import net.sf.ts2.pm.artifact.transform.ArtifactTransformation;
  import net.sf.ts2.pm.pack.installer.PackageInstaller;
  
--- 22,30 ----
  import java.io.File;
  
  import net.sf.ts2.pm.artifact.handler.ArtifactHandler;
  import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager;
  import net.sf.ts2.pm.artifact.transform.ArtifactTransformation;
+ import net.sf.ts2.pm.model.Artifact;
+ import net.sf.ts2.pm.model.Repository;
  import net.sf.ts2.pm.pack.installer.PackageInstaller;
  
***************
*** 67,71 ****
       * @deprecated use void install(File downloadDir, Artifact artifact, boolean rename)
       */
!     void install( String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository )
          throws ArtifactInstallationException;
  
--- 67,71 ----
       * @deprecated use void install(File downloadDir, Artifact artifact, boolean rename)
       */
!     void install( String basedir, String finalName, Artifact artifact, Repository localRepository )
          throws ArtifactInstallationException;
  
***************
*** 80,84 ****
       * @deprecated use void install(File downloadDir, Artifact artifact, boolean rename)
       */
!     void install( File source, Artifact artifact, ArtifactRepository localRepository )
          throws ArtifactInstallationException;
      
--- 80,84 ----
       * @deprecated use void install(File downloadDir, Artifact artifact, boolean rename)
       */
!     void install( File source, Artifact artifact, Repository localRepository )
          throws ArtifactInstallationException;
      

Index: DefaultArtifactInstaller.java
===================================================================
RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/installer/DefaultArtifactInstaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultArtifactInstaller.java	11 May 2005 22:22:40 -0000	1.2
--- DefaultArtifactInstaller.java	27 May 2005 16:32:22 -0000	1.3
***************
*** 23,32 ****
  import java.util.List;
  
- import net.sf.ts2.pm.artifact.Artifact;
  import net.sf.ts2.pm.artifact.handler.ArtifactHandler;
  import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager;
- import net.sf.ts2.pm.artifact.repository.ArtifactRepository;
  import net.sf.ts2.pm.artifact.transform.ArtifactTransformation;
  import net.sf.ts2.pm.artifact.transform.ArtifactTransformationException;
  import net.sf.ts2.pm.pack.installer.PackageInstaller;
  
--- 23,32 ----
  import java.util.List;
  
  import net.sf.ts2.pm.artifact.handler.ArtifactHandler;
  import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager;
  import net.sf.ts2.pm.artifact.transform.ArtifactTransformation;
  import net.sf.ts2.pm.artifact.transform.ArtifactTransformationException;
+ import net.sf.ts2.pm.model.Artifact;
+ import net.sf.ts2.pm.model.Repository;
  import net.sf.ts2.pm.pack.installer.PackageInstaller;
  
***************
*** 63,78 ****
              throw new ArtifactInstallationException( "download dir not found" );
          }
!         historyManager.addEvent( "start artifact installation : " + artifact.getUId() );
          try
          {
              File archive = artifactTransformation.artifact2Archive( artifact );
              List packages = artifactHandler.getArchivePackages( archive );
!             packageInstaller.install( downloadDir.getAbsolutePath(), packages, artifact.getUId(), rename );
!             historyManager.addEvent( "end artifact installation : " + artifact.getUId()  );
          }
          catch (ArtifactTransformationException e)
          {
!             historyManager.addEvent( "fail artifact installation : " + artifact.getUId()  );
!             throw new ArtifactInstallationException( "fail artifact installation : " + artifact.getUId() + " " + e );
          }
  
--- 63,78 ----
              throw new ArtifactInstallationException( "download dir not found" );
          }
!         historyManager.addEvent( "start artifact installation : " + artifact.getId() );
          try
          {
              File archive = artifactTransformation.artifact2Archive( artifact );
              List packages = artifactHandler.getArchivePackages( archive );
!             packageInstaller.install( downloadDir.getAbsolutePath(), packages, artifact.getId(), rename );
!             historyManager.addEvent( "end artifact installation : " + artifact.getId()  );
          }
          catch (ArtifactTransformationException e)
          {
!             historyManager.addEvent( "fail artifact installation : " + artifact.getId()  );
!             throw new ArtifactInstallationException( "fail artifact installation : " + artifact.getId() + " " + e );
          }
  
***************
*** 93,108 ****
              throw new ArtifactInstallationException( "download dir not found" );
          }
!         historyManager.addEvent( "start artifact uninstallation : " + artifact.getUId() );
          try
          {
              File archive = artifactTransformation.artifact2Archive( artifact );
              List packages = artifactHandler.getArchivePackages( archive );
!             packageInstaller.uninstall( downloadDir.getAbsolutePath(), packages, artifact.getUId(), rename );
!             historyManager.addEvent( "end artifact uninstallation : " + artifact.getUId()  );
          }
          catch (ArtifactTransformationException e)
          {
!             historyManager.addEvent( "fail artifact uninstallation : " + artifact.getUId()  );
!             throw new ArtifactInstallationException( "fail artifact uninstallation : " + artifact.getUId() + " " + e );
          }
  
--- 93,108 ----
              throw new ArtifactInstallationException( "download dir not found" );
          }
!         historyManager.addEvent( "start artifact uninstallation : " + artifact.getId() );
          try
          {
              File archive = artifactTransformation.artifact2Archive( artifact );
              List packages = artifactHandler.getArchivePackages( archive );
!             packageInstaller.uninstall( downloadDir.getAbsolutePath(), packages, artifact.getId(), rename );
!             historyManager.addEvent( "end artifact uninstallation : " + artifact.getId()  );
          }
          catch (ArtifactTransformationException e)
          {
!             historyManager.addEvent( "fail artifact uninstallation : " + artifact.getId()  );
!             throw new ArtifactInstallationException( "fail artifact uninstallation : " + artifact.getId() + " " + e );
          }
  
***************
*** 116,120 ****
       * @throws ArtifactInstallationException
       */
!     public void install(File source, Artifact artifact, ArtifactRepository localRepository)
                      throws ArtifactInstallationException
      {
--- 116,120 ----
       * @throws ArtifactInstallationException
       */
!     public void install(File source, Artifact artifact, Repository localRepository)
                      throws ArtifactInstallationException
      {
***************
*** 129,133 ****
       * @throws ArtifactInstallationException
       */
!     public void install(String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository)
                      throws ArtifactInstallationException
      {
--- 129,133 ----
       * @throws ArtifactInstallationException
       */
!     public void install(String basedir, String finalName, Artifact artifact, Repository localRepository)
                      throws ArtifactInstallationException
      {