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/03/12 12:34:41 UTC
svn commit: r1299632 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/
archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/
archiva-webapp-js/src/main/web...
Author: olamy
Date: Mon Mar 12 11:34:40 2012
New Revision: 1299632
URL: http://svn.apache.org/viewvc?rev=1299632&view=rev
Log:
[MRM-1580] system status page display version infos.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java Mon Mar 12 11:34:40 2012
@@ -27,6 +27,9 @@ import org.springframework.stereotype.Se
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Context;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
/**
* @author Olivier Lamy
@@ -49,13 +52,17 @@ public class DefaultRuntimeInfoService
this.archivaRuntimeInfo = archivaRuntimeInfo;
}
- public ApplicationRuntimeInfo getApplicationRuntimeInfo()
+ public ApplicationRuntimeInfo getApplicationRuntimeInfo( String locale )
{
ApplicationRuntimeInfo applicationRuntimeInfo = new ApplicationRuntimeInfo();
applicationRuntimeInfo.setBuildNumber( this.archivaRuntimeInfo.getBuildNumber() );
applicationRuntimeInfo.setTimestamp( this.archivaRuntimeInfo.getTimestamp() );
applicationRuntimeInfo.setVersion( this.archivaRuntimeInfo.getVersion() );
applicationRuntimeInfo.setBaseUrl( getBaseUrl( httpServletRequest ) );
+
+ SimpleDateFormat sfd = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssz", new Locale( locale ) );
+ applicationRuntimeInfo.setTimestampStr( sfd.format( new Date( archivaRuntimeInfo.getTimestamp() ) ) );
+
return applicationRuntimeInfo;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java Mon Mar 12 11:34:40 2012
@@ -23,6 +23,7 @@ import org.codehaus.plexus.redback.autho
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
@@ -34,11 +35,11 @@ import javax.ws.rs.core.MediaType;
@Path( "/runtimeInfoService/" )
public interface RuntimeInfoService
{
- @Path( "archivaRuntimeInfo" )
+ @Path( "archivaRuntimeInfo/{locale}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true )
- ApplicationRuntimeInfo getApplicationRuntimeInfo();
+ ApplicationRuntimeInfo getApplicationRuntimeInfo( @PathParam( "locale" ) String locale );
@Path( "logMissingI18n" )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java Mon Mar 12 11:34:40 2012
@@ -44,6 +44,7 @@ public class ApplicationRuntimeInfo
private String baseUrl;
+ private String timestampStr;
public ApplicationRuntimeInfo()
{
@@ -136,6 +137,16 @@ public class ApplicationRuntimeInfo
this.baseUrl = baseUrl;
}
+ public String getTimestampStr()
+ {
+ return timestampStr;
+ }
+
+ public void setTimestampStr( String timestampStr )
+ {
+ this.timestampStr = timestampStr;
+ }
+
@Override
public String toString()
{
@@ -149,6 +160,7 @@ public class ApplicationRuntimeInfo
sb.append( ", copyrightRange='" ).append( copyrightRange ).append( '\'' );
sb.append( ", logMissingI18n=" ).append( logMissingI18n );
sb.append( ", baseUrl='" ).append( baseUrl ).append( '\'' );
+ sb.append( ", timestampStr='" ).append( timestampStr ).append( '\'' );
sb.append( '}' );
return sb.toString();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index-dev.html Mon Mar 12 11:34:40 2012
@@ -44,61 +44,11 @@
<script type="text/javascript">
-appendArchivaVersion=function(){
- return "_archivaVersion="+window.archivaRuntimeInfo.version;
-}
-buildLoadJsUrl=function(srcScript){
- return srcScript+"?"+appendArchivaVersion();
-}
-$.ajax(
- {
- url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo",
- dataType: 'json',
- success:function(data){
- window.archivaDevMode=data.applicationRuntimeInfo.devMode;
- window.archivaJavascriptLog=data.applicationRuntimeInfo.javascriptLog;
- window.archivaRuntimeInfo=data.applicationRuntimeInfo;
- require.config({
- baseUrl: "js/"
- });
- // CacheBust is for dev purpose use false in prod env !
- var options = {
- AlwaysPreserveOrder:true,
- BasePath:"js/",
- explicit_preloading:false,
- CacheBust:window.archivaDevMode
- };
- $LAB.setGlobalDefaults(options);
- $LAB
- .script(buildLoadJsUrl("jquery.tmpl.js")).wait()
- .script(buildLoadJsUrl("archiva/utils.js")).wait()
- .script("jquery.i18n.properties-1.0.9.js").wait()
- .script(buildLoadJsUrl("archiva/i18nload.js")).wait()
- .script("jquery.cookie.1.0.0.js").wait()
- .script(buildLoadJsUrl("knockout-debug.js")).wait()
- .script("jquery-ui-1.8.16.custom.min.js").wait()
- .script(buildLoadJsUrl("jquery.validate.js")).wait()
- .script("jquery.json-2.3.min.js").wait()
- .script(buildLoadJsUrl("archiva/main-tmpl.js")).wait()
- .script(buildLoadJsUrl("archiva/repositories.js")).wait()
- .script(buildLoadJsUrl("archiva/network-proxies.js")).wait()
- .script(buildLoadJsUrl("archiva/proxy-connectors.js")).wait()
- .script(buildLoadJsUrl("redback/operation.js")).wait()
- .script(buildLoadJsUrl("redback/redback-tmpl.js")).wait()
- .script(buildLoadJsUrl("bootstrap.js"))
- .script(buildLoadJsUrl("knockout.simpleGrid.js"))
- //.script("knockout.mapping-latest.debug.js")
- .script(buildLoadJsUrl("redback/user.js")).wait()
- .script(buildLoadJsUrl("redback/users.js")).wait()
- .script(buildLoadJsUrl("redback/redback.js")).wait()
- .script(buildLoadJsUrl("redback/register.js")).wait()
- .script(buildLoadJsUrl("redback/permission.js")).wait()
- .script(buildLoadJsUrl("redback/resource.js")).wait()
- .script(buildLoadJsUrl("redback/roles.js")).wait()
- .script(buildLoadJsUrl("archiva/main.js"));
- }
- })
+ $(function() {
+ loadJs();
+ });
</script>
+
</body>
</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Mon Mar 12 11:34:40 2012
@@ -11,6 +11,8 @@
<script type="text/javascript" src="js/lab.js"></script>
<script type="text/javascript" src="js/require.1.0.1.js"></script>
+ <script type="text/javascript" src="js/jquery.i18n.properties-1.0.9.js"></script>
+ <script type="text/javascript" src="js/archiva/startup.js"></script>
<title>Apache Archiva</title>
</head>
@@ -45,70 +47,12 @@
<script type="text/javascript">
-appendArchivaVersion=function(){
- return "_archivaVersion="+window.archivaRuntimeInfo.version;
-}
-buildLoadJsUrl=function(srcScript){
- return srcScript+"?"+appendArchivaVersion();
-}
-
-$.ajaxSetup({
- dataType: 'json'
-});
-
-$.ajax(
- {
- url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo",
- dataType: 'json',
- success:function(data){
- window.archivaDevMode=data.devMode;
- window.archivaJavascriptLog=data.javascriptLog;
- window.archivaRuntimeInfo=data;
- require.config({
- baseUrl: "js/"
- });
- // CacheBust is for dev purpose use false in prod env !
- var options = {
- AlwaysPreserveOrder:true,
- BasePath:"js/",
- explicit_preloading:false,
- CacheBust:window.archivaDevMode
- };
- $LAB.setGlobalDefaults(options);
- $LAB
- .script(buildLoadJsUrl("jquery.tmpl.js")).wait()
- .script(buildLoadJsUrl("archiva/utils.js")).wait()
- .script("jquery.i18n.properties-1.0.9.js").wait()
- .script(buildLoadJsUrl("archiva/i18nload.js")).wait()
- .script("jquery.cookie.1.0.0.js").wait()
- .script(buildLoadJsUrl("knockout-debug.js")).wait()
- .script("jquery-ui-1.8.16.custom.min.js").wait()
- .script(buildLoadJsUrl("jquery.validate.js")).wait()
- .script("jquery.json-2.3.min.js").wait()
- .script(buildLoadJsUrl("archiva/main-tmpl.js")).wait()
- .script(buildLoadJsUrl("archiva/general-admin.js"))
- .script(buildLoadJsUrl("archiva/repositories.js")).wait()
- .script(buildLoadJsUrl("archiva/network-proxies.js")).wait()
- .script(buildLoadJsUrl("archiva/proxy-connectors.js")).wait()
- .script(buildLoadJsUrl("redback/operation.js")).wait()
- .script(buildLoadJsUrl("archiva/repository-groups.js")).wait()
- .script(buildLoadJsUrl("archiva/search.js")).wait()
- .script(buildLoadJsUrl("redback/redback-tmpl.js")).wait()
- .script("chosen.jquery.js" )
- .script("bootstrap.2.0.1.js" )
- .script(buildLoadJsUrl("knockout.simpleGrid.js"))
- .script(buildLoadJsUrl("knockout-sortable.js"))
- //.script("knockout.mapping-latest.debug.js")
- .script(buildLoadJsUrl("redback/user.js")).wait()
- .script(buildLoadJsUrl("redback/users.js")).wait()
- .script(buildLoadJsUrl("redback/redback.js")).wait()
- .script(buildLoadJsUrl("redback/register.js")).wait()
- .script(buildLoadJsUrl("redback/permission.js")).wait()
- .script(buildLoadJsUrl("redback/resource.js")).wait()
- .script(buildLoadJsUrl("redback/roles.js")).wait()
- .script(buildLoadJsUrl("archiva/main.js"));
- }
- })
+
+ $(function() {
+ loadJs();
+ });
+
+
</script>
</body>
</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Mon Mar 12 11:34:40 2012
@@ -584,6 +584,10 @@ $(function() {
mainContent.find("#status_current_time").html(curTime);
}
});
+
+ var versionInfo="Build number: "+window.archivaRuntimeInfo.buildNumber+" - Build Timestamp: "+window.archivaRuntimeInfo.timestampStr;
+ mainContent.find("#status_version_info").html(versionInfo);
+
}
});
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js Mon Mar 12 11:34:40 2012
@@ -20,14 +20,7 @@
$(function() {
// load i18n resources from rest call
- usedLang=function(){
- var browserLang = $.i18n.browserLang();
- var requestLang = $.urlParam('request_lang');
- if (requestLang) {
- browserLang=requestLang;
- }
- return browserLang;
- }
+
var browserLang = usedLang();
$.log("use browserLang:"+browserLang);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Mon Mar 12 11:34:40 2012
@@ -32,18 +32,6 @@ $.log = (function(message) {
});
/**
- * return value of a param in the url
- * @param name
- */
-$.urlParam = function(name){
- var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
- if (results) {
- return results[1] || 0;
- }
- return null;
-}
-
-/**
* display a success message
* @param text the success text
* @param idToAppend the id to append the success box
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java?rev=1299632&r1=1299631&r2=1299632&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java Mon Mar 12 11:34:40 2012
@@ -198,25 +198,24 @@ public abstract class AbstractActionSupp
public String getArchivaVersion()
{
- return archivaRuntimeInfo.getVersion(); //(String) archivaRuntimeProperties.get( "archiva.version" );
+ return archivaRuntimeInfo.getVersion();
}
public String getArchivaBuildNumber()
{
- return archivaRuntimeInfo.getBuildNumber();// (String) archivaRuntimeProperties.get( "archiva.buildNumber" );
+ return archivaRuntimeInfo.getBuildNumber();
}
public String getArchivaBuildTimestamp()
{
return Long.toString(
- archivaRuntimeInfo.getTimestamp() ); //(String) archivaRuntimeProperties.get( "archiva.timestamp" );
+ archivaRuntimeInfo.getTimestamp() );
}
public String getArchivaBuildTimestampDateStr()
{
SimpleDateFormat sfd = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssz", getLocale() );
return sfd.format( new Date( archivaRuntimeInfo.getTimestamp() ) );
- //new Date( NumberUtils.createLong( (String) archivaRuntimeProperties.get( "archiva.timestamp" ) ) ) );
}
/**