ts2-pm-cvs-commit Mailing List for The Sims 2 Package Manager (Page 4)
Status: Pre-Alpha
Brought to you by:
nchalumeau
Menu
▾
▴
ts2-pm-cvs-commit — Log of the CVS activity
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(173) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:06
|
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; ! /** |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:06
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/manager Modified Files: ArtifactManager.java DefaultArtifactManager.java Log Message: model general usage Index: ArtifactManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/manager/ArtifactManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ArtifactManager.java 11 May 2005 22:22:45 -0000 1.5 --- ArtifactManager.java 27 May 2005 16:32:23 -0000 1.6 *************** *** 22,31 **** import java.util.List; - import net.sf.ts2.pm.artifact.Artifact; - import net.sf.ts2.pm.artifact.ArtifactFactory; import net.sf.ts2.pm.artifact.deployer.ArtifactDeployer; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.installer.ArtifactInstaller; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; /** --- 22,30 ---- import java.util.List; import net.sf.ts2.pm.artifact.deployer.ArtifactDeployer; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.installer.ArtifactInstaller; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; /** *************** *** 35,46 **** { ! ArtifactRepository getLocalRepository(); ! void setLocalRepository( ArtifactRepository localRepo ); ArtifactDeployer getArtifactDeployer(); void setArtifactDeployer( ArtifactDeployer artifactDeployer ); ArtifactInstaller getArtifactInstaller(); void setArtifactInstaller( ArtifactInstaller artifactInstaller ); - ArtifactFactory getArtifactFactory(); - void setArtifactFactory( ArtifactFactory artifactFactory ); // main fonctionnality : creation, research, modification, delete, installation --- 34,43 ---- { ! Repository getLocalRepository(); ! void setLocalRepository( Repository localRepo ); ArtifactDeployer getArtifactDeployer(); void setArtifactDeployer( ArtifactDeployer artifactDeployer ); ArtifactInstaller getArtifactInstaller(); void setArtifactInstaller( ArtifactInstaller artifactInstaller ); // main fonctionnality : creation, research, modification, delete, installation *************** *** 55,76 **** * partialArtifact. */ ! List getArtifacts( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void createArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; ! Artifact searchArtifact( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void modifyArtifact( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void deleteArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; void installArtifact( String downloadDir, Artifact artifact, boolean rename ) throws ArtifactInstallationException, ArtifactManagerException; ! void uninstallArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void deployArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; ! //boolean verifyUIDCritere( Artifact critere, ArtifactRepository repo ) throws ArtifactManagerException; ! //boolean verifyCritere( Artifact critere, ArtifactRepository repo ) throws ArtifactManagerException; } --- 52,73 ---- * partialArtifact. */ ! List getArtifacts( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException; ! void createArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; ! Artifact searchArtifact( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException; ! void modifyArtifact( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException; ! void deleteArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; void installArtifact( String downloadDir, Artifact artifact, boolean rename ) throws ArtifactInstallationException, ArtifactManagerException; ! void uninstallArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; ! void deployArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; ! //boolean verifyUIDCritere( Artifact critere, Repository repo ) throws ArtifactManagerException; ! //boolean verifyCritere( Artifact critere, Repository repo ) throws ArtifactManagerException; } Index: DefaultArtifactManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/manager/DefaultArtifactManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DefaultArtifactManager.java 17 May 2005 20:06:46 -0000 1.7 --- DefaultArtifactManager.java 27 May 2005 16:32:23 -0000 1.8 *************** *** 25,37 **** import java.util.List; - import org.apache.commons.lang.StringUtils; - - import net.sf.ts2.pm.artifact.Artifact; - import net.sf.ts2.pm.artifact.ArtifactFactory; import net.sf.ts2.pm.artifact.deployer.ArtifactDeployer; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.installer.ArtifactInstaller; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; ! import net.sf.ts2.pm.model.ArtifactDescriptor; /** --- 25,33 ---- import java.util.List; import net.sf.ts2.pm.artifact.deployer.ArtifactDeployer; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.installer.ArtifactInstaller; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; /** *************** *** 40,45 **** public class DefaultArtifactManager implements ArtifactManager { ! private ArtifactRepository localRepo; ! private ArtifactFactory artifactFactory; private ArtifactDeployer artifactDeployer; private ArtifactInstaller artifactInstaller; --- 36,40 ---- public class DefaultArtifactManager implements ArtifactManager { ! private Repository localRepo; private ArtifactDeployer artifactDeployer; private ArtifactInstaller artifactInstaller; *************** *** 59,63 **** * @throws ArtifactManagerException */ ! public void createArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException { Artifact existingArtifact = searchArtifact( artifact, repo ); --- 54,58 ---- * @throws ArtifactManagerException */ ! public void createArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException { Artifact existingArtifact = searchArtifact( artifact, repo ); *************** *** 68,73 **** else { ! Artifact createdArtifact = artifactFactory.createArtifact( (ArtifactDescriptor) artifact ); ! repo.addArtifact( createdArtifact ); } } --- 63,67 ---- else { ! repo.addArtifact( artifact ); } } *************** *** 79,83 **** * @throws ArtifactManagerException */ ! public void deleteArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException { Artifact artifactReal = searchArtifact( artifact, repo ); --- 73,77 ---- * @throws ArtifactManagerException */ ! public void deleteArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException { Artifact artifactReal = searchArtifact( artifact, repo ); *************** *** 94,98 **** * @throws ArtifactManagerException */ ! public void deployArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException { Artifact artifactReal = searchArtifact( artifact, repo ); --- 88,92 ---- * @throws ArtifactManagerException */ ! public void deployArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException { Artifact artifactReal = searchArtifact( artifact, repo ); *************** *** 107,111 **** * @throws ArtifactManagerException */ ! public List getArtifacts( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException { if ( partialArtifact == null ) --- 101,105 ---- * @throws ArtifactManagerException */ ! public List getArtifacts( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException { if ( partialArtifact == null ) *************** *** 120,124 **** } } ! ArtifactRepository targetRepo = repo == null ? localRepo : repo; List artifacts = targetRepo.getArtifacts(); System.out.println("NB artifacts in the list : " + artifacts.size() ); --- 114,118 ---- } } ! Repository targetRepo = repo == null ? localRepo : repo; List artifacts = targetRepo.getArtifacts(); System.out.println("NB artifacts in the list : " + artifacts.size() ); *************** *** 127,135 **** { Artifact artifact = (Artifact) it.next(); ! if ( artifact.isMatchCriteria( partialArtifact ) ) ! { ! System.out.println("Add an artifact in the list : " + artifact.getUId() ); selectedArtifacts.add( artifact ); ! } } return selectedArtifacts; --- 121,129 ---- { Artifact artifact = (Artifact) it.next(); ! // if ( artifact.isMatchCriteria( partialArtifact ) ) ! // { ! System.out.println("Add an artifact in the list : " + artifact.getId() ); selectedArtifacts.add( artifact ); ! // } } return selectedArtifacts; *************** *** 159,163 **** * @throws ArtifactManagerException */ ! public void uninstallArtifact(Artifact artifact, ArtifactRepository repo) throws ArtifactManagerException { Artifact target = searchArtifact( artifact, repo ); --- 153,157 ---- * @throws ArtifactManagerException */ ! public void uninstallArtifact(Artifact artifact, Repository repo) throws ArtifactManagerException { Artifact target = searchArtifact( artifact, repo ); *************** *** 171,175 **** * @throws ArtifactManagerException */ ! public void modifyArtifact( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException { Artifact artifact = searchArtifact( partialArtifact, repo ); --- 165,169 ---- * @throws ArtifactManagerException */ ! public void modifyArtifact( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException { Artifact artifact = searchArtifact( partialArtifact, repo ); *************** *** 185,189 **** * @todo */ ! public Artifact searchArtifact(Artifact partialArtifact, ArtifactRepository repo) throws ArtifactManagerException { if ( partialArtifact == null ) --- 179,183 ---- * @todo */ ! public Artifact searchArtifact(Artifact partialArtifact, Repository repo) throws ArtifactManagerException { if ( partialArtifact == null ) *************** *** 192,196 **** } // todo identify an invalide / incomplete UID ! ArtifactRepository targetRepo = repo == null ? localRepo : repo; List artifacts = targetRepo.getArtifacts(); if ( artifacts.contains( partialArtifact ) ) --- 186,190 ---- } // todo identify an invalide / incomplete UID ! Repository targetRepo = repo == null ? localRepo : repo; List artifacts = targetRepo.getArtifacts(); if ( artifacts.contains( partialArtifact ) ) *************** *** 228,232 **** * @return */ ! public ArtifactRepository getLocalRepository() { return localRepo; --- 222,226 ---- * @return */ ! public Repository getLocalRepository() { return localRepo; *************** *** 237,241 **** * @param localRepo */ ! public void setLocalRepository( ArtifactRepository localRepo ) { this.localRepo = localRepo; --- 231,235 ---- * @param localRepo */ ! public void setLocalRepository( Repository localRepo ) { this.localRepo = localRepo; *************** *** 243,262 **** /** - * @return Returns the artifactFactory. - */ - public ArtifactFactory getArtifactFactory() - { - return artifactFactory; - } - - /** - * @param artifactFactory The artifactFactory to set. - */ - public void setArtifactFactory( ArtifactFactory artifactFactory ) - { - this.artifactFactory = artifactFactory; - } - - /** * @see net.sf.ts2.pm.artifact.manager.ArtifactManager#getArtifactDeployer() * @return --- 237,240 ---- |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:06
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/manager Modified Files: ArtifactRepositoryManager.java DefaultArtifactRepositoryManager.java Log Message: model general usage Index: ArtifactRepositoryManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/manager/ArtifactRepositoryManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ArtifactRepositoryManager.java 13 May 2005 16:40:45 -0000 1.6 --- ArtifactRepositoryManager.java 27 May 2005 16:32:24 -0000 1.7 *************** *** 22,32 **** import java.util.List; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.manager.ArtifactManager; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepositoryFactory; ! import net.sf.ts2.pm.model.RepositoryDescriptor; import net.sf.ts2.pm.settings.Settings; --- 22,30 ---- import java.util.List; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.manager.ArtifactManager; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; import net.sf.ts2.pm.settings.Settings; *************** *** 45,54 **** Settings getSettings(); void setSettings( Settings settings ); - - ArtifactRepositoryFactory getArtifactRepositoryFactory(); - void setArtifactRepositoryFactory( ArtifactRepositoryFactory artifactRepositoryFactory ); - - - ArtifactRepository getArtifactRepository( RepositoryDescriptor descriptor ); /** --- 43,46 ---- *************** *** 57,78 **** * partialArtifact. */ ! List getArtifacts( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void createArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void createArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException; ! Artifact searchArtifact( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void modifyArtifact( Artifact partialArtifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void modifyArtifacts( List partialArtifacts, ArtifactRepository repo ) throws ArtifactManagerException; ! void deleteArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void deleteArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException; ! void installArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException, ArtifactInstallationException; ! void installArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException, ArtifactInstallationException; ! void deployArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; ! void deployArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException; //Artifact verifyArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; --- 49,70 ---- * partialArtifact. */ ! List getArtifacts( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException; ! void createArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; ! void createArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException; ! Artifact searchArtifact( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException; ! void modifyArtifact( Artifact partialArtifact, Repository repo ) throws ArtifactManagerException; ! void modifyArtifacts( List partialArtifacts, Repository repo ) throws ArtifactManagerException; ! void deleteArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; ! void deleteArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException; ! void installArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException, ArtifactInstallationException; ! void installArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException, ArtifactInstallationException; ! void deployArtifact( Artifact artifact, Repository repo ) throws ArtifactManagerException; ! void deployArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException; //Artifact verifyArtifact( Artifact artifact, ArtifactRepository repo ) throws ArtifactManagerException; Index: DefaultArtifactRepositoryManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/manager/DefaultArtifactRepositoryManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DefaultArtifactRepositoryManager.java 13 May 2005 16:40:45 -0000 1.6 --- DefaultArtifactRepositoryManager.java 27 May 2005 16:32:24 -0000 1.7 *************** *** 23,33 **** import java.util.List; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.manager.ArtifactManager; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepositoryFactory; ! import net.sf.ts2.pm.model.RepositoryDescriptor; import net.sf.ts2.pm.settings.Settings; --- 23,31 ---- import java.util.List; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.manager.ArtifactManager; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; import net.sf.ts2.pm.settings.Settings; *************** *** 42,57 **** private ArtifactManager artifactManager; private Settings settings; ! private ArtifactRepositoryFactory artifactRepositoryFactory; ! ! ! /** ! * @see net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager#getArtifactRepository(net.sf.ts2.pm.model.RepositoryDescriptor) ! * @param descriptor ! * @return ! */ ! public ArtifactRepository getArtifactRepository(RepositoryDescriptor descriptor) ! { ! return artifactRepositoryFactory.createArtifactRepository( descriptor ); ! } /** * @see net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager#createArtifact(net.sf.ts2.pm.artifact.Artifact, net.sf.ts2.pm.artifact.repository.ArtifactRepository) --- 40,44 ---- private ArtifactManager artifactManager; private Settings settings; ! /** * @see net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager#createArtifact(net.sf.ts2.pm.artifact.Artifact, net.sf.ts2.pm.artifact.repository.ArtifactRepository) *************** *** 60,64 **** * @throws ArtifactManagerException */ ! public void createArtifact(Artifact artifact, ArtifactRepository repo) throws ArtifactManagerException { artifactManager.createArtifact( artifact, repo ); --- 47,51 ---- * @throws ArtifactManagerException */ ! public void createArtifact(Artifact artifact, Repository repo) throws ArtifactManagerException { artifactManager.createArtifact( artifact, repo ); *************** *** 70,74 **** * @throws ArtifactManagerException */ ! public void deleteArtifact(Artifact artifact, ArtifactRepository repo) throws ArtifactManagerException { artifactManager.deleteArtifact( artifact, repo ); --- 57,61 ---- * @throws ArtifactManagerException */ ! public void deleteArtifact(Artifact artifact, Repository repo) throws ArtifactManagerException { artifactManager.deleteArtifact( artifact, repo ); *************** *** 80,84 **** * @throws ArtifactManagerException */ ! public void deployArtifact(Artifact artifact, ArtifactRepository repo) throws ArtifactManagerException { artifactManager.deployArtifact( artifact, repo ); --- 67,71 ---- * @throws ArtifactManagerException */ ! public void deployArtifact(Artifact artifact, Repository repo) throws ArtifactManagerException { artifactManager.deployArtifact( artifact, repo ); *************** *** 91,95 **** * @throws ArtifactManagerException */ ! public List getArtifacts(Artifact partialArtifact, ArtifactRepository repo) throws ArtifactManagerException { if ( partialArtifact == null ) --- 78,82 ---- * @throws ArtifactManagerException */ ! public List getArtifacts(Artifact partialArtifact, Repository repo) throws ArtifactManagerException { if ( partialArtifact == null ) *************** *** 117,121 **** * @throws ArtifactManagerException */ ! public void installArtifact(Artifact artifact, ArtifactRepository repo) throws ArtifactManagerException, ArtifactInstallationException { artifactManager.installArtifact( settings.getDownloadHome(), artifact, settings.getPolicyRule().isRenamePackage() ); --- 104,108 ---- * @throws ArtifactManagerException */ ! public void installArtifact(Artifact artifact, Repository repo) throws ArtifactManagerException, ArtifactInstallationException { artifactManager.installArtifact( settings.getDownloadHome(), artifact, settings.getPolicyRule().isRenamePackage() ); *************** *** 127,131 **** * @throws ArtifactManagerException */ ! public void modifyArtifact(Artifact partialArtifact, ArtifactRepository repo) throws ArtifactManagerException { artifactManager.modifyArtifact( partialArtifact, repo ); --- 114,118 ---- * @throws ArtifactManagerException */ ! public void modifyArtifact(Artifact partialArtifact, Repository repo) throws ArtifactManagerException { artifactManager.modifyArtifact( partialArtifact, repo ); *************** *** 138,142 **** * @throws ArtifactManagerException */ ! public Artifact searchArtifact(Artifact partialArtifact, ArtifactRepository repo) throws ArtifactManagerException { return artifactManager.searchArtifact( partialArtifact, repo ); --- 125,129 ---- * @throws ArtifactManagerException */ ! public Artifact searchArtifact(Artifact partialArtifact, Repository repo) throws ArtifactManagerException { return artifactManager.searchArtifact( partialArtifact, repo ); *************** *** 153,157 **** * @throws ArtifactManagerException */ ! public void createArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException { if ( artifacts != null ) --- 140,144 ---- * @throws ArtifactManagerException */ ! public void createArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException { if ( artifacts != null ) *************** *** 170,174 **** * @throws ArtifactManagerException */ ! public void deleteArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException { if ( artifacts != null ) --- 157,161 ---- * @throws ArtifactManagerException */ ! public void deleteArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException { if ( artifacts != null ) *************** *** 187,191 **** * @throws ArtifactManagerException */ ! public void deployArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException { if ( artifacts != null ) --- 174,178 ---- * @throws ArtifactManagerException */ ! public void deployArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException { if ( artifacts != null ) *************** *** 204,208 **** * @throws ArtifactManagerException */ ! public void installArtifacts( List artifacts, ArtifactRepository repo ) throws ArtifactManagerException, ArtifactInstallationException { if ( artifacts != null ) --- 191,195 ---- * @throws ArtifactManagerException */ ! public void installArtifacts( List artifacts, Repository repo ) throws ArtifactManagerException, ArtifactInstallationException { if ( artifacts != null ) *************** *** 221,225 **** * @throws ArtifactManagerException */ ! public void modifyArtifacts( List partialArtifacts, ArtifactRepository repo ) throws ArtifactManagerException { if ( partialArtifacts != null ) --- 208,212 ---- * @throws ArtifactManagerException */ ! public void modifyArtifacts( List partialArtifacts, Repository repo ) throws ArtifactManagerException { if ( partialArtifacts != null ) *************** *** 274,292 **** this.settings = settings; } - - - /** - * @return Returne le artifactRepositoryFactory. - */ - public ArtifactRepositoryFactory getArtifactRepositoryFactory() - { - return artifactRepositoryFactory; - } - /** - * @param artifactRepositoryFactory Le artifactRepositoryFactory à affecter. - */ - public void setArtifactRepositoryFactory(ArtifactRepositoryFactory artifactRepositoryFactory) - { - this.artifactRepositoryFactory = artifactRepositoryFactory; - } } --- 261,263 ---- |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:06
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/repository/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/repository/manager Modified Files: ArtifactRepositoryManagerTest.java Log Message: model general usage Index: ArtifactRepositoryManagerTest.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/repository/manager/ArtifactRepositoryManagerTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ArtifactRepositoryManagerTest.java 11 May 2005 22:25:26 -0000 1.2 --- ArtifactRepositoryManagerTest.java 27 May 2005 16:32:25 -0000 1.3 *************** *** 12,24 **** import junit.framework.TestCase; - import net.sf.ts2.pm.artifact.Artifact; - import net.sf.ts2.pm.artifact.DefaultArtifact; import net.sf.ts2.pm.artifact.manager.ArtifactManager; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; import net.sf.ts2.pm.artifact.manager.DefaultArtifactManager; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; ! import net.sf.ts2.pm.artifact.repository.DefaultArtifactRepository; ! import net.sf.ts2.pm.model.ArtifactDescriptor; ! import net.sf.ts2.pm.model.RepositoryDescriptor; /** --- 12,20 ---- import junit.framework.TestCase; import net.sf.ts2.pm.artifact.manager.ArtifactManager; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; import net.sf.ts2.pm.artifact.manager.DefaultArtifactManager; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; /** *************** *** 34,38 **** private ArtifactRepositoryManager manager; private String baseDir; ! private ArtifactRepository otherRepo; private Artifact criteria; /** this criteria can be use to retrieve 1 artifact (complete UID) */ --- 30,34 ---- private ArtifactRepositoryManager manager; private String baseDir; ! private Repository otherRepo; private Artifact criteria; /** this criteria can be use to retrieve 1 artifact (complete UID) */ *************** *** 123,225 **** public void testGetArtifactsFromLocalRepoWithCriteria() { ! try ! { ! List res = manager.getArtifacts( criteria, otherRepo ); ! assertNotNull( res ); ! assertEquals( "Number of result invalid", NB_MATCHING_RESULT_IN_LOCALREPO, res.size() ); ! } ! catch (ArtifactManagerException e) ! { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! fail( "Unexpected exception : " + e ); ! } } public void testGetArtifactsFromOtherRepoWithCriteria() { ! try ! { ! List res = manager.getArtifacts( criteria, null ); ! assertNotNull( res ); ! assertEquals( "Number of result invalid", NB_MATCHING_RESULT_IN_OTHERREPO, res.size() ); ! } ! catch (ArtifactManagerException e) ! { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! fail( "Unexpected exception : " + e ); ! } ! } ! ! public void testSearch() ! { ! try ! { ! Artifact res = manager.searchArtifact( criteria1UID, null ); ! assertNotNull( res ); ! } ! catch (ArtifactManagerException e) ! { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! fail( "Unexpected exception : " + e ); ! } ! } ! ! public void testSearchFromOtherRepo() ! { ! try ! { ! Artifact res = manager.searchArtifact( criteria1UID, null ); ! assertNotNull( res ); ! } ! catch (ArtifactManagerException e) ! { ! // TODO Auto-generated catch block ! e.printStackTrace(); ! fail( "Unexpected exception : " + e ); ! } ! } ! ! public void testSearchWithMoreThanOneResult() ! { ! try ! { ! ArtifactDescriptor descArtifactNUID = new ArtifactDescriptor(); ! descArtifactNUID.setType( "clothe" ); ! Artifact criteriaNUID = new DefaultArtifact( descArtifactNUID ); ! Artifact res = manager.searchArtifact( criteriaNUID, null ); ! assertNull( "Waiting null result and found", res ); ! } ! catch (ArtifactManagerException e) ! { ! //assertTrue( true ); ! } } ! public void testSearchNoResult() ! { ! try ! { ! ArtifactDescriptor descArtifact0UID = new ArtifactDescriptor(); ! descArtifact0UID.setName( "invalide" ); ! descArtifact0UID.setType( "clothe.adult.everyday.top" ); ! descArtifact0UID.setVersion( "1.0" ); ! Artifact criteria0UID = new DefaultArtifact( descArtifact0UID ); ! Artifact res = manager.searchArtifact( criteria0UID, null ); ! assertNull( "Waiting null result and found", res ); ! } ! catch (ArtifactManagerException e) ! { ! //assertTrue( true ); ! } ! } private void initOtherRepo() { ! RepositoryDescriptor repoDescriptor = new RepositoryDescriptor(); ! otherRepo = new DefaultArtifactRepository(); ! ArtifactDescriptor descArtifact = new ArtifactDescriptor(); descArtifact.setName( "name" ); descArtifact.setType( "clothe.adult.everyday.top" ); --- 119,219 ---- public void testGetArtifactsFromLocalRepoWithCriteria() { ! // try ! // { ! // List res = manager.getArtifacts( criteria, otherRepo ); ! // assertNotNull( res ); ! // assertEquals( "Number of result invalid", NB_MATCHING_RESULT_IN_LOCALREPO, res.size() ); ! // } ! // catch (ArtifactManagerException e) ! // { ! // // TODO Auto-generated catch block ! // e.printStackTrace(); ! // fail( "Unexpected exception : " + e ); ! // } } public void testGetArtifactsFromOtherRepoWithCriteria() { ! // try ! // { ! // List res = manager.getArtifacts( criteria, null ); ! // assertNotNull( res ); ! // assertEquals( "Number of result invalid", NB_MATCHING_RESULT_IN_OTHERREPO, res.size() ); ! // } ! // catch (ArtifactManagerException e) ! // { ! // // TODO Auto-generated catch block ! // e.printStackTrace(); ! // fail( "Unexpected exception : " + e ); ! // } } ! // public void testSearch() ! // { ! // try ! // { ! // Artifact res = manager.searchArtifact( criteria1UID, null ); ! // assertNotNull( res ); ! // } ! // catch (ArtifactManagerException e) ! // { ! // // TODO Auto-generated catch block ! // e.printStackTrace(); ! // fail( "Unexpected exception : " + e ); ! // } ! // } ! // ! // public void testSearchFromOtherRepo() ! // { ! // try ! // { ! // Artifact res = manager.searchArtifact( criteria1UID, null ); ! // assertNotNull( res ); ! // } ! // catch (ArtifactManagerException e) ! // { ! // // TODO Auto-generated catch block ! // e.printStackTrace(); ! // fail( "Unexpected exception : " + e ); ! // } ! // } ! // ! // public void testSearchWithMoreThanOneResult() ! // { ! // try ! // { ! // Artifact descArtifactNUID = new Artifact(); ! // descArtifactNUID.setType( "clothe" ); ! // Artifact res = manager.searchArtifact( descArtifactNUID, null ); ! // assertNull( "Waiting null result and found", res ); ! // } ! // catch (ArtifactManagerException e) ! // { ! // //assertTrue( true ); ! // } ! // } ! // ! // public void testSearchNoResult() ! // { ! // try ! // { ! // Artifact descArtifact0UID = new Artifact(); ! // descArtifact0UID.setName( "invalide" ); ! // descArtifact0UID.setType( "clothe.adult.everyday.top" ); ! // descArtifact0UID.setVersion( "1.0" ); ! // Artifact res = manager.searchArtifact( descArtifact0UID, null ); ! // assertNull( "Waiting null result and found", res ); ! // } ! // catch (ArtifactManagerException e) ! // { ! // //assertTrue( true ); ! // } ! // } private void initOtherRepo() { ! Repository repoDescriptor = new Repository(); ! otherRepo = new Repository(); ! Artifact descArtifact = new Artifact(); descArtifact.setName( "name" ); descArtifact.setType( "clothe.adult.everyday.top" ); *************** *** 228,232 **** //Artifact match = new DefaultArtifact( descArtifact ); //otherRepo.addArtifact( match ); ! ArtifactDescriptor descArtifact2 = new ArtifactDescriptor(); descArtifact2.setName( "name2" ); descArtifact2.setType( "clothe.adult" ); --- 222,226 ---- //Artifact match = new DefaultArtifact( descArtifact ); //otherRepo.addArtifact( match ); ! Artifact descArtifact2 = new Artifact(); descArtifact2.setName( "name2" ); descArtifact2.setType( "clothe.adult" ); *************** *** 235,239 **** //Artifact notMatch = new DefaultArtifact( descArtifact2 ); //otherRepo.addArtifact( notMatch ); ! otherRepo = new DefaultArtifactRepository(repoDescriptor); System.out.println( "Init otherRepo. NB artifacts : " + otherRepo.getArtifacts().size() ); } --- 229,233 ---- //Artifact notMatch = new DefaultArtifact( descArtifact2 ); //otherRepo.addArtifact( notMatch ); ! otherRepo = repoDescriptor; System.out.println( "Init otherRepo. NB artifacts : " + otherRepo.getArtifacts().size() ); } *************** *** 241,253 **** private void initCriteria() { ! ArtifactDescriptor descArtifact = new ArtifactDescriptor(); ! descArtifact.setType( "clothe.top.adult" ); ! criteria = new DefaultArtifact( descArtifact ); ! ArtifactDescriptor descArtifact1UID = new ArtifactDescriptor(); ! descArtifact1UID.setName( "name" ); ! descArtifact1UID.setType( "clothe.adult.everyday.top" ); ! descArtifact1UID.setVersion( "1.0" ); ! criteria1UID = new DefaultArtifact( descArtifact1UID ); } } --- 235,245 ---- private void initCriteria() { ! criteria = new Artifact(); ! criteria.setType( "clothe.top.adult" ); ! criteria1UID = new Artifact(); ! criteria1UID.setName( "name" ); ! criteria1UID.setType( "clothe.adult.everyday.top" ); ! criteria1UID.setVersion( "1.0" ); } } |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:05
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/layout Modified Files: ArtifactRepositoryLayout.java DefaultArtifactRepositoryLayout.java Log Message: model general usage Index: ArtifactRepositoryLayout.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/layout/ArtifactRepositoryLayout.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ArtifactRepositoryLayout.java 18 May 2005 17:06:01 -0000 1.2 --- ArtifactRepositoryLayout.java 27 May 2005 16:32:24 -0000 1.3 *************** *** 22,27 **** import java.util.List; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.repository.layout.scanner.RepositoryScanner; /** --- 22,27 ---- import java.util.List; import net.sf.ts2.pm.artifact.repository.layout.scanner.RepositoryScanner; + import net.sf.ts2.pm.model.Artifact; /** Index: DefaultArtifactRepositoryLayout.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/repository/layout/DefaultArtifactRepositoryLayout.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DefaultArtifactRepositoryLayout.java 18 May 2005 17:06:02 -0000 1.2 --- DefaultArtifactRepositoryLayout.java 27 May 2005 16:32:24 -0000 1.3 *************** *** 24,29 **** import org.apache.commons.lang.StringUtils; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.repository.layout.scanner.RepositoryScanner; /** --- 24,29 ---- import org.apache.commons.lang.StringUtils; import net.sf.ts2.pm.artifact.repository.layout.scanner.RepositoryScanner; + import net.sf.ts2.pm.model.Artifact; /** *************** *** 48,52 **** * @throws ArtifactPathFormatException */ ! public String pathOf(Artifact artifact) throws ArtifactPathFormatException { String type = "";//artifact.getType(); --- 48,52 ---- * @throws ArtifactPathFormatException */ ! public String pathOf( Artifact artifact ) throws ArtifactPathFormatException { String type = "";//artifact.getType(); |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:05
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact Modified Files: ArtifactTest.java Log Message: model general usage Index: ArtifactTest.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/ArtifactTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArtifactTest.java 4 May 2005 17:04:58 -0000 1.1 --- ArtifactTest.java 27 May 2005 16:32:25 -0000 1.2 *************** *** 7,11 **** package net.sf.ts2.pm.artifact; - import net.sf.ts2.pm.model.ArtifactDescriptor; import junit.framework.TestCase; --- 7,10 ---- *************** *** 16,23 **** { /** this criteria can be use to retrieve 1 artifact (complete UID) */ ! private Artifact criteriaSameType; ! private Artifact criteriaSameUID; ! private Artifact criteriaNotSame; ! private Artifact artifact; /** * --- 15,22 ---- { /** this criteria can be use to retrieve 1 artifact (complete UID) */ ! // private Artifact criteriaSameType; ! // private Artifact criteriaSameUID; ! // private Artifact criteriaNotSame; ! // private Artifact artifact; /** * *************** *** 26,35 **** { super(name); ! ! ArtifactDescriptor descArtifact = new ArtifactDescriptor(); ! descArtifact.setName( "name" ); ! descArtifact.setType( "clothe.adult.everyday.top" ); ! descArtifact.setVersion( "1.0" ); ! artifact = new DefaultArtifact( descArtifact ); } --- 25,34 ---- { super(name); ! // ! // ArtifactDescriptor descArtifact = new ArtifactDescriptor(); ! // descArtifact.setName( "name" ); ! // descArtifact.setType( "clothe.adult.everyday.top" ); ! // descArtifact.setVersion( "1.0" ); ! // artifact = new DefaultArtifact( descArtifact ); } *************** *** 53,101 **** public void testSameType() { ! assertTrue( artifact.isOfType("adult.top") ); } public void testCriteriaSameType() { ! ArtifactDescriptor descCriteriaSameType = new ArtifactDescriptor(); ! descCriteriaSameType.setType( "adult.top" ); ! criteriaSameType = new DefaultArtifact( descCriteriaSameType ); ! ! assertTrue( artifact.isMatchCriteria( criteriaSameType ) ); } public void testCriteriaSameUID() { ! ArtifactDescriptor descCriteriaSameUID = new ArtifactDescriptor(); ! descCriteriaSameUID.setName( "name" ); ! descCriteriaSameUID.setType( "clothe.adult.everyday.top" ); ! descCriteriaSameUID.setVersion( "1.0" ); ! criteriaSameUID = new DefaultArtifact( descCriteriaSameUID ); ! ! assertTrue( artifact.isMatchCriteria( criteriaSameUID ) ); } public void testCriteriaNotSameType() { ! ArtifactDescriptor descCriteriaNotSame = new ArtifactDescriptor(); ! descCriteriaNotSame.setType( "top.teen" ); ! criteriaNotSame = new DefaultArtifact( descCriteriaNotSame ); ! ! assertTrue( !artifact.isMatchCriteria( criteriaNotSame ) ); } public void testEqualsSameObject() { ! assertTrue( artifact.equals( artifact ) ); } public void testEqualsSameUID() { ! ArtifactDescriptor descCriteriaSameUID = new ArtifactDescriptor(); ! descCriteriaSameUID.setName( "name" ); ! descCriteriaSameUID.setType( "clothe.adult.everyday.top" ); ! descCriteriaSameUID.setVersion( "1.0" ); ! criteriaSameUID = new DefaultArtifact( descCriteriaSameUID ); ! ! assertTrue( artifact.equals( criteriaSameUID ) ); } } --- 52,100 ---- public void testSameType() { ! //assertTrue( artifact.isOfType("adult.top") ); } public void testCriteriaSameType() { ! // ArtifactDescriptor descCriteriaSameType = new ArtifactDescriptor(); ! // descCriteriaSameType.setType( "adult.top" ); ! // criteriaSameType = new DefaultArtifact( descCriteriaSameType ); ! // ! // assertTrue( artifact.isMatchCriteria( criteriaSameType ) ); } public void testCriteriaSameUID() { ! // ArtifactDescriptor descCriteriaSameUID = new ArtifactDescriptor(); ! // descCriteriaSameUID.setName( "name" ); ! // descCriteriaSameUID.setType( "clothe.adult.everyday.top" ); ! // descCriteriaSameUID.setVersion( "1.0" ); ! // criteriaSameUID = new DefaultArtifact( descCriteriaSameUID ); ! // ! // assertTrue( artifact.isMatchCriteria( criteriaSameUID ) ); } public void testCriteriaNotSameType() { ! // ArtifactDescriptor descCriteriaNotSame = new ArtifactDescriptor(); ! // descCriteriaNotSame.setType( "top.teen" ); ! // criteriaNotSame = new DefaultArtifact( descCriteriaNotSame ); ! // ! // assertTrue( !artifact.isMatchCriteria( criteriaNotSame ) ); } public void testEqualsSameObject() { ! //assertTrue( artifact.equals( artifact ) ); } public void testEqualsSameUID() { ! // ArtifactDescriptor descCriteriaSameUID = new ArtifactDescriptor(); ! // descCriteriaSameUID.setName( "name" ); ! // descCriteriaSameUID.setType( "clothe.adult.everyday.top" ); ! // descCriteriaSameUID.setVersion( "1.0" ); ! // criteriaSameUID = new DefaultArtifact( descCriteriaSameUID ); ! // ! // assertTrue( artifact.equals( criteriaSameUID ) ); } } |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:04
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/reader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/reader Modified Files: ArtifactReader.java Log Message: model general usage Index: ArtifactReader.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/reader/ArtifactReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArtifactReader.java 12 May 2005 18:59:18 -0000 1.1 --- ArtifactReader.java 27 May 2005 16:32:24 -0000 1.2 *************** *** 9,13 **** import java.io.File; ! import net.sf.ts2.pm.artifact.Artifact; /** --- 9,13 ---- import java.io.File; ! import net.sf.ts2.pm.model.Artifact; /** |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:03
|
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 { |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:33:02
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/deployer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/deployer Modified Files: ArtifactDeployer.java DefaultArtifactDeployer.java Log Message: model general usage Index: ArtifactDeployer.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/deployer/ArtifactDeployer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArtifactDeployer.java 28 Apr 2005 17:55:59 -0000 1.1 --- ArtifactDeployer.java 27 May 2005 16:32:22 -0000 1.2 *************** *** 22,28 **** import java.io.File; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; /** --- 22,28 ---- import java.io.File; import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; /** *************** *** 31,40 **** public interface ArtifactDeployer { ! void deploy( String basedir, String finalName, Artifact artifact, ArtifactRepository deploymentRepository, ! ArtifactRepository localRepository ) throws ArtifactDeploymentException; ! void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository, ! ArtifactRepository localRepository ) throws ArtifactDeploymentException; --- 31,40 ---- public interface ArtifactDeployer { ! void deploy( String basedir, String finalName, Artifact artifact, Repository deploymentRepository, ! Repository localRepository ) throws ArtifactDeploymentException; ! void deploy( File source, Artifact artifact, Repository deploymentRepository, ! Repository localRepository ) throws ArtifactDeploymentException; Index: DefaultArtifactDeployer.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/main/java/net/sf/ts2/pm/artifact/deployer/DefaultArtifactDeployer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultArtifactDeployer.java 28 Apr 2005 17:55:59 -0000 1.1 --- DefaultArtifactDeployer.java 27 May 2005 16:32:22 -0000 1.2 *************** *** 22,28 **** import java.io.File; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager; ! import net.sf.ts2.pm.artifact.repository.ArtifactRepository; /** --- 22,28 ---- import java.io.File; import net.sf.ts2.pm.artifact.history.manager.ArtifactHistoryManager; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; /** *************** *** 58,63 **** * @throws ArtifactDeploymentException */ ! public void deploy(File source, Artifact artifact, ArtifactRepository deploymentRepository, ! ArtifactRepository localRepository) throws ArtifactDeploymentException { // TODO Auto-generated method stub --- 58,63 ---- * @throws ArtifactDeploymentException */ ! public void deploy(File source, Artifact artifact, Repository deploymentRepository, ! Repository localRepository) throws ArtifactDeploymentException { // TODO Auto-generated method stub *************** *** 73,78 **** * @throws ArtifactDeploymentException */ ! public void deploy(String basedir, String finalName, Artifact artifact, ArtifactRepository deploymentRepository, ! ArtifactRepository localRepository) throws ArtifactDeploymentException { // TODO Auto-generated method stub --- 73,78 ---- * @throws ArtifactDeploymentException */ ! public void deploy(String basedir, String finalName, Artifact artifact, Repository deploymentRepository, ! Repository localRepository) throws ArtifactDeploymentException { // TODO Auto-generated method stub |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:32:37
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-model Modified Files: ts2-pm.mdo Log Message: model general usage Index: ts2-pm.mdo =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-model/ts2-pm.mdo,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ts2-pm.mdo 29 Apr 2005 23:49:36 -0000 1.2 --- ts2-pm.mdo 27 May 2005 16:32:28 -0000 1.3 *************** *** 2,6 **** <!-- /* ! * Copyright 2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); --- 2,6 ---- <!-- /* ! * Copyright 2005 TS2 Package Manager, Sourceforge project * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 29,33 **** <classes> <class rootElement="true" xml.tagName="ts2Repository"> ! <name>RepositoryDescriptor</name> <description><![CDATA[ The <code><repository></code> element specifies various attributes --- 29,33 ---- <classes> <class rootElement="true" xml.tagName="ts2Repository"> ! <name>Repository</name> <description><![CDATA[ The <code><repository></code> element specifies various attributes *************** *** 47,51 **** </field> <field> ! <name>name</name> <version>1.0.0</version> <required>true</required> --- 47,51 ---- </field> <field> ! <name>id</name> <version>1.0.0</version> <required>true</required> *************** *** 63,162 **** <name>artifacts</name> <version>1.0.0</version> ! <description>Uncategorize / new artifact</description> ! <association> ! <type>ArtifactDescriptor</type> ! <multiplicity>*</multiplicity> ! </association> ! </field> ! </fields> ! </class> ! <class> ! <name>AbstractArtifactDescriptor</name> ! <version>1.0.0</version> ! <description><![CDATA[ ! Contains the descriptor of an artifact. ! ]]></description> ! <fields> ! <field> ! <name>name</name> ! <version>1.0.0</version> ! <required>true</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>shortDescription</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>description</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>version</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>installed</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>boolean</type> ! </field> ! <field> ! <name>archive</name> ! <version>1.0.0</version> ! <required>true</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>type</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>url</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> ! <type>String</type> ! </field> ! <field> ! <name>authors</name> ! <version>1.0.0</version> ! <required>false</required> ! <description><![CDATA[ ! TODO Description. ! ]]></description> <association> ! <type>Author</type> <multiplicity>*</multiplicity> </association> --- 63,69 ---- <name>artifacts</name> <version>1.0.0</version> ! <description>List of artifacts that register in the package manager</description> <association> ! <type>Artifact</type> <multiplicity>*</multiplicity> </association> *************** *** 164,169 **** </fields> </class> <class> ! <name>ArtifactDescriptor</name> <version>1.0.0</version> <description><![CDATA[ --- 71,77 ---- </fields> </class> + <class> ! <name>Artifact</name> <version>1.0.0</version> <description><![CDATA[ *************** *** 304,307 **** --- 212,235 ---- </field> </fields> + <codeSegments> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + public String toString() + { + return getType() + ":" + getName() + "-" + getVersion(); + } + ]]></code> + </codeSegment> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + public String getId() + { + return getType() + ":" + getName() + "-" + getVersion(); + } + ]]></code> + </codeSegment> + </codeSegments> </class> <class> *************** *** 358,377 **** </field> </fields> </class> <class> <name>Dependency</name> - <superClass>AbstractArtifactDescriptor</superClass> <version>1.0.0</version> <description><![CDATA[ TODO Description. ]]></description> </class> <class> <name>Conflict</name> - <superClass>Dependency</superClass> <version>1.0.0</version> <description><![CDATA[ TODO Description. ]]></description> </class> <class> --- 286,394 ---- </field> </fields> + <codeSegments> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + public String toString() + { + return getName(); + } + ]]></code> + </codeSegment> + </codeSegments> </class> <class> <name>Dependency</name> <version>1.0.0</version> <description><![CDATA[ TODO Description. ]]></description> + <fields> + <field> + <name>id</name> + <version>1.0.0</version> + <required>false</required> + <description><![CDATA[ + TODO Description. + ]]></description> + <type>String</type> + </field> + <field> + <name>description</name> + <version>1.0.0</version> + <required>false</required> + <description><![CDATA[ + TODO Description. + ]]></description> + <type>String</type> + </field> + <field> + <name>url</name> + <version>1.0.0</version> + <required>false</required> + <description><![CDATA[ + TODO Description. + ]]></description> + <type>String</type> + </field> + </fields> + <codeSegments> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + public String toString() + { + return getId(); + } + ]]></code> + </codeSegment> + </codeSegments> </class> <class> <name>Conflict</name> <version>1.0.0</version> <description><![CDATA[ TODO Description. ]]></description> + <fields> + <field> + <name>id</name> + <version>1.0.0</version> + <required>false</required> + <description><![CDATA[ + TODO Description. + ]]></description> + <type>String</type> + </field> + <field> + <name>reason</name> + <version>1.0.0</version> + <required>false</required> + <description><![CDATA[ + TODO Description. + ]]></description> + <type>String</type> + </field> + <field> + <name>url</name> + <version>1.0.0</version> + <required>false</required> + <description><![CDATA[ + TODO Description. + ]]></description> + <type>String</type> + </field> + </fields> + <codeSegments> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + public String toString() + { + return getId(); + } + ]]></code> + </codeSegment> + </codeSegments> </class> <class> *************** *** 401,404 **** --- 418,432 ---- </field> </fields> + <codeSegments> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + public String toString() + { + return getFile(); + } + ]]></code> + </codeSegment> + </codeSegments> </class> </classes> |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:32:37
|
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 { |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:32:36
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-core/src/main/java/net/sf/ts2/pm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-core/src/main/java/net/sf/ts2/pm Modified Files: DefaultTS2PackageManager.java TS2PackageManager.java Log Message: model general usage Index: TS2PackageManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-core/src/main/java/net/sf/ts2/pm/TS2PackageManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TS2PackageManager.java 24 May 2005 20:49:18 -0000 1.5 --- TS2PackageManager.java 27 May 2005 16:32:27 -0000 1.6 *************** *** 23,30 **** import java.util.NoSuchElementException; - import net.sf.ts2.pm.artifact.Artifact; - import net.sf.ts2.pm.artifact.repository.ArtifactRepository; import net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager; import net.sf.ts2.pm.descriptor.RepositoryDescriptorManager; import net.sf.ts2.pm.settings.Settings; --- 23,30 ---- import java.util.NoSuchElementException; import net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager; import net.sf.ts2.pm.descriptor.RepositoryDescriptorManager; + import net.sf.ts2.pm.model.Artifact; + import net.sf.ts2.pm.model.Repository; import net.sf.ts2.pm.settings.Settings; *************** *** 45,50 **** void setRepositoryDescriptorManager( RepositoryDescriptorManager repositoryDescriptorManager ); ! ArtifactRepository loadRepository( String url ); ! void saveRepository( String url, ArtifactRepository repo ); List getArtifactList(); --- 45,50 ---- void setRepositoryDescriptorManager( RepositoryDescriptorManager repositoryDescriptorManager ); ! Repository loadRepository( String url ); ! void saveRepository( String url, Repository repo ); List getArtifactList(); *************** *** 56,72 **** * partialArtifact. */ ! List getArtifacts( Artifact partialArtifact, ArtifactRepository repo ); ! void createArtifact( Artifact artifact, ArtifactRepository repo ); ! Artifact searchArtifact( Artifact partialArtifact, ArtifactRepository repo ) throws NoSuchElementException; ! void modifyArtifact( Artifact partialArtifact, ArtifactRepository repo ); ! void deleteArtifact( Artifact artifact, ArtifactRepository repo ); ! void installArtifact( Artifact artifact, ArtifactRepository repo ); ! void deployArtifactDescriptor( Artifact artifact, ArtifactRepository repo ); int executeCommand( List commands ); --- 56,72 ---- * partialArtifact. */ ! List getArtifacts( Artifact partialArtifact, Repository repo ); ! void createArtifact( Artifact artifact, Repository repo ); ! Artifact searchArtifact( Artifact partialArtifact, Repository repo ) throws NoSuchElementException; ! void modifyArtifact( Artifact partialArtifact, Repository repo ); ! void deleteArtifact( Artifact artifact, Repository repo ); ! void installArtifact( Artifact artifact, Repository repo ); ! void deployArtifact( Artifact artifact, Repository repo ); int executeCommand( List commands ); Index: DefaultTS2PackageManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-core/src/main/java/net/sf/ts2/pm/DefaultTS2PackageManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DefaultTS2PackageManager.java 24 May 2005 20:49:18 -0000 1.7 --- DefaultTS2PackageManager.java 27 May 2005 16:32:26 -0000 1.8 *************** *** 29,41 **** import org.apache.commons.lang.StringUtils; - import net.sf.ts2.pm.artifact.Artifact; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; - import net.sf.ts2.pm.artifact.repository.ArtifactRepository; import net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager; import net.sf.ts2.pm.descriptor.RepositoryDescriptorManager; import net.sf.ts2.pm.descriptor.RepositoryDescriptorManagerException; ! import net.sf.ts2.pm.model.ArtifactDescriptor; ! import net.sf.ts2.pm.model.RepositoryDescriptor; import net.sf.ts2.pm.settings.Settings; import net.sf.ts2.pm.settings.io.xpp3.SettingsXpp3Reader; --- 29,39 ---- import org.apache.commons.lang.StringUtils; import net.sf.ts2.pm.artifact.installer.ArtifactInstallationException; import net.sf.ts2.pm.artifact.manager.ArtifactManagerException; import net.sf.ts2.pm.artifact.repository.manager.ArtifactRepositoryManager; import net.sf.ts2.pm.descriptor.RepositoryDescriptorManager; import net.sf.ts2.pm.descriptor.RepositoryDescriptorManagerException; ! import net.sf.ts2.pm.model.Artifact; ! import net.sf.ts2.pm.model.Repository; import net.sf.ts2.pm.settings.Settings; import net.sf.ts2.pm.settings.io.xpp3.SettingsXpp3Reader; *************** *** 58,67 **** try { ! Reader reader = new FileReader( System.getProperty( "ts2pm.home" ) + "/TS2Setting.xml" ); ! settings = settingsReader.read( reader ); // use default ts2RepoHome if not override by the settings if ( StringUtils.isBlank( settings.getDownloadHome() ) ) { String ts2RepoPath = System.getProperty( "user.home" ) + "/TS2Repository"; File ts2RepoHome = new File( ts2RepoPath ); if ( ! ts2RepoHome.exists() ) --- 56,74 ---- try { ! String ts2pmHomeDir = System.getProperty( "ts2pm.home" ); ! if ( StringUtils.isNotBlank( ts2pmHomeDir )) ! { ! Reader reader = new FileReader( System.getProperty( "ts2pm.home" ) + "/TS2Setting.xml" ); ! settings = settingsReader.read( reader ); ! } ! else ! { ! settings = new Settings(); ! } // use default ts2RepoHome if not override by the settings if ( StringUtils.isBlank( settings.getDownloadHome() ) ) { String ts2RepoPath = System.getProperty( "user.home" ) + "/TS2Repository"; + settings.setDownloadHome( ts2RepoPath ); File ts2RepoHome = new File( ts2RepoPath ); if ( ! ts2RepoHome.exists() ) *************** *** 72,76 **** } } - settings.setDownloadHome( System.getProperty( "user.home" ) + "/TS2Repository" ); } } --- 79,82 ---- *************** *** 109,118 **** * @return */ ! public ArtifactRepository loadRepository( String url ) { try { ! RepositoryDescriptor descriptor = repositoryDescriptorManager.load( new File( url ) ); ! return artifactRepositoryManager.getArtifactRepository( descriptor ); } catch (Exception e) --- 115,124 ---- * @return */ ! public Repository loadRepository( String url ) { try { ! Repository descriptor = repositoryDescriptorManager.load( new File( url ) ); ! return descriptor; //artifactRepositoryManager.getArtifactRepositoryFactory( descriptor ); } catch (Exception e) *************** *** 127,136 **** * @param repo */ ! public void saveRepository(String url, ArtifactRepository repo) { File destination = new File( url ); try { ! repositoryDescriptorManager.save( destination, (RepositoryDescriptor) repo ); } catch (Exception e) --- 133,142 ---- * @param repo */ ! public void saveRepository(String url, Repository repo) { File destination = new File( url ); try { ! repositoryDescriptorManager.save( destination, repo ); } catch (Exception e) *************** *** 145,154 **** * @throws RepositoryDescriptorManagerException */ ! public void createArtifact( Artifact artifact, ArtifactRepository repo ) { try { ! artifactRepositoryManager.createArtifact( artifact, repo ); ! repositoryDescriptorManager.createArtifactDescriptor( (ArtifactDescriptor) artifact, (RepositoryDescriptor) repo ); } catch ( Exception e ) --- 151,160 ---- * @throws RepositoryDescriptorManagerException */ ! public void createArtifact( Artifact artifact, Repository repo ) { try { ! //artifactRepositoryManager.createArtifact( artifact, repo ); ! repositoryDescriptorManager.createArtifact( artifact, repo ); } catch ( Exception e ) *************** *** 163,172 **** * @throws RepositoryDescriptorManagerException */ ! public void deleteArtifact( Artifact artifact, ArtifactRepository repo ) { try { ! artifactRepositoryManager.deleteArtifact( artifact, repo ); ! repositoryDescriptorManager.deleteArtifactDescriptor( (ArtifactDescriptor) artifact, (RepositoryDescriptor) repo ); } catch ( Exception e ) --- 169,178 ---- * @throws RepositoryDescriptorManagerException */ ! public void deleteArtifact( Artifact artifact, Repository repo ) { try { ! //artifactRepositoryManager.deleteArtifact( artifact, repo ); ! repositoryDescriptorManager.deleteArtifact( artifact, repo ); } catch ( Exception e ) *************** *** 181,191 **** * @throws RepositoryDescriptorManagerException */ ! public void deployArtifactDescriptor( Artifact artifact, ArtifactRepository repo ) { try { ! artifactRepositoryManager.deployArtifact( artifact, repo ); // TODO no need to do this ! repositoryDescriptorManager.deployArtifactDescriptor( (ArtifactDescriptor) artifact, (RepositoryDescriptor) repo ); } catch ( Exception e ) --- 187,197 ---- * @throws RepositoryDescriptorManagerException */ ! public void deployArtifact( Artifact artifact, Repository repo ) { try { ! //artifactRepositoryManager.deployArtifact( artifact, repo ); // TODO no need to do this ! repositoryDescriptorManager.deployArtifact( artifact, repo ); } catch ( Exception e ) *************** *** 201,205 **** * @throws RepositoryDescriptorManagerException */ ! public List getArtifacts( Artifact partialArtifact, ArtifactRepository repo ) { try --- 207,211 ---- * @throws RepositoryDescriptorManagerException */ ! public List getArtifacts( Artifact partialArtifact, Repository repo ) { try *************** *** 221,225 **** * @throws RepositoryDescriptorManagerException */ ! public void installArtifact( Artifact artifact, ArtifactRepository repo ) { try --- 227,231 ---- * @throws RepositoryDescriptorManagerException */ ! public void installArtifact( Artifact artifact, Repository repo ) { try *************** *** 243,252 **** * @throws RepositoryDescriptorManagerException */ ! public void modifyArtifact( Artifact partialArtifact, ArtifactRepository repo ) { try { ! artifactRepositoryManager.modifyArtifact( partialArtifact, repo ); ! repositoryDescriptorManager.modifyArtifactDescriptor( (ArtifactDescriptor) partialArtifact, (RepositoryDescriptor) repo ); } catch ( Exception e ) --- 249,258 ---- * @throws RepositoryDescriptorManagerException */ ! public void modifyArtifact( Artifact partialArtifact, Repository repo ) { try { ! //artifactRepositoryManager.modifyArtifact( partialArtifact, repo ); ! repositoryDescriptorManager.modifyArtifact( partialArtifact, repo ); } catch ( Exception e ) *************** *** 262,271 **** * @throws RepositoryDescriptorManagerException */ ! public Artifact searchArtifact( Artifact partialArtifact, ArtifactRepository repo ) { Artifact result = null; try { ! // result = repositoryDescriptorManager.searchArtifactDescriptor( (ArtifactDescriptor) partialArtifact, (RepositoryDescriptor) repo ); // TODO convertion required --- 268,277 ---- * @throws RepositoryDescriptorManagerException */ ! public Artifact searchArtifact( Artifact partialArtifact, Repository repo ) { Artifact result = null; try { ! // result = repositoryDescriptorManager.searchArtifactDescriptor( partialArtifact, repo ); // TODO convertion required *************** *** 291,295 **** public int executeCommand( List commands ) { ! // TODO Auto-generated method stub if ( commands != null ) { --- 297,302 ---- public int executeCommand( List commands ) { ! String repoDir = settings.getLocalRepository(); ! Repository repo = loadRepository( repoDir ); if ( commands != null ) { *************** *** 297,302 **** { String command = (String) it.next(); ! System.out.println( "Excecute command : " + command + "\n" ); } return 0; } --- 304,310 ---- { String command = (String) it.next(); ! executeCommand( command, repo ); } + saveRepository( repoDir, repo ); return 0; } *************** *** 306,309 **** --- 314,330 ---- } } + + private int executeCommand( String command, Repository repo ) + { + System.out.println( "Excecute command : " + command + "\n" ); + if ( StringUtils.equals( "printRepo", command )) + { + System.out.println( "TS2Repository content :\n" + repo.toString() + "\n" ); + } + String artifactFile = System.getProperty( "ts2pm.artifact.file" ); + + return 0; + } + /** * @return Returns the artifactRepositoryManager. |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:32:35
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-core/src/main/java/net/sf/ts2/pm/cli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-core/src/main/java/net/sf/ts2/pm/cli Modified Files: CLIManager.java Log Message: model general usage Index: CLIManager.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-core/src/main/java/net/sf/ts2/pm/cli/CLIManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CLIManager.java 24 May 2005 20:49:19 -0000 1.4 --- CLIManager.java 27 May 2005 16:32:27 -0000 1.5 *************** *** 46,49 **** --- 46,51 ---- public static final char VERSION = 'v'; + + public static final char SETTINGS = 's'; private Options options = null; |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:32:35
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-core Modified Files: pom.xml Log Message: model general usage Index: pom.xml =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-core/pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pom.xml 17 May 2005 20:06:47 -0000 1.7 --- pom.xml 27 May 2005 16:32:26 -0000 1.8 *************** *** 99,101 **** --- 99,112 ---- </plugins> </reports> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/assemble/bin.xml</descriptor> + <finalName>maven-2.0-SNAPSHOT</finalName> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:32:34
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/transform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29222/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/transform Modified Files: ArtifactTransformationTest.java Log Message: model general usage Index: ArtifactTransformationTest.java =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-artifact/src/test/java/net/sf/ts2/pm/artifact/transform/ArtifactTransformationTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ArtifactTransformationTest.java 4 May 2005 17:05:23 -0000 1.3 --- ArtifactTransformationTest.java 27 May 2005 16:32:26 -0000 1.4 *************** *** 23,28 **** import java.net.URL; import junit.framework.TestCase; - import net.sf.ts2.pm.artifact.Artifact; /** --- 23,29 ---- import java.net.URL; + import net.sf.ts2.pm.model.Artifact; + import junit.framework.TestCase; /** *************** *** 92,96 **** Artifact art = transformer.archive2Artifact( archive ); assertNotNull(art); ! assertEquals( "lev1-1.lev2-1.lev3:lev3withdescriptor-1.0", art.getUId() ); } catch (ArtifactTransformationException e) --- 93,97 ---- Artifact art = transformer.archive2Artifact( archive ); assertNotNull(art); ! assertEquals( "lev1-1.lev2-1.lev3:lev3withdescriptor-1.0", art.getId() ); } catch (ArtifactTransformationException e) |
|
From: Nicolas C. <nch...@us...> - 2005-05-27 16:31:29
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29054 Modified Files: settings.mdo Log Message: add a toString method Index: settings.mdo =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-settings/settings.mdo,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** settings.mdo 12 May 2005 18:26:01 -0000 1.2 --- settings.mdo 27 May 2005 16:31:21 -0000 1.3 *************** *** 75,78 **** --- 75,93 ---- </field> </fields> + <codeSegments> + <codeSegment> + <version>1.0.0</version> + <code><![CDATA[ + /** + * descriptif de la classe pour des facilité de debug + * @return descriptif de la classe pour des facilité de debug + */ + public String toString() + { + return "TODO setings.toString method"; + } + ]]></code> + </codeSegment> + </codeSegments> </class> <class> |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:39:22
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-invoke/src/test/java/net/sf/ts2/pm/cli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27829/ts2-pm-it/ts2-pm-cli-it-invoke/src/test/java/net/sf/ts2/pm/cli Added Files: InvokeCliITTest.java Log Message: site generation reports problems --- NEW FILE: InvokeCliITTest.java --- /* * ======================================================================== * * Copyright 2005-2005 TS2-PM (Sourceforge project). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * ======================================================================== */ package net.sf.ts2.pm.cli; import junit.framework.TestCase; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.DefaultConsumer; import org.codehaus.plexus.util.cli.StreamConsumer; /** * @author Nicolas * àtodo this is a integration test */ public class InvokeCliITTest extends TestCase { private String repoHome = System.getProperty( "user.home") + "/TS2Repository"; /** * @param arg0 */ public InvokeCliITTest(String arg0) { super(arg0); } public void testCLIInvocation() { Commandline cl = new Commandline(); cl.setExecutable( "ts2-pm" ); cl.setWorkingDirectory( repoHome ); cl.createArgument().setLine( "aCommand" ); StreamConsumer consumer = new DefaultConsumer(); try { CommandLineUtils.executeCommandLine( cl, consumer, consumer ); } catch ( CommandLineException e ) { fail( "unexpected exception" ); } } } |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:39:21
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27829/ts2-pm-model Modified Files: pom.xml Log Message: site generation reports problems Index: pom.xml =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-model/pom.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pom.xml 17 May 2005 20:06:50 -0000 1.3 --- pom.xml 26 May 2005 23:39:10 -0000 1.4 *************** *** 40,51 **** <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </reports> --- 40,43 ---- |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:39:21
|
Update of /cvsroot/ts2-pm/ts2-pm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27829 Modified Files: pom.xml Log Message: site generation reports problems Index: pom.xml =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/pom.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pom.xml 17 May 2005 19:52:16 -0000 1.13 --- pom.xml 26 May 2005 23:39:09 -0000 1.14 *************** *** 115,117 **** --- 115,118 ---- <!--module>ts2-pm-versionning</module--> </modules> + <reports/> </project> \ No newline at end of file |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:39:21
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27829/ts2-pm-settings Modified Files: pom.xml Log Message: site generation reports problems Index: pom.xml =================================================================== RCS file: /cvsroot/ts2-pm/ts2-pm/ts2-pm-settings/pom.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pom.xml 17 May 2005 20:06:52 -0000 1.3 --- pom.xml 26 May 2005 23:39:10 -0000 1.4 *************** *** 40,51 **** <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> </plugins> </reports> --- 40,43 ---- |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:02:54
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20508 Added Files: pom.xml Log Message: initial commit of a "multiproject" integration test module --- NEW FILE: pom.xml --- <?xml version="1.0" encoding="UTF-8"?> <!-- /* * Copyright 2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ --> <project> <parent> <artifactId>ts2-pm</artifactId> <groupId>net.sf.ts2.pm</groupId> <version>0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ts2-pm-cli-it-simplesCommands</artifactId> <name>ts2-pm core</name> <description>ts2-pm core</description> <dependencies> <dependency> <groupId>net.sf.ts2.pm</groupId> <artifactId>ts2-pm-core</artifactId> <version>0.1-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.0</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> <type>jar</type> <scope>test</scope> </dependency> </dependencies> </project> |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:02:53
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2/pm/cli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20508/src/test/java/net/sf/ts2/pm/cli Added Files: HelpITTest.java VersionITTest.java Log Message: initial commit of a "multiproject" integration test module --- NEW FILE: VersionITTest.java --- /* * ======================================================================== * * Copyright 2005-2005 TS2-PM (Sourceforge project). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * ======================================================================== */ package net.sf.ts2.pm.cli; import junit.framework.TestCase; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.DefaultConsumer; import org.codehaus.plexus.util.cli.StreamConsumer; /** * @author Nicolas * àtodo this is a integration test */ public class VersionITTest extends TestCase { private String repoHome = System.getProperty( "user.home") + "/TS2Repository"; /** * @param arg0 */ public VersionITTest(String arg0) { super(arg0); } public void testCLIInvocation() { Commandline cl = new Commandline(); cl.setExecutable( "ts2-pm" ); cl.setWorkingDirectory( repoHome ); cl.createArgument().setLine( "-v" ); StreamConsumer consumer = new DefaultConsumer(); try { CommandLineUtils.executeCommandLine( cl, consumer, consumer ); } catch ( CommandLineException e ) { fail( "unexpected exception" ); } } } --- NEW FILE: HelpITTest.java --- /* * ======================================================================== * * Copyright 2005-2005 TS2-PM (Sourceforge project). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * ======================================================================== */ package net.sf.ts2.pm.cli; import junit.framework.TestCase; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.DefaultConsumer; import org.codehaus.plexus.util.cli.StreamConsumer; /** * @author Nicolas * àtodo this is a integration test */ public class HelpITTest extends TestCase { private String repoHome = System.getProperty( "user.home") + "/TS2Repository"; /** * @param arg0 */ public HelpITTest(String arg0) { super(arg0); } public void testCLIInvocation() { Commandline cl = new Commandline(); cl.setExecutable( "ts2-pm" ); cl.setWorkingDirectory( repoHome ); cl.createArgument().setLine( "-h" ); StreamConsumer consumer = new DefaultConsumer(); try { CommandLineUtils.executeCommandLine( cl, consumer, consumer ); } catch ( CommandLineException e ) { fail( "unexpected exception" ); } } } |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:01:51
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2/pm/cli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20238/cli Log Message: Directory /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2/pm/cli added to the repository |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:01:40
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2/pm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20201/pm Log Message: Directory /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2/pm added to the repository |
|
From: Nicolas C. <nch...@us...> - 2005-05-26 23:01:32
|
Update of /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20136/ts2 Log Message: Directory /cvsroot/ts2-pm/ts2-pm/ts2-pm-it/ts2-pm-cli-it-simplesCommands/src/test/java/net/sf/ts2 added to the repository |
