You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/17 16:40:41 UTC
svn commit: r1245618 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp-js/sr...
Author: olamy
Date: Fri Feb 17 15:40:41 2012
New Revision: 1245618
URL: http://svn.apache.org/viewvc?rev=1245618&view=rev
Log:
rename class. it's always complicated to find the good name but the previous was very bad :-).
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java (contents, props changed)
- copied, changed from r1245592, archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java?rev=1245618&r1=1245617&r2=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java Fri Feb 17 15:40:41 2012
@@ -29,25 +29,25 @@ import java.util.List;
@XmlRootElement( name = "browseResult" )
public class BrowseResult
{
- private List<BrowseIdEntry> browseIdEntries;
+ private List<BrowseResultEntry> browseResultEntries;
public BrowseResult()
{
// no op
}
- public BrowseResult( List<BrowseIdEntry> browseIdEntries )
+ public BrowseResult( List<BrowseResultEntry> browseResultEntries )
{
- this.browseIdEntries = browseIdEntries;
+ this.browseResultEntries = browseResultEntries;
}
- public List<BrowseIdEntry> getBrowseIdEntries()
+ public List<BrowseResultEntry> getBrowseResultEntries()
{
- return browseIdEntries == null ? Collections.<BrowseIdEntry>emptyList() : browseIdEntries;
+ return browseResultEntries == null ? Collections.<BrowseResultEntry>emptyList() : browseResultEntries;
}
- public void setBrowseIdEntries( List<BrowseIdEntry> browseIdEntries )
+ public void setBrowseResultEntries( List<BrowseResultEntry> browseResultEntries )
{
- this.browseIdEntries = browseIdEntries;
+ this.browseResultEntries = browseResultEntries;
}
}
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java (from r1245592, archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java&r1=1245592&r2=1245618&rev=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java Fri Feb 17 15:40:41 2012
@@ -24,21 +24,21 @@ import javax.xml.bind.annotation.XmlRoot
* @author Olivier Lamy
* @since 1.4-M3
*/
-@XmlRootElement( name = "browseIdEntry" )
-public class BrowseIdEntry
- implements Comparable<BrowseIdEntry>
+@XmlRootElement( name = "browseResultEntry" )
+public class BrowseResultEntry
+ implements Comparable<BrowseResultEntry>
{
private String name;
private boolean project;
- public BrowseIdEntry()
+ public BrowseResultEntry()
{
// no op
}
- public BrowseIdEntry( String name, boolean project )
+ public BrowseResultEntry( String name, boolean project )
{
this.name = name;
this.project = project;
@@ -64,8 +64,8 @@ public class BrowseIdEntry
this.project = project;
}
- public int compareTo( BrowseIdEntry browseGroupIdEntry )
+ public int compareTo( BrowseResultEntry browseGroupResultEntry )
{
- return this.name.compareTo( browseGroupIdEntry.name );
+ return this.name.compareTo( browseGroupResultEntry.name );
}
}
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1245618&r1=1245617&r2=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Fri Feb 17 15:40:41 2012
@@ -21,7 +21,7 @@ package org.apache.archiva.rest.services
import org.apache.archiva.metadata.repository.MetadataResolutionException;
import org.apache.archiva.metadata.repository.MetadataResolver;
import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.rest.api.model.BrowseIdEntry;
+import org.apache.archiva.rest.api.model.BrowseResultEntry;
import org.apache.archiva.rest.api.model.BrowseResult;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.BrowseService;
@@ -87,14 +87,14 @@ public class DefaultBrowseService
repositorySession.close();
}
- List<BrowseIdEntry> browseGroupIdEntries = new ArrayList<BrowseIdEntry>( namespaces.size() );
+ List<BrowseResultEntry> browseGroupResultEntries = new ArrayList<BrowseResultEntry>( namespaces.size() );
for ( String namespace : namespaces )
{
- browseGroupIdEntries.add( new BrowseIdEntry( namespace, false ) );
+ browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ) );
}
- Collections.sort( browseGroupIdEntries );
- return new BrowseResult( browseGroupIdEntries );
+ Collections.sort( browseGroupResultEntries );
+ return new BrowseResult( browseGroupResultEntries );
}
public BrowseResult browseGroupId( String groupId )
@@ -144,17 +144,17 @@ public class DefaultBrowseService
{
repositorySession.close();
}
- List<BrowseIdEntry> browseGroupIdEntries = new ArrayList<BrowseIdEntry>( namespaces.size() + projects.size() );
+ List<BrowseResultEntry> browseGroupResultEntries = new ArrayList<BrowseResultEntry>( namespaces.size() + projects.size() );
for ( String namespace : namespaces )
{
- browseGroupIdEntries.add( new BrowseIdEntry( namespace, false ) );
+ browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ) );
}
for ( String project : projects )
{
- browseGroupIdEntries.add( new BrowseIdEntry( project, true ) );
+ browseGroupResultEntries.add( new BrowseResultEntry( project, true ) );
}
- Collections.sort( browseGroupIdEntries );
- return new BrowseResult( browseGroupIdEntries );
+ Collections.sort( browseGroupResultEntries );
+ return new BrowseResult( browseGroupResultEntries );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css?rev=1245618&r1=1245617&r2=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css Fri Feb 17 15:40:41 2012
@@ -78,4 +78,8 @@
.browse-list{
list-style-image: url("../images/folder.png")
+}
+
+.force-upper-case{
+ text-transform: uppercase;
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1245618&r1=1245617&r2=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Fri Feb 17 15:40:41 2012
@@ -18,8 +18,8 @@
*/
$(function() {
- BrowseViewModel=function(browseIdEntries,parentGroupdId){
- this.browseIdEntries=browseIdEntries;
+ BrowseViewModel=function(browseResultEntries,parentGroupdId){
+ this.browseResultEntries=browseResultEntries;
this.parentGroupdId=parentGroupdId;
displayGroupId=function(groupId){
displayGroupDetail(groupId,"..");
@@ -38,9 +38,9 @@ $(function() {
type: "GET",
dataType: 'json',
success: function(data) {
- var browseIdEntries = mapBrowseIdEntries(data);
- $.log("size:"+browseIdEntries.length);
- var browseViewModel = new BrowseViewModel(browseIdEntries);
+ var browseResultEntries = mapbrowseResultEntries(data);
+ $.log("size:"+browseResultEntries.length);
+ var browseViewModel = new BrowseViewModel(browseResultEntries);
ko.applyBindings(browseViewModel,mainContent.get(0));
}
@@ -59,8 +59,8 @@ $(function() {
type: "GET",
dataType: 'json',
success: function(data) {
- var browseIdEntries = mapBrowseIdEntries(data);
- var browseViewModel = new BrowseViewModel(browseIdEntries,parentGroupdId);
+ var browseResultEntries = mapbrowseResultEntries(data);
+ var browseViewModel = new BrowseViewModel(browseResultEntries,parentGroupdId);
ko.applyBindings(browseViewModel,mainContent.get(0));
}
@@ -74,17 +74,17 @@ $(function() {
$("#main-content" ).html("coming soon :-)");
}
- mapBrowseIdEntries=function(data){
- if (data.browseResult && data.browseResult.browseIdEntries) {
- return $.isArray(data.browseResult.browseIdEntries) ?
- $.map(data.browseResult.browseIdEntries,function(item){
- return new BrowseIdEntry(item.name, item.project);
- }): [data.browseResult.browseIdEntries];
+ mapbrowseResultEntries=function(data){
+ if (data.browseResult && data.browseResult.browseResultEntries) {
+ return $.isArray(data.browseResult.browseResultEntries) ?
+ $.map(data.browseResult.browseResultEntries,function(item){
+ return new BrowseResultEntry(item.name, item.project);
+ }): [data.browseResult.browseResultEntries];
}
return [];
}
- BrowseIdEntry=function(name,project){
+ BrowseResultEntry=function(name,project){
this.name=name;
this.project=project;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1245618&r1=1245617&r2=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Fri Feb 17 15:40:41 2012
@@ -44,10 +44,10 @@
<div>
<ul>
<li class="browse-list"><a href="#" data-bind="click:function(){displayGroupId($root.parentGroupdId)}">..</a></li>
- {{each(i,browseIdEntry) browseIdEntries}}
+ {{each(i,browseResultEntry) browseResultEntries}}
<li class="browse-list">
- <a href="#" data-bind="click:function(){displayGroupId(browseIdEntry.name)}">
- ${browseIdEntry.name}-project: ${browseIdEntry.project}
+ <a href="#" data-bind="click:function(){displayGroupId(browseResultEntry.name)}">
+ ${browseResultEntry.name} (project: ${browseResultEntry.project})
</a>
</li>
{{/each}}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1245618&r1=1245617&r2=1245618&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html Fri Feb 17 15:40:41 2012
@@ -31,7 +31,7 @@
</li>
<li id="login-link" class="pull-right" style="display: none">
<a href="#" onclick="loginBox();" id="login-link-a">
- <span class="label label-success">${$.i18n.prop('login')}</span>
+ <span class="label label-success force-upper-case">${$.i18n.prop('login')}</span>
</a>
</li>
<li id="change-password-link" class="pull-right" style="">
@@ -39,12 +39,12 @@
</li>
<li id="logout-link" class="pull-right" style="display: none">
<a href="#" onclick="logout();" id="logout-link-a">
- <span class="label label-important">${$.i18n.prop('logout')}</span>
+ <span class="label label-important force-upper-case">${$.i18n.prop('logout')}</span>
</a>
</li>
<li id="register-link" class="pull-right" style="display: none">
<a href="#" onclick="registerBox();" id="register-link-a">
- <span class="label label-info">${$.i18n.prop('register')}</span>
+ <span class="label label-info force-upper-case">${$.i18n.prop('register')}</span>
</a>
</li>
<li class="pull-right">