Author: oching
Date: Fri Jul 25 04:57:38 2008
New Revision: 679767
URL: http://svn.apache.org/viewvc?rev=679767&view=rev
Log:
[MRM-817]
submitted by Gwen Harold Autencio
-in the artifact information tab, display the repo id where the artifact came
from
Modified:
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsing.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Modified:
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java?rev=679767&r1=679766&r2=679767&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
(original)
+++
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
Fri Jul 25 04:57:38 2008
@@ -130,7 +130,17 @@
return model;
}
+
+ public String getRepositoryId( String principle, List<String>
observableRepositoryIds, String groupId,
+ String artifactId, String version )
+ throws ObjectNotFoundException, ArchivaDatabaseException
+ {
+ ArchivaArtifact pomArchivaArtifact =
+ getArtifact( principle, observableRepositoryIds, groupId,
artifactId, version );
+ return pomArchivaArtifact.getModel().getRepositoryId();
+ }
+
private ArchivaArtifact getArtifact( String principle, List<String>
observableRepositoryIds, String groupId,
String artifactId, String version )
throws ObjectNotFoundException, ArchivaDatabaseException
@@ -295,5 +305,5 @@
throw e;
}
}
-
+
}
Modified:
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsing.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsing.java?rev=679767&r1=679766&r2=679767&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsing.java
(original)
+++
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsing.java
Fri Jul 25 04:57:38 2008
@@ -85,4 +85,9 @@
public List<ArchivaProjectModel> getUsedBy( String principle, List<String>
observableRepositoryIds, String groupId,
String artifactId, String
version )
throws ArchivaDatabaseException;
+
+
+ public String getRepositoryId( String principle, List<String>
observableRepositoryIds, String groupId,
+ String artifactId, String version )
+ throws ObjectNotFoundException, ArchivaDatabaseException;
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=679767&r1=679766&r2=679767&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
Fri Jul 25 04:57:38 2008
@@ -57,6 +57,8 @@
private String groupId;
private String artifactId;
+
+ private String repositoryId;
public String browse()
{
@@ -168,4 +170,14 @@
{
return results;
}
+
+ public String getRepositoryId(){
+
+ return repositoryId;
+ }
+
+ public void setRepositoryId(String repositoryId){
+
+ this.repositoryId = repositoryId;
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java?rev=679767&r1=679766&r2=679767&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
Fri Jul 25 04:57:38 2008
@@ -38,9 +38,10 @@
import com.opensymphony.xwork.Validateable;
/**
- * Browse the repository.
- *
+ * Browse the repository.
+ *
* TODO change name to ShowVersionedAction to conform to terminology.
+ *
* @plexus.component role="com.opensymphony.xwork.Action"
role-hint="showArtifactAction"
*/
public class ShowArtifactAction
@@ -53,12 +54,12 @@
* @plexus.requirement role-hint="default"
*/
private RepositoryBrowsing repoBrowsing;
-
+
/**
* @plexus.requirement
*/
private UserRepositories userRepositories;
-
+
/* .\ Input Parameters \.________________________________________ */
private String groupId;
@@ -67,6 +68,8 @@
private String version;
+ private String repositoryId;
+
/* .\ Exposed Output Objects \.__________________________________ */
/**
@@ -89,16 +92,17 @@
private List dependencies;
/**
- * Show the versioned project information tab.
- *
- * TODO: Change name to 'project'
+ * Show the versioned project information tab. TODO: Change name to
'project'
*/
public String artifact()
throws ObjectNotFoundException, ArchivaDatabaseException
{
try
{
- this.model = repoBrowsing.selectVersion( getPrincipal(),
getObservableRepos(), groupId, artifactId, version );
+ this.model =
+ repoBrowsing.selectVersion( getPrincipal(),
getObservableRepos(), groupId, artifactId, version );
+ this.repositoryId =
+ repoBrowsing.getRepositoryId( getPrincipal(),
getObservableRepos(), groupId, artifactId, version );
}
catch ( ObjectNotFoundException oe )
{
@@ -142,7 +146,8 @@
throws ObjectNotFoundException, ArchivaDatabaseException
{
System.out.println( "#### In reports." );
- // TODO: hook up reports on project - this.reports =
artifactsDatabase.findArtifactResults( groupId, artifactId, version );
+ // TODO: hook up reports on project - this.reports =
artifactsDatabase.findArtifactResults( groupId, artifactId,
+ // version );
System.out.println( "#### Found " + reports.size() + " reports." );
return SUCCESS;
@@ -171,12 +176,12 @@
return SUCCESS;
}
-
+
private String getPrincipal()
{
return ArchivaXworkUser.getActivePrincipal(
ActionContext.getContext().getSession() );
}
-
+
private List<String> getObservableRepos()
{
try
@@ -271,4 +276,15 @@
{
return dependees;
}
+
+ public String getRepositoryId()
+ {
+ return repositoryId;
+ }
+
+ public void setRepositoryId( String repositoryId )
+ {
+ this.repositoryId = repositoryId;
+ }
+
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf?rev=679767&r1=679766&r2=679767&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Fri Jul 25 04:57:38 2008
@@ -45,6 +45,10 @@
<table class="infoTable">
<tr>
+ <th>Repository</th>
+ <td>${repositoryId}</td>
+ </tr>
+ <tr>
<th>Group ID</th>
<td>${model.groupId}</td>
</tr>
