[seam-commits] Seam SVN: r9576 - in trunk/src/main/org/jboss/seam: init and 1 other directory.
Author: pete.muir(a)jboss.org
Date: 2008-11-16 02:01:39 -0500 (Sun, 16 Nov 2008)
New Revision: 9576
Modified:
trunk/src/main/org/jboss/seam/core/Init.java
trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
JBSEAM-3701
Modified: trunk/src/main/org/jboss/seam/core/Init.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Init.java 2008-11-16 06:58:39 UTC (rev 9575)
+++ trunk/src/main/org/jboss/seam/core/Init.java 2008-11-16 07:01:39 UTC (rev 9576)
@@ -101,6 +101,7 @@
private Map<Class, String> convertersByClass = new HashMap<Class,
String>();
private long timestamp;
+ private long warTimestamp;
private File[] hotDeployPaths;
public static Init instance()
@@ -550,6 +551,16 @@
{
this.timestamp = timestamp;
}
+
+ public long getWarTimestamp()
+ {
+ return warTimestamp;
+ }
+
+ public void setWarTimestamp(long warTimestamp)
+ {
+ this.warTimestamp = warTimestamp;
+ }
public boolean isTransactionManagementEnabled()
{
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-11-16 06:58:39 UTC (rev
9575)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-11-16 07:01:39 UTC (rev
9576)
@@ -778,12 +778,17 @@
WarRootDeploymentStrategy warRootDeploymentStrategy = new
WarRootDeploymentStrategy(Thread.currentThread().getContextClassLoader(), warRoot);
warRootDeploymentStrategy.scan();
- Pages pages = (Pages)
ServletLifecycle.getServletContext().getAttribute(Seam.getComponentName(Pages.class));
- if (pages!= null) {
-
pages.initialize(warRootDeploymentStrategy.getDotPageDotXmlFileNames());
+ if (init.getWarTimestamp() < warRootDeploymentStrategy.getTimestamp())
+ {
+ Pages pages = (Pages)
ServletLifecycle.getServletContext().getAttribute(Seam.getComponentName(Pages.class));
+ if (pages!= null) {
+
pages.initialize(warRootDeploymentStrategy.getDotPageDotXmlFileNames());
+ }
+ ServletLifecycle.getServletContext().removeAttribute(
Seam.getComponentName(Exceptions.class) );
+ init.setWarTimestamp(warRootDeploymentStrategy.getTimestamp());
}
- ServletLifecycle.getServletContext().removeAttribute(
Seam.getComponentName(Exceptions.class) );
+
}
}
finally