[Ts2-pm-cvs-commit] ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/transform ArtifactTransformation.java,1.2,1.3 DefaultArtifactTransformation.java,1.7,1.8

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

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

Modified Files:
	ArtifactTransformation.java DefaultArtifactTransformation.java 
Log Message:
model general usage

Index: DefaultArtifactTransformation.java
===================================================================
RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/transform/DefaultArtifactTransformation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DefaultArtifactTransformation.java	17 May 2005 20:06:47 -0000	1.7
--- DefaultArtifactTransformation.java	27 May 2005 16:32:24 -0000	1.8
***************
*** 21,32 ****
  
  import java.io.File;
- import java.io.IOException;
  
! import org.apache.commons.lang.StringUtils;
  
! import net.sf.ts2.pm.artifact.Artifact;
! import net.sf.ts2.pm.artifact.DefaultArtifact;
! import net.sf.ts2.pm.artifact.deployer.DefaultArtifactDeployer;
! import net.sf.ts2.pm.model.ArtifactDescriptor;
  
  /**
--- 21,28 ----
  
  import java.io.File;
  
! import net.sf.ts2.pm.model.Artifact;
  
! import org.apache.commons.lang.StringUtils;
  
  /**
***************
*** 53,57 ****
      public Artifact archive2Artifact( File archive ) throws ArtifactTransformationException
      {
!         ArtifactDescriptor artifact = new ArtifactDescriptor();
          String fileName = archive.getName();
          String path = StringUtils.substringBeforeLast( archive.getPath(), archive.getName());
--- 49,53 ----
      public Artifact archive2Artifact( File archive ) throws ArtifactTransformationException
      {
!         Artifact artifact = new Artifact();
          String fileName = archive.getName();
          String path = StringUtils.substringBeforeLast( archive.getPath(), archive.getName());
***************
*** 65,69 ****
          artifact.setVersion( version );
          artifact.setArchive( fileName );
!         return new DefaultArtifact( artifact );
      }
      
--- 61,65 ----
          artifact.setVersion( version );
          artifact.setArchive( fileName );
!         return artifact;
      }
      
***************
*** 78,82 ****
      public File artifact2Archive( Artifact artifact ) throws ArtifactTransformationException
      {
!         String uid = artifact.getUId();
          String path = StringUtils.substringBeforeLast( uid, ":" );
          path = StringUtils.replace( path, ".", "/" );
--- 74,78 ----
      public File artifact2Archive( Artifact artifact ) throws ArtifactTransformationException
      {
!         String uid = artifact.getId();
          String path = StringUtils.substringBeforeLast( uid, ":" );
          path = StringUtils.replace( path, ".", "/" );

Index: ArtifactTransformation.java
===================================================================
RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/transform/ArtifactTransformation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ArtifactTransformation.java	11 May 2005 22:23:08 -0000	1.2
--- ArtifactTransformation.java	27 May 2005 16:32:24 -0000	1.3
***************
*** 22,26 ****
  import java.io.File;
  
! import net.sf.ts2.pm.artifact.Artifact;
  
  /**
--- 22,27 ----
  import java.io.File;
  
! import net.sf.ts2.pm.model.Artifact;
! 
  
  /**