Author: olamy
Date: Fri Sep 30 16:17:56 2011
New Revision: 1177720
URL: http://svn.apache.org/viewvc?rev=1177720&view=rev
Log:
more easy version display using bean properties
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaVersion.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties?rev=1177720&r1=1177719&r2=1177720&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/filtered-resources/application.properties
Fri Sep 30 16:17:56 2011
@@ -17,3 +17,4 @@
# under the License.
#
user.agent=Apache Archiva/${project.version}
+archiva.version=${project.version}
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=1177720&r1=1177719&r2=1177720&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
Fri Sep 30 16:17:56 2011
@@ -44,6 +44,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
/**
* LogEnabled and SessionAware ActionSupport
@@ -69,6 +70,10 @@ public abstract class AbstractActionSupp
private String principal;
+ @Inject
+ @Named(value = "archivaRuntimeProperties")
+ private Properties archivaRuntimeProperties;
+
@PostConstruct
public void initialize()
{
@@ -185,6 +190,11 @@ public abstract class AbstractActionSupp
return auditInformation;
}
+ public String getArchivaVersion()
+ {
+ return (String) archivaRuntimeProperties.get( "archiva.version" );
+ }
+
/**
* dummy information for audit events
* @since 1.4
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java?rev=1177720&r1=1177719&r2=1177720&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
Fri Sep 30 16:17:56 2011
@@ -19,10 +19,10 @@ package org.apache.archiva.web.startup;
* under the License.
*/
+import org.apache.archiva.common.ArchivaException;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
-import org.apache.archiva.common.ArchivaException;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.codehaus.plexus.taskqueue.Task;
@@ -35,6 +35,7 @@ import org.springframework.web.context.s
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import java.lang.reflect.Field;
+import java.util.Properties;
import java.util.concurrent.ExecutorService;
/**
@@ -67,6 +68,8 @@ public class ArchivaStartup
repositoryTaskScheduler =
wac.getBean( "archivaTaskScheduler#repository",
RepositoryArchivaTaskScheduler.class );
+ Properties archivaRuntimeProperties = wac.getBean(
"archivaRuntimeProperties", Properties.class );
+
tqeRepoScanning = wac.getBean(
"taskQueueExecutor#repository-scanning", ThreadedTaskQueueExecutor.class );
tqeIndexing = wac.getBean( "taskQueueExecutor#indexing",
ThreadedTaskQueueExecutor.class );
@@ -85,7 +88,7 @@ public class ArchivaStartup
{
securitySync.startup();
repositoryTaskScheduler.startup();
- Banner.display();
+ Banner.display( (String) archivaRuntimeProperties.get(
"archiva.version" ) );
}
catch ( ArchivaException e )
{
@@ -147,12 +150,13 @@ public class ArchivaStartup
}
// closing correctly indexer to close correctly lock and file
- for( IndexingContext indexingContext :
nexusIndexer.getIndexingContexts().values() )
+ for ( IndexingContext indexingContext :
nexusIndexer.getIndexingContexts().values() )
{
try
{
indexingContext.close( false );
- } catch ( Exception e )
+ }
+ catch ( Exception e )
{
contextEvent.getServletContext().log( "skip error closing
indexingContext " + e.getMessage() );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java?rev=1177720&r1=1177719&r2=1177720&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
Fri Sep 30 16:17:56 2011
@@ -221,9 +221,9 @@ public class Banner
return injectVersion( decode( encodedBanner ), version );
}
- public static void display()
+ public static void display( String version )
{
- String banner = getBanner( ArchivaVersion.determineVersion() );
+ String banner = getBanner( version );
LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_",
25 ) + eol + banner );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml?rev=1177720&r1=1177719&r2=1177720&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
Fri Sep 30 16:17:56 2011
@@ -21,14 +21,18 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:util="http://www.springframework.org/schema/util";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.0.xsd";
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.web"/>
+ <util:properties id="archivaRuntimeProperties"
location="classpath:application.properties" />
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1177720&r1=1177719&r2=1177720&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Fri Sep 30 16:17:56 2011
@@ -25,8 +25,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
- <context:property-placeholder location="classpath:application.properties" />
-
+ <context:property-placeholder location="classpath:application.properties"/>
<bean id="loggerManager"
class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
init-method="initialize"/>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=1177720&r1=1177719&r2=1177720&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Fri Sep 30 16:17:56 2011
@@ -26,7 +26,6 @@
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
<%@ page import="java.util.Calendar" %>
-<%@ page import="org.apache.archiva.web.startup.ArchivaVersion" %>
<html>
<head>
@@ -196,7 +195,7 @@
<div id="footer">
<div class="xleft">
- <a target="_blank" href="http://archiva.apache.org/";>Apache Ar<c:if
test="${is19Sep}">rr</c:if>chiva <%= ArchivaVersion.getVersion()%></a>
+ <a target="_blank" href="http://archiva.apache.org/";>Apache Ar<c:if
test="${is19Sep}">rr</c:if>chiva - <s:property
value="archivaVersion"/></a>
</div>
<div class="xright">
Copyright © <%= copyrightRange%> <a target="_blank"
href="http://www.apache.org/";>The Apache Software Foundation</a>
