Seam SVN: r9366 - trunk/examples/itext/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-20 12:37:25 -0400 (Mon, 20 Oct 2008)
New Revision: 9366
Modified:
trunk/examples/itext/resources/WEB-INF/components.xml
trunk/examples/itext/resources/WEB-INF/pages.xml
trunk/examples/itext/resources/WEB-INF/web.xml
Log:
JBSEAM-3590
Modified: trunk/examples/itext/resources/WEB-INF/components.xml
===================================================================
--- trunk/examples/itext/resources/WEB-INF/components.xml 2008-10-20 13:56:52 UTC (rev 9365)
+++ trunk/examples/itext/resources/WEB-INF/components.xml 2008-10-20 16:37:25 UTC (rev 9366)
@@ -25,9 +25,4 @@
<component name="sampleButton" class="javax.swing.JButton">
<property name="label">A JButton!</property>
</component>
-
-<!--
- <web:rewrite-filter view-mapping="/test/*" />
--->
- <web:rewrite-filter view-mapping="*.seam" />
</components>
Modified: trunk/examples/itext/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/itext/resources/WEB-INF/pages.xml 2008-10-20 13:56:52 UTC (rev 9365)
+++ trunk/examples/itext/resources/WEB-INF/pages.xml 2008-10-20 16:37:25 UTC (rev 9366)
@@ -3,10 +3,4 @@
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
- <page view-id="/foo.xhtml">
- <rewrite pattern="/foo/{id}" />
- <rewrite pattern="/foo-{conversationId}" />
- <rewrite pattern="/foo" />
- </page>
-
</pages>
Modified: trunk/examples/itext/resources/WEB-INF/web.xml
===================================================================
--- trunk/examples/itext/resources/WEB-INF/web.xml 2008-10-20 13:56:52 UTC (rev 9365)
+++ trunk/examples/itext/resources/WEB-INF/web.xml 2008-10-20 16:37:25 UTC (rev 9366)
@@ -68,7 +68,7 @@
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.z</url-pattern>
+ <url-pattern>*.seam</url-pattern>
</servlet-mapping>
<servlet>
16 years, 1 month
Seam SVN: r9365 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-20 09:56:52 -0400 (Mon, 20 Oct 2008)
New Revision: 9365
Modified:
trunk/build/ci.build.xml
Log:
minor
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-10-20 13:36:06 UTC (rev 9364)
+++ trunk/build/ci.build.xml 2008-10-20 13:56:52 UTC (rev 9365)
@@ -73,7 +73,7 @@
<target name="deployExamplesSnapshot" depends="initdav">
<deployExample name="booking" repositoryId="snapshots.jboss.org" />
<deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" />
- <deployExampleNoDs name="jpa" distdir="dist-jboss" repositoryId="snapshots.jboss.org" />
+ <deployExampleNoDs name="jpa" distdir="dist-jboss" type="war" repositoryId="snapshots.jboss.org" />
<deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" />
</target>
16 years, 1 month
Seam SVN: r9364 - trunk/examples/jpa.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-20 09:36:06 -0400 (Mon, 20 Oct 2008)
New Revision: 9364
Modified:
trunk/examples/jpa/build.xml
Log:
oops
Modified: trunk/examples/jpa/build.xml
===================================================================
--- trunk/examples/jpa/build.xml 2008-10-20 13:11:24 UTC (rev 9363)
+++ trunk/examples/jpa/build.xml 2008-10-20 13:36:06 UTC (rev 9364)
@@ -61,7 +61,7 @@
</target>
<target name="archive">
- <ant antfile="build-jboss.xml" target="jbosswar" />
+ <ant antfile="build-jboss.xml" target="noejb.archive" />
</target>
</project>
16 years, 1 month
Seam SVN: r9363 - in trunk: examples/jpa and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-20 09:11:24 -0400 (Mon, 20 Oct 2008)
New Revision: 9363
Added:
trunk/examples/jpa/pom.xml
Modified:
trunk/build/ci.build.xml
trunk/build/common.build.xml
trunk/examples/jpa/build.xml
Log:
Add jpa example to deployed examples
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-10-20 10:47:32 UTC (rev 9362)
+++ trunk/build/ci.build.xml 2008-10-20 13:11:24 UTC (rev 9363)
@@ -73,6 +73,7 @@
<target name="deployExamplesSnapshot" depends="initdav">
<deployExample name="booking" repositoryId="snapshots.jboss.org" />
<deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" />
+ <deployExampleNoDs name="jpa" distdir="dist-jboss" repositoryId="snapshots.jboss.org" />
<deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" />
</target>
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-10-20 10:47:32 UTC (rev 9362)
+++ trunk/build/common.build.xml 2008-10-20 13:11:24 UTC (rev 9363)
@@ -200,43 +200,46 @@
</macrodef>
<macrodef name="deployExample">
- <attribute name="name" />
- <attribute name="path" default="${seam.dir}/examples/@{name}" />
- <attribute name="repositoryId" />
- <sequential>
- <ant dir="@{path}" target="archive" inheritall="false">
- <propertyset>
- <propertyref name="initpomsdone" />
- <propertyref name="copyseamdone" />
- <propertyref name="copyseamdependenciesdone" />
- <propertyref name="copyjbossembeddeddone" />
- <propertyref name="core.pom" />
- <propertyref name="root.pom" />
- <propertyref name="parent.pom" />
- <propertyref name="ui.pom" />
- <propertyref name="remoting.pom" />
- <propertyref name="resteasy.pom" />
- <propertyref name="pdf.pom" />
- <propertyref name="rss.pom" />
- <propertyref name="gen.pom" />
- <propertyref name="excel.pom" />
- <propertyref name="ioc.pom" />
- <propertyref name="mail.pom" />
- <propertyref name="debug.pom" />
- <propertyref name="wicket.pom" />
- <propertyref name="testng.jvmargs"/>
- <propertyref name="maven.settings.xml" />
- </propertyset>
- </ant>
- <pomfile name="example.pom" value="@{path}/pom.xml" />
- <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false" settingsFile="${maven.settings.xml}">
- <pom file="${example.pom}" settingsFile="${maven.settings.xml}" />
- <attach file="@{path}/resources/jboss-seam-(a){name}-ds.xml" classifier="ds" type="xml" />
- <remoteRepository refid="@{repositoryId}" />
- </artifact:deploy>
- </sequential>
+ <attribute name="name" />
+ <attribute name="path" default="${seam.dir}/examples/@{name}" />
+ <attribute name="repositoryId" />
+ <attribute name="type" default="ear" />
+ <sequential>
+ <ant dir="@{path}" target="archive" inheritall="false">
+ <propertyset>
+ <propertyref name="initpomsdone" />
+ <propertyref name="copyseamdone" />
+ <propertyref name="copyseamdependenciesdone" />
+ <propertyref name="copyjbossembeddeddone" />
+ <propertyref name="core.pom" />
+ <propertyref name="root.pom" />
+ <propertyref name="parent.pom" />
+ <propertyref name="ui.pom" />
+ <propertyref name="remoting.pom" />
+ <propertyref name="resteasy.pom" />
+ <propertyref name="pdf.pom" />
+ <propertyref name="rss.pom" />
+ <propertyref name="gen.pom" />
+ <propertyref name="excel.pom" />
+ <propertyref name="ioc.pom" />
+ <propertyref name="mail.pom" />
+ <propertyref name="debug.pom" />
+ <propertyref name="wicket.pom" />
+ <propertyref name="testng.jvmargs" />
+ <propertyref name="maven.settings.xml" />
+ </propertyset>
+ </ant>
+ <pomfile name="example.pom" value="@{path}/pom.xml" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear"
+ uniqueVersion="false" settingsFile="${maven.settings.xml}">
+ <pom file="${example.pom}" settingsFile="${maven.settings.xml}" />
+ <attach file="@{path}/resources/jboss-seam-(a){name}-ds.xml"
+ classifier="ds" type="xml" />
+ <remoteRepository refid="@{repositoryId}" />
+ </artifact:deploy>
+ </sequential>
</macrodef>
-
+
<macrodef name="installExample">
<attribute name="name" />
<attribute name="path" default="${seam.dir}/examples/@{name}" />
@@ -272,42 +275,45 @@
</macrodef>
<macrodef name="deployExampleNoDs">
- <attribute name="name" />
- <attribute name="path" default="${seam.dir}/examples/@{name}" />
- <attribute name="repositoryId" />
- <sequential>
- <ant dir="@{path}" target="archive" inheritall="false">
- <propertyset>
- <propertyref name="initpomsdone" />
- <propertyref name="copyseamdone" />
- <propertyref name="copyseamdependenciesdone" />
- <propertyref name="copyjbossembeddeddone" />
- <propertyref name="core.pom" />
- <propertyref name="root.pom" />
- <propertyref name="parent.pom" />
- <propertyref name="ui.pom" />
- <propertyref name="remoting.pom" />
- <propertyref name="resteasy.pom" />
- <propertyref name="gen.pom" />
- <propertyref name="pdf.pom" />
- <propertyref name="rss.pom" />
- <propertyref name="excel.pom" />
- <propertyref name="ioc.pom" />
- <propertyref name="mail.pom" />
- <propertyref name="debug.pom" />
- <propertyref name="wicket.pom" />
- <propertyref name="testng.jvmargs"/>
- <propertyref name="maven.settings.xml" />
- </propertyset>
- </ant>
- <pomfile name="example.pom" value="@{path}/pom.xml" />
- <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false" settingsFile="${maven.settings.xml}">
- <pom file="${example.pom}" settingsFile="${maven.settings.xml}" />
- <remoteRepository refid="@{repositoryId}" />
- </artifact:deploy>
- </sequential>
- </macrodef>
-
+ <attribute name="name" />
+ <attribute name="path" default="${seam.dir}/examples/@{name}" />
+ <attribute name="repositoryId" />
+ <attribute name="type" default="ear" />
+ <attribute name="distdir" default="dist" />
+ <sequential>
+ <ant dir="@{path}" target="archive" inheritall="false">
+ <propertyset>
+ <propertyref name="initpomsdone" />
+ <propertyref name="copyseamdone" />
+ <propertyref name="copyseamdependenciesdone" />
+ <propertyref name="copyjbossembeddeddone" />
+ <propertyref name="core.pom" />
+ <propertyref name="root.pom" />
+ <propertyref name="parent.pom" />
+ <propertyref name="ui.pom" />
+ <propertyref name="remoting.pom" />
+ <propertyref name="resteasy.pom" />
+ <propertyref name="gen.pom" />
+ <propertyref name="pdf.pom" />
+ <propertyref name="rss.pom" />
+ <propertyref name="excel.pom" />
+ <propertyref name="ioc.pom" />
+ <propertyref name="mail.pom" />
+ <propertyref name="debug.pom" />
+ <propertyref name="wicket.pom" />
+ <propertyref name="testng.jvmargs" />
+ <propertyref name="maven.settings.xml" />
+ </propertyset>
+ </ant>
+ <pomfile name="example.pom" value="@{path}/pom.xml" />
+ <artifact:deploy file="@{path}/@{distdir}/jboss-seam-@{name}.(a){type}"
+ uniqueVersion="false" settingsFile="${maven.settings.xml}">
+ <pom file="${example.pom}" settingsFile="${maven.settings.xml}" />
+ <remoteRepository refid="@{repositoryId}" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
+
<macrodef name="dependencyReport">
<attribute name="module" />
<attribute name="pom" default="${tmp.dir}/poms/(a){module}.pom" />
Modified: trunk/examples/jpa/build.xml
===================================================================
--- trunk/examples/jpa/build.xml 2008-10-20 10:47:32 UTC (rev 9362)
+++ trunk/examples/jpa/build.xml 2008-10-20 13:11:24 UTC (rev 9363)
@@ -59,6 +59,10 @@
<target name="test">
<ant antfile="build-jboss.xml" target="test" />
</target>
+
+ <target name="archive">
+ <ant antfile="build-jboss.xml" target="jbosswar" />
+ </target>
</project>
Added: trunk/examples/jpa/pom.xml
===================================================================
--- trunk/examples/jpa/pom.xml (rev 0)
+++ trunk/examples/jpa/pom.xml 2008-10-20 13:11:24 UTC (rev 9363)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam.examples</groupId>
+ <artifactId>jboss-seam-jpa</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
+ <packaging>war</packaging>
+
+</project>
\ No newline at end of file
Property changes on: trunk/examples/jpa/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 1 month
Seam SVN: r9362 - in tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam: init and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-20 06:47:32 -0400 (Mon, 20 Oct 2008)
New Revision: 9362
Modified:
tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/init/Initialization.java
tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/navigation/Pages.java
Log:
merge in r9360 to the 2.1.0.GA tag
Modified: tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2008-10-19 11:58:59 UTC (rev 9361)
+++ tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2008-10-20 10:47:32 UTC (rev 9362)
@@ -1,6 +1,7 @@
package org.jboss.seam.deployment;
import java.io.File;
+import java.util.Set;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
@@ -25,6 +26,8 @@
public static final String NAME = "warRootDeploymentStrategy";
+ private DotPageDotXmlDeploymentHandler dotPageDotXmlDeploymentHandler;
+
public WarRootDeploymentStrategy(ClassLoader classLoader, File warRoot)
{
this.classLoader = classLoader;
@@ -38,7 +41,8 @@
log.warn("Unable to discover war root, .page.xml files won't be found");
this.warRoot = new File[0];
}
- getDeploymentHandlers().put(DotPageDotXmlDeploymentHandler.NAME, new DotPageDotXmlDeploymentHandler());
+ dotPageDotXmlDeploymentHandler = new DotPageDotXmlDeploymentHandler();
+ getDeploymentHandlers().put(DotPageDotXmlDeploymentHandler.NAME, dotPageDotXmlDeploymentHandler);
}
@Override
@@ -67,5 +71,10 @@
{
getScanner().scanDirectories(warRoot);
}
+
+ public Set<String> getDotPageDotXmlFileNames()
+ {
+ return dotPageDotXmlDeploymentHandler.getFiles();
+ }
}
Modified: tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/init/Initialization.java 2008-10-19 11:58:59 UTC (rev 9361)
+++ tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/init/Initialization.java 2008-10-20 10:47:32 UTC (rev 9362)
@@ -736,16 +736,16 @@
{
try
{
- ServletLifecycle.beginReinitialization(request);
hotDeploymentStrategy = createHotDeployment(Thread.currentThread().getContextClassLoader());
if (hotDeploymentStrategy.isEnabled())
{
hotDeploymentStrategy.scan();
- Init init = Init.instance();
+ Init init = (Init) ServletLifecycle.getServletContext().getAttribute( Seam.getComponentName(Init.class) );
if (init.getTimestamp() < hotDeploymentStrategy.getTimestamp())
{
log.info("redeploying");
+ ServletLifecycle.beginReinitialization(request);
Seam.clearComponentNameCache();
for ( String name: init.getHotDeployableComponents() )
{
@@ -769,20 +769,19 @@
Contexts.getEventContext().set(HotDeploymentStrategy.NAME, hotDeploymentStrategy);
init.setTimestamp( System.currentTimeMillis() );
installComponents(init);
+ ServletLifecycle.endReinitialization();
log.info("done redeploying");
}
WarRootDeploymentStrategy warRootDeploymentStrategy = new WarRootDeploymentStrategy(Thread.currentThread().getContextClassLoader(), warRoot);
warRootDeploymentStrategy.scan();
- Contexts.getEventContext().set(WarRootDeploymentStrategy.NAME, warRootDeploymentStrategy);
- Pages pages = Pages.instance();
+ Pages pages = (Pages) ServletLifecycle.getServletContext().getAttribute(Seam.getComponentName(Pages.class));
if (pages!= null) {
- pages.initialize();
+ pages.initialize(warRootDeploymentStrategy.getDotPageDotXmlFileNames());
}
- Contexts.getApplicationContext().remove(Seam.getComponentName(Exceptions.class));
+ ServletLifecycle.getServletContext().removeAttribute( Seam.getComponentName(Exceptions.class) );
}
- ServletLifecycle.endReinitialization();
}
finally
{
Modified: tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/navigation/Pages.java 2008-10-19 11:58:59 UTC (rev 9361)
+++ tags/JBoss_Seam_2_1_0_GA/src/main/org/jboss/seam/navigation/Pages.java 2008-10-20 10:47:32 UTC (rev 9362)
@@ -104,11 +104,25 @@
@Create
public void create()
{
- initialize();
+ if (DotPageDotXmlDeploymentHandler.instance() != null)
+ {
+ initialize(DotPageDotXmlDeploymentHandler.instance().getFiles());
+ }
+ else
+ {
+ initialize();
+ }
}
+
+
public void initialize()
{
+ initialize(null);
+ }
+
+ public void initialize(Set<String> fileNames)
+ {
pagesByViewId = Collections.synchronizedMap(new HashMap<String, Page>());
pageStacksByViewId = Collections.synchronizedMap(new HashMap<String, List<Page>>());
conversations = Collections.synchronizedMap(new HashMap<String, ConversationIdParameter>());
@@ -129,9 +143,9 @@
}
}
- if (DotPageDotXmlDeploymentHandler.instance() != null)
+ if (fileNames != null)
{
- parsePages(DotPageDotXmlDeploymentHandler.instance().getFiles());
+ parsePages(fileNames);
}
}
16 years, 1 month
Seam SVN: r9361 - trunk/examples/seamdiscs/resources/META-INF.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-19 07:58:59 -0400 (Sun, 19 Oct 2008)
New Revision: 9361
Modified:
trunk/examples/seamdiscs/resources/META-INF/persistence.xml
Log:
query cache shouldn't be enabled.
Modified: trunk/examples/seamdiscs/resources/META-INF/persistence.xml
===================================================================
--- trunk/examples/seamdiscs/resources/META-INF/persistence.xml 2008-10-17 10:45:07 UTC (rev 9360)
+++ trunk/examples/seamdiscs/resources/META-INF/persistence.xml 2008-10-19 11:58:59 UTC (rev 9361)
@@ -10,7 +10,6 @@
<jta-data-source>java:/seamdiscsDatasource</jta-data-source>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
- <property name="hibernate.cache.use_query_cache" value="true"/>
<property name="hibernate.show_sql" value="true"/>
<property name="jboss.entity.manager.factory.jndi.name" value="java:/seamdiscsEntityManagerFactory"/>
</properties>
16 years, 1 month
Seam SVN: r9360 - in trunk/src/main/org/jboss/seam: init and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-17 06:45:07 -0400 (Fri, 17 Oct 2008)
New Revision: 9360
Modified:
trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
trunk/src/main/org/jboss/seam/init/Initialization.java
trunk/src/main/org/jboss/seam/navigation/Pages.java
Log:
JBSEAM-3577
Modified: trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2008-10-16 18:52:50 UTC (rev 9359)
+++ trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2008-10-17 10:45:07 UTC (rev 9360)
@@ -1,6 +1,7 @@
package org.jboss.seam.deployment;
import java.io.File;
+import java.util.Set;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
@@ -25,6 +26,8 @@
public static final String NAME = "warRootDeploymentStrategy";
+ private DotPageDotXmlDeploymentHandler dotPageDotXmlDeploymentHandler;
+
public WarRootDeploymentStrategy(ClassLoader classLoader, File warRoot)
{
this.classLoader = classLoader;
@@ -38,7 +41,8 @@
log.warn("Unable to discover war root, .page.xml files won't be found");
this.warRoot = new File[0];
}
- getDeploymentHandlers().put(DotPageDotXmlDeploymentHandler.NAME, new DotPageDotXmlDeploymentHandler());
+ dotPageDotXmlDeploymentHandler = new DotPageDotXmlDeploymentHandler();
+ getDeploymentHandlers().put(DotPageDotXmlDeploymentHandler.NAME, dotPageDotXmlDeploymentHandler);
}
@Override
@@ -67,5 +71,10 @@
{
getScanner().scanDirectories(warRoot);
}
+
+ public Set<String> getDotPageDotXmlFileNames()
+ {
+ return dotPageDotXmlDeploymentHandler.getFiles();
+ }
}
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-16 18:52:50 UTC (rev 9359)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-17 10:45:07 UTC (rev 9360)
@@ -736,16 +736,16 @@
{
try
{
- ServletLifecycle.beginReinitialization(request);
hotDeploymentStrategy = createHotDeployment(Thread.currentThread().getContextClassLoader());
if (hotDeploymentStrategy.isEnabled())
{
hotDeploymentStrategy.scan();
- Init init = Init.instance();
+ Init init = (Init) ServletLifecycle.getServletContext().getAttribute( Seam.getComponentName(Init.class) );
if (init.getTimestamp() < hotDeploymentStrategy.getTimestamp())
{
log.info("redeploying");
+ ServletLifecycle.beginReinitialization(request);
Seam.clearComponentNameCache();
for ( String name: init.getHotDeployableComponents() )
{
@@ -769,20 +769,19 @@
Contexts.getEventContext().set(HotDeploymentStrategy.NAME, hotDeploymentStrategy);
init.setTimestamp( System.currentTimeMillis() );
installComponents(init);
+ ServletLifecycle.endReinitialization();
log.info("done redeploying");
}
WarRootDeploymentStrategy warRootDeploymentStrategy = new WarRootDeploymentStrategy(Thread.currentThread().getContextClassLoader(), warRoot);
warRootDeploymentStrategy.scan();
- Contexts.getEventContext().set(WarRootDeploymentStrategy.NAME, warRootDeploymentStrategy);
- Pages pages = Pages.instance();
+ Pages pages = (Pages) ServletLifecycle.getServletContext().getAttribute(Seam.getComponentName(Pages.class));
if (pages!= null) {
- pages.initialize();
+ pages.initialize(warRootDeploymentStrategy.getDotPageDotXmlFileNames());
}
- Contexts.getApplicationContext().remove(Seam.getComponentName(Exceptions.class));
+ ServletLifecycle.getServletContext().removeAttribute( Seam.getComponentName(Exceptions.class) );
}
- ServletLifecycle.endReinitialization();
}
finally
{
Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-10-16 18:52:50 UTC (rev 9359)
+++ trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-10-17 10:45:07 UTC (rev 9360)
@@ -104,11 +104,25 @@
@Create
public void create()
{
- initialize();
+ if (DotPageDotXmlDeploymentHandler.instance() != null)
+ {
+ initialize(DotPageDotXmlDeploymentHandler.instance().getFiles());
+ }
+ else
+ {
+ initialize();
+ }
}
+
+
public void initialize()
{
+ initialize(null);
+ }
+
+ public void initialize(Set<String> fileNames)
+ {
pagesByViewId = Collections.synchronizedMap(new HashMap<String, Page>());
pageStacksByViewId = Collections.synchronizedMap(new HashMap<String, List<Page>>());
conversations = Collections.synchronizedMap(new HashMap<String, ConversationIdParameter>());
@@ -129,9 +143,9 @@
}
}
- if (DotPageDotXmlDeploymentHandler.instance() != null)
+ if (fileNames != null)
{
- parsePages(DotPageDotXmlDeploymentHandler.instance().getFiles());
+ parsePages(fileNames);
}
}
16 years, 1 month
Seam SVN: r9359 - tags/JBoss_Seam_2_1_0_GA.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-16 14:52:50 -0400 (Thu, 16 Oct 2008)
New Revision: 9359
Modified:
tags/JBoss_Seam_2_1_0_GA/changelog.txt
Log:
changelog
Modified: tags/JBoss_Seam_2_1_0_GA/changelog.txt
===================================================================
--- tags/JBoss_Seam_2_1_0_GA/changelog.txt 2008-10-16 18:51:11 UTC (rev 9358)
+++ tags/JBoss_Seam_2_1_0_GA/changelog.txt 2008-10-16 18:52:50 UTC (rev 9359)
@@ -76,6 +76,8 @@
* [JBSEAM-3556] - Member variable for @UserPrincipal Annotation must be public even if there is a public getter for this member variable with @UserPrincipal Annotation
* [JBSEAM-3560] - seam script uses readlink which is not compatible with the version of readlink shipped with OS X 10.5
* [JBSEAM-3561] - seam-icefaces example hanging with message "Conversation has timed out or expired"
+ * [JBSEAM-3573] - Seam wicket example - IllegalStateException on deploy
+ * [JBSEAM-3574] - excel package missing in root.pom
** Feature Request
* [JBSEAM-1201] - Support for Groovy tests in seam-gen
16 years, 1 month
Seam SVN: r9358 - trunk.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-16 14:51:11 -0400 (Thu, 16 Oct 2008)
New Revision: 9358
Modified:
trunk/changelog.txt
Log:
changelog
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2008-10-16 17:58:02 UTC (rev 9357)
+++ trunk/changelog.txt 2008-10-16 18:51:11 UTC (rev 9358)
@@ -76,6 +76,8 @@
* [JBSEAM-3556] - Member variable for @UserPrincipal Annotation must be public even if there is a public getter for this member variable with @UserPrincipal Annotation
* [JBSEAM-3560] - seam script uses readlink which is not compatible with the version of readlink shipped with OS X 10.5
* [JBSEAM-3561] - seam-icefaces example hanging with message "Conversation has timed out or expired"
+ * [JBSEAM-3573] - Seam wicket example - IllegalStateException on deploy
+ * [JBSEAM-3574] - excel package missing in root.pom
** Feature Request
* [JBSEAM-1201] - Support for Groovy tests in seam-gen
16 years, 1 month
Seam SVN: r9357 - trunk/build.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-10-16 13:58:02 -0400 (Thu, 16 Oct 2008)
New Revision: 9357
Modified:
trunk/build/root.pom.xml
Log:
JBSEAM-3574
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-10-16 17:56:31 UTC (rev 9356)
+++ trunk/build/root.pom.xml 2008-10-16 17:58:02 UTC (rev 9357)
@@ -112,6 +112,13 @@
<artifactId>jboss-seam-debug</artifactId>
<version>@seam.version@</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-excel</artifactId>
+ <version>@seam.version@</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss.seam</groupId>
16 years, 1 month