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/01/27 12:20:12 UTC
svn commit: r1236636 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js: ./
src/main/filtered-resources/
src/main/java/org/apache/archiva/webapp/ui/services/api/
src/main/java/org/apache/archiva/webapp/ui/services/model/
src/main/webapp/...
Author: olamy
Date: Fri Jan 27 11:20:11 2012
New Revision: 1236636
URL: http://svn.apache.org/viewvc?rev=1236636&view=rev
Log:
finish footer with version copyrightRange
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/filtered-resources/application.properties
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
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.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1236636&r1=1236635&r2=1236636&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Fri Jan 27 11:20:11 2012
@@ -523,10 +523,6 @@
<resource>
<directory>src/main/resources</directory>
</resource>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- </resource>
</resources>
<plugins>
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=1236636&r1=1236635&r2=1236636&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 Fri Jan 27 11:20:11 2012
@@ -18,9 +18,12 @@ package org.apache.archiva.webapp.ui.ser
* under the License.
*/
+import org.apache.archiva.web.runtime.ArchivaRuntimeInfo;
import org.apache.archiva.webapp.ui.services.model.ApplicationRuntimeInfo;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
+
/**
* @author Olivier Lamy
*/
@@ -28,9 +31,22 @@ import org.springframework.stereotype.Se
public class DefaultRuntimeInfoService
implements RuntimeInfoService
{
- public ApplicationRuntimeInfo archivaRuntimeInfo()
+
+ private ArchivaRuntimeInfo archivaRuntimeInfo;
+
+ @Inject
+ public DefaultRuntimeInfoService( ArchivaRuntimeInfo archivaRuntimeInfo )
+ {
+ this.archivaRuntimeInfo = archivaRuntimeInfo;
+ }
+
+ @Inject
+ public ApplicationRuntimeInfo getApplicationRuntimeInfo()
{
- ApplicationRuntimeInfo archivaRuntimeInfo = new ApplicationRuntimeInfo();
- return archivaRuntimeInfo;
+ ApplicationRuntimeInfo applicationRuntimeInfo = new ApplicationRuntimeInfo();
+ applicationRuntimeInfo.setBuildNumber( this.archivaRuntimeInfo.getBuildNumber() );
+ applicationRuntimeInfo.setTimestamp( this.archivaRuntimeInfo.getTimestamp() );
+ applicationRuntimeInfo.setVersion( this.archivaRuntimeInfo.getVersion() );
+ 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=1236636&r1=1236635&r2=1236636&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 Fri Jan 27 11:20:11 2012
@@ -37,5 +37,5 @@ public interface RuntimeInfoService
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( noRestriction = true )
- ApplicationRuntimeInfo archivaRuntimeInfo();
+ ApplicationRuntimeInfo getApplicationRuntimeInfo();
}
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=1236636&r1=1236635&r2=1236636&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 Fri Jan 27 11:20:11 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.webapp.ui.ser
*/
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Calendar;
/**
* @author Olivier Lamy
@@ -31,11 +32,22 @@ public class ApplicationRuntimeInfo
private boolean javascriptLog = false;
+ private String version;
+
+ private String buildNumber;
+
+ private long timestamp;
+
+ private String copyrightRange;
+
+
public ApplicationRuntimeInfo()
{
this.devMode = Boolean.getBoolean( "archiva.devMode" );
this.javascriptLog = Boolean.getBoolean( "archiva.javascriptLog" );
+
+ this.copyrightRange = "2005 - " + Calendar.getInstance().get( Calendar.YEAR );
}
public boolean isDevMode()
@@ -58,6 +70,46 @@ public class ApplicationRuntimeInfo
this.javascriptLog = javascriptLog;
}
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ }
+
+ public String getBuildNumber()
+ {
+ return buildNumber;
+ }
+
+ public void setBuildNumber( String buildNumber )
+ {
+ this.buildNumber = buildNumber;
+ }
+
+ public long getTimestamp()
+ {
+ return timestamp;
+ }
+
+ public void setTimestamp( long timestamp )
+ {
+ this.timestamp = timestamp;
+ }
+
+ public String getCopyrightRange()
+ {
+ return copyrightRange;
+ }
+
+ public void setCopyrightRange( String copyrightRange )
+ {
+ this.copyrightRange = copyrightRange;
+ }
+
@Override
public String toString()
{
@@ -65,6 +117,10 @@ public class ApplicationRuntimeInfo
sb.append( "ApplicationRuntimeInfo" );
sb.append( "{devMode=" ).append( devMode );
sb.append( ", javascriptLog=" ).append( javascriptLog );
+ sb.append( ", version='" ).append( version ).append( '\'' );
+ sb.append( ", buildNumber='" ).append( buildNumber ).append( '\'' );
+ sb.append( ", timestamp=" ).append( timestamp );
+ sb.append( ", copyrightRange='" ).append( copyrightRange ).append( '\'' );
sb.append( '}' );
return sb.toString();
}
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=1236636&r1=1236635&r2=1236636&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 Fri Jan 27 11:20:11 2012
@@ -53,6 +53,7 @@ $.ajax(
success:function(data){
window.archivaDevMode=data.applicationRuntimeInfo.devMode;
window.archivaJavascriptLog=data.applicationRuntimeInfo.javascriptLog;
+ window.archivaRuntimeInfo=data.applicationRuntimeInfo;
require.config({
baseUrl: "js/"
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1236636&r1=1236635&r2=1236636&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Fri Jan 27 11:20:11 2012
@@ -172,7 +172,7 @@ $(function() {
hideElementWithKarma();
checkSecurityLinks();
checkCreateAdminLink();
- $('#footer-content').html($('#footer-tmpl').tmpl());
+ $('#footer-content').html($('#footer-tmpl').tmpl(window.archivaRuntimeInfo));
}
startArchivaApplication();
})