[Ts2-pm-cvs-commit] ts2-pm/ts2-pm-descriptor/src/main/java/net/sf/ts2/pm/descriptor DefaultRepositoryDescriptorManager.java,1.2,1.3 RepositoryDescriptorManager.java,1.3,1.4

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

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

Modified Files:
	DefaultRepositoryDescriptorManager.java 
	RepositoryDescriptorManager.java 
Log Message:
model general usage

Index: RepositoryDescriptorManager.java
===================================================================
RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-descriptor/src/main/java/net/sf/ts2/pm/descriptor/RepositoryDescriptorManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RepositoryDescriptorManager.java	2 May 2005 18:10:22 -0000	1.3
--- RepositoryDescriptorManager.java	27 May 2005 16:32:28 -0000	1.4
***************
*** 23,28 ****
  import java.util.List;
  
! import net.sf.ts2.pm.model.ArtifactDescriptor;
! import net.sf.ts2.pm.model.RepositoryDescriptor;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Reader;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Writer;
--- 23,28 ----
  import java.util.List;
  
! import net.sf.ts2.pm.model.Artifact;
! import net.sf.ts2.pm.model.Repository;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Reader;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Writer;
***************
*** 41,49 ****
      void setWriter( TS2RepositoryXpp3Writer writer );
      
!     RepositoryDescriptor load( String basePath, String fileName ) throws Exception;
!     RepositoryDescriptor load( File file ) throws Exception;
      
!     void save( String basePath, String fileName, RepositoryDescriptor descriptor ) throws Exception;
!     void save( File file, RepositoryDescriptor descriptor ) throws Exception;
      
      /**
--- 41,49 ----
      void setWriter( TS2RepositoryXpp3Writer writer );
      
!     Repository load( String basePath, String fileName ) throws Exception;
!     Repository load( File file ) throws Exception;
      
!     void save( String basePath, String fileName, Repository descriptor ) throws Exception;
!     void save( File file, Repository descriptor ) throws Exception;
      
      /**
***************
*** 52,67 ****
       * partialArtifact.
       */
!     List getArtifactDescriptors( ArtifactDescriptor partialArtifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
      
!     void createArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
      
!     ArtifactDescriptor searchArtifactDescriptor( ArtifactDescriptor partialArtifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
      
!     void modifyArtifactDescriptor( ArtifactDescriptor partialArtifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
      
!     void deleteArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
      
!     void installArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
      
!     void deployArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo ) throws RepositoryDescriptorManagerException;
  }
--- 52,67 ----
       * partialArtifact.
       */
!     List getArtifacts( Artifact partialArtifact, Repository repo ) throws RepositoryDescriptorManagerException;
      
!     void createArtifact( Artifact artifact, Repository repo ) throws RepositoryDescriptorManagerException;
      
!     Artifact searchArtifact( Artifact partialArtifact, Repository repo ) throws RepositoryDescriptorManagerException;
      
!     void modifyArtifact( Artifact partialArtifact, Repository repo ) throws RepositoryDescriptorManagerException;
      
!     void deleteArtifact( Artifact artifact, Repository repo ) throws RepositoryDescriptorManagerException;
      
!     void installArtifact( Artifact artifact, Repository repo ) throws RepositoryDescriptorManagerException;
      
!     void deployArtifact( Artifact artifact, Repository repo ) throws RepositoryDescriptorManagerException;
  }

Index: DefaultRepositoryDescriptorManager.java
===================================================================
RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-descriptor/src/main/java/net/sf/ts2/pm/descriptor/DefaultRepositoryDescriptorManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultRepositoryDescriptorManager.java	2 May 2005 18:10:22 -0000	1.2
--- DefaultRepositoryDescriptorManager.java	27 May 2005 16:32:27 -0000	1.3
***************
*** 25,30 ****
  import java.util.List;
  
! import net.sf.ts2.pm.model.ArtifactDescriptor;
! import net.sf.ts2.pm.model.RepositoryDescriptor;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Reader;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Writer;
--- 25,30 ----
  import java.util.List;
  
! import net.sf.ts2.pm.model.Artifact;
! import net.sf.ts2.pm.model.Repository;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Reader;
  import net.sf.ts2.pm.model.io.xpp3.TS2RepositoryXpp3Writer;
***************
*** 82,86 ****
       * @return
       */
!     public RepositoryDescriptor load( String basePath, String fileName ) throws Exception
      {
          File file = new File( basePath, fileName );
--- 82,86 ----
       * @return
       */
!     public Repository load( String basePath, String fileName ) throws Exception
      {
          File file = new File( basePath, fileName );
***************
*** 93,97 ****
       * @return
       */
!     public RepositoryDescriptor load( File file ) throws Exception
      {
          FileReader read = new FileReader(file);
--- 93,97 ----
       * @return
       */
!     public Repository load( File file ) throws Exception
      {
          FileReader read = new FileReader(file);
***************
*** 106,110 ****
       * @return
       */
!     public void save( String basePath, String fileName, RepositoryDescriptor descriptor ) throws Exception
      {
          File file = new File( basePath, fileName );
--- 106,110 ----
       * @return
       */
!     public void save( String basePath, String fileName, Repository descriptor ) throws Exception
      {
          File file = new File( basePath, fileName );
***************
*** 118,122 ****
       * @return
       */
!     public void save( File file, RepositoryDescriptor descriptor ) throws Exception
      {
          FileWriter writ = new FileWriter(file);
--- 118,122 ----
       * @return
       */
!     public void save( File file, Repository descriptor ) throws Exception
      {
          FileWriter writ = new FileWriter(file);
***************
*** 130,134 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public void createArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
--- 130,134 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public void createArtifact( Artifact artifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {
***************
*** 141,148 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public void deleteArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
!         ArtifactDescriptor correctArtifact =  searchArtifactDescriptor( artifact, repo );
          repo.removeArtifact( correctArtifact );
      }
--- 141,148 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public void deleteArtifact( Artifact artifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {
!         Artifact correctArtifact =  searchArtifact( artifact, repo );
          repo.removeArtifact( correctArtifact );
      }
***************
*** 153,157 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public void deployArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
--- 153,157 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public void deployArtifact( Artifact artifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {
***************
*** 165,169 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public List getArtifactDescriptors( ArtifactDescriptor partialArtifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
--- 165,169 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public List getArtifacts( Artifact partialArtifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {
***************
*** 176,183 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public void installArtifactDescriptor( ArtifactDescriptor artifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
!         ArtifactDescriptor correctArtifact =  searchArtifactDescriptor( artifact, repo );
          // TODO set state to installed
      }
--- 176,183 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public void installArtifact( Artifact artifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {
!         Artifact correctArtifact =  searchArtifact( artifact, repo );
          // TODO set state to installed
      }
***************
*** 188,196 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public void modifyArtifactDescriptor( ArtifactDescriptor partialArtifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
!         deleteArtifactDescriptor( partialArtifact, repo );
!         createArtifactDescriptor( partialArtifact, repo );
      }
      /**
--- 188,196 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public void modifyArtifact( Artifact partialArtifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {
!         deleteArtifact( partialArtifact, repo );
!         createArtifact( partialArtifact, repo );
      }
      /**
***************
*** 201,205 ****
       * @throws RepositoryDescriptorManagerException
       */
!     public ArtifactDescriptor searchArtifactDescriptor( ArtifactDescriptor partialArtifact, RepositoryDescriptor repo )
                      throws RepositoryDescriptorManagerException
      {
--- 201,205 ----
       * @throws RepositoryDescriptorManagerException
       */
!     public Artifact searchArtifact( Artifact partialArtifact, Repository repo )
                      throws RepositoryDescriptorManagerException
      {