Seam SVN: r11193 - branches/community/Seam_2_2/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-06-23 11:25:01 -0400 (Tue, 23 Jun 2009)
New Revision: 11193
Modified:
branches/community/Seam_2_2/seam-gen/README
Log:
document add-ivy and add-identity-management
Modified: branches/community/Seam_2_2/seam-gen/README
===================================================================
--- branches/community/Seam_2_2/seam-gen/README 2009-06-23 14:52:55 UTC (rev 11192)
+++ branches/community/Seam_2_2/seam-gen/README 2009-06-23 15:25:01 UTC (rev 11193)
@@ -139,3 +139,23 @@
that allow them to be managed.
Example: seam generate
+
+ add-identity-management
+ Adds Seam's identity management support to an existing project. The
+ command modifies the component descriptor to activate the identity
+ management components, generates annotated User and UserRole entities,
+ and wires the identity management components to these entities. The
+ command also generates an administrative interface to manage the users
+ and roles.
+
+ Example: seam add-identity-management
+
+ add-ivy
+ Alters an existing project to use Ivy to manage the dependencies. The
+ command adds Ivy configuration files and a cooresponding Ant build file.
+ The Ant tasks invoke Ivy to download the dependency sets required to
+ build, test and deploy the application. The step of downloading the
+ dependencies is kept separate from the build life cycle.
+
+ Example: seam add-ivy
+
15 years, 5 months
Seam SVN: r11192 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-06-23 10:52:55 -0400 (Tue, 23 Jun 2009)
New Revision: 11192
Added:
tags/JBPAPP_4_3_CP05_FP_CR1/
Log:
tagged EAP 4.3 CP05 FP01 CR1
Copied: tags/JBPAPP_4_3_CP05_FP_CR1 (from rev 11191, branches/enterprise/JBPAPP_4_3_FP01)
15 years, 5 months
Seam SVN: r11191 - branches/enterprise/JBPAPP_4_3_FP01/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-06-23 09:48:15 -0400 (Tue, 23 Jun 2009)
New Revision: 11191
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
Log:
added exclusion for org.hibernate:hibernate
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2009-06-23 11:27:11 UTC (rev 11190)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2009-06-23 13:48:15 UTC (rev 11191)
@@ -250,6 +250,12 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<version>3.2.5.SP5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
15 years, 5 months
Seam SVN: r11190 - in sandbox/trunk/modules/xwidgets: src/main/javascript and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-06-23 07:27:11 -0400 (Tue, 23 Jun 2009)
New Revision: 11190
Modified:
sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Label.js
sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js
sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
Log:
fixes for IE
Modified: sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Label.js
===================================================================
--- sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Label.js 2009-06-23 09:06:16 UTC (rev 11189)
+++ sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Label.js 2009-06-23 11:27:11 UTC (rev 11190)
@@ -16,7 +16,8 @@
if (this.control == null)
{
this.control = document.createTextNode(this.value);
- this.control.widget = this;
+ // IE doesn't support setting random properties on text nodes
+ // this.control.widget = this;
this.parent.control.appendChild(this.control);
}
}
Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js 2009-06-23 09:06:16 UTC (rev 11189)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js 2009-06-23 11:27:11 UTC (rev 11190)
@@ -16,7 +16,8 @@
if (this.control == null)
{
this.control = document.createTextNode(this.value);
- this.control.widget = this;
+ // IE doesn't support setting random properties on text nodes
+ // this.control.widget = this;
this.parent.control.appendChild(this.control);
}
}
Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js 2009-06-23 09:06:16 UTC (rev 11189)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js 2009-06-23 11:27:11 UTC (rev 11190)
@@ -99,7 +99,21 @@
xw.Sys.chainEvent = function(ctl, eventName, eventFunc)
{
- return ctl.addEventListener(eventName, eventFunc, false);
+ if (ctl.addEventListener)
+ {
+ // normal browsers like firefox, chrome and safari support this
+ ctl.addEventListener(eventName, eventFunc, false);
+ }
+ else if (ctl.attachEvent)
+ {
+ // irregular browsers such as IE don't support standard functions
+ ctl.attachEvent("on" + eventName, eventFunc);
+ }
+ else
+ {
+ // really old browsers
+ // alert("your browser doesn't support adding event listeners");
+ }
}
/**
@@ -188,19 +202,15 @@
for (var i = 0; i < elements.length; i++)
{
var element = elements.item(i);
- if (element instanceof Element)
+ if (element.nodeType != 1) continue; // not an element
+ if (element.tagName == "event") continue; // ignore events
+ var controlName = xw.Sys.capitalize(element.tagName);
+ if (!xw.Sys.arrayContains(this.controls, controlName))
{
- if (element.tagName != "event")
- {
- var controlName = xw.Sys.capitalize(element.tagName);
- if (!xw.Sys.arrayContains(this.controls, controlName))
- {
- this.controls.push(controlName);
- }
-
- this.parseChildNodes(element.childNodes);
- }
- }
+ this.controls.push(controlName);
+ }
+
+ this.parseChildNodes(element.childNodes);
}
}
@@ -216,10 +226,9 @@
{
for (var i = 0; i < children.length; i++)
{
- if (children.item(i) instanceof Element)
- {
- this.parseControl(children.item(i), parentControl);
- }
+ var element = children.item(i);
+ if (element.nodeType != 1) continue; // not an element
+ this.parseControl(element, parentControl);
}
}
@@ -248,15 +257,12 @@
}
parentControl.children.push(control);
- if (element.hasAttributes())
+ // Set control properties
+ for (var i = 0; i < element.attributes.length; i++)
{
- // Set control properties
- for (var i = 0; i < element.attributes.length; i++)
- {
- var name = element.attributes[i].name;
- var value = element.getAttribute(name);
- control[name] = value;
- }
+ var name = element.attributes[i].name;
+ var value = element.getAttribute(name);
+ control[name] = value;
}
this.parseChildren(element.childNodes, control);
@@ -271,23 +277,24 @@
for (var i = 0; i < element.childNodes.length; i++)
{
var child = element.childNodes.item(i);
- if (child instanceof Element && child.tagName == "action")
+ if (child.nodeType != 1) continue; // not an element
+ if (child.tagName != "action") continue; // not an action
+ if (child.getAttribute("type") != "script") continue; // not a script
+
+ // get all the text content of the action node, textContent would be
+ // easier but IE doesn't support that
+ var actionScript = "";
+ for (var j = 0; j < child.childNodes.length; j++)
{
- if (child.getAttribute("type") == "script")
- {
- for (var j = 0; j < child.childNodes.length; j++)
- {
- if (child.childNodes[j].nodeType == 4) // CDATA_SECTION_NODE
- {
- var actionScript = child.childNodes[j].nodeValue;
- var action = new xw.Action();
- action.script = actionScript;
- events[eventType] = action;
- }
- }
- }
- break;
+ var grandChild = child.childNodes[j];
+ var nodeType = grandChild.nodeType;
+ if (nodeType != 3 && nodeType != 4) continue; // not TEXT or CDATA
+ actionScript = actionScript + grandChild.nodeValue;
}
+ var action = new xw.Action();
+ action.script = actionScript;
+ events[eventType] = action;
+ break;
}
}
15 years, 5 months
Seam SVN: r11189 - in branches/enterprise/JBPAPP_4_3_FP01/build: embedded and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-06-23 05:06:16 -0400 (Tue, 23 Jun 2009)
New Revision: 11189
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/build.properties
branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
Log:
JBPAPP-2054 upgrade dependencies
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/build.properties
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/build.properties 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/build.properties 2009-06-23 09:06:16 UTC (rev 11189)
@@ -1,7 +1,7 @@
offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repo
embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam-fp/build/embedded
#embedded.dir /home/mnovotny/tmp/export/EMBEDDED_JBOSS_BETA3_SP1/embedded
-embedded.dir /home/mnovotny/workspaces/jbossembedded/EMBEDDED_JBOSS_BETA3/embedded
+embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3/embedded
#embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib
#embedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip
-embedded.version beta3.SP5
\ No newline at end of file
+embedded.version beta3.SP6
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -24,7 +24,7 @@
<property name="maven.settings.xml" location="${build.dir}/settings.xml" />
- <property name="embedded.version" value="beta3.SP4" />
+ <property name="embedded.version" value="beta3.SP6" />
<import file="${build.dir}/utilities.build.xml" />
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency
of hibernate search</description>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP5</version>
+ <version>beta3.SP6</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS.</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2009-06-23 08:57:14 UTC (rev 11188)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2009-06-23 09:06:16 UTC (rev 11189)
@@ -255,13 +255,13 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
- <version>1.4.1.SP11</version>
+ <version>1.4.1.SP13</version>
</dependency>
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.4.5.GA</version>
+ <version>2.4.6.GA</version>
<exclusions>
<exclusion>
<groupId>beanshell</groupId>
@@ -273,7 +273,7 @@
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
- <version>3.2.4.SP1_CP07-brew</version>
+ <version>3.2.4.SP1_CP08-brew</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
@@ -304,7 +304,7 @@
<dependency>
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.1.GA-brew</version>
+ <version>3.3.1.GA_CP01-brew</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -688,7 +688,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP4</version>
+ <version>beta3.SP6</version>
</dependency>
<dependency>
@@ -889,7 +889,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.8patch01-brew</version>
+ <version>1.8.0.8patch02-brew</version>
</dependency>
<dependency>
15 years, 5 months
Seam SVN: r11187 - branches/community/Seam_2_2.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-23 04:55:04 -0400 (Tue, 23 Jun 2009)
New Revision: 11187
Modified:
branches/community/Seam_2_2/readme.txt
Log:
minor
Modified: branches/community/Seam_2_2/readme.txt
===================================================================
--- branches/community/Seam_2_2/readme.txt 2009-06-22 13:57:45 UTC (rev 11186)
+++ branches/community/Seam_2_2/readme.txt 2009-06-23 08:55:04 UTC (rev 11187)
@@ -30,3 +30,4 @@
* Read the documentation in the "doc/reference/en-US" directory
* Read the online FAQ http://www.seamframework.org
+
15 years, 5 months
Seam SVN: r11186 - branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT.
by seam-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-06-22 09:57:45 -0400 (Mon, 22 Jun 2009)
New Revision: 11186
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Controls.po
Log:
Italian translation
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Controls.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Controls.po 2009-06-21 13:37:42 UTC (rev 11185)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Controls.po 2009-06-22 13:57:45 UTC (rev 11186)
@@ -990,7 +990,7 @@
#: Controls.xml:602
#, no-c-format
msgid "Render a HTML <literal><div></literal>."
-msgstr "Generare un <literal><div></literal> HTML."
+msgstr "Genera un <literal><div></literal> HTML."
#. Tag: programlisting
#: Controls.xml:612
@@ -1014,7 +1014,7 @@
#: Controls.xml:619
#, no-c-format
msgid "Render a HTML <literal><span></literal>."
-msgstr "Generare un <literal><span></literal> HTML."
+msgstr "Generare <literal><span></literal> HTML."
#. Tag: para
#: Controls.xml:627
15 years, 5 months
Seam SVN: r11185 - in branches/community/Seam_2_2/src/main/org/jboss/seam: core and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-06-21 09:37:42 -0400 (Sun, 21 Jun 2009)
New Revision: 11185
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/ServletLifecycle.java
branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java
Log:
JBSEAM-4258
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/ServletLifecycle.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2009-06-20 20:48:51 UTC (rev 11184)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2009-06-21 13:37:42 UTC (rev 11185)
@@ -7,6 +7,7 @@
package org.jboss.seam.contexts;
import java.lang.ref.WeakReference;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -30,19 +31,19 @@
*/
public class ServletLifecycle
{
-
+
private static final LogProvider log = Logging.getLogProvider(ServletLifecycle.class);
-
+
private static ServletContext servletContext;
public static final String SERVLET_CONTEXT_KEY = "seam.contexts.servletContext";
-
+
public static ServletContext getServletContext()
{
//don't throw an exception if null, because of unit tests
return servletContext;
}
-
+
public static void beginRequest(HttpServletRequest request)
{
log.debug( ">>> Begin web request" );
@@ -51,7 +52,7 @@
Contexts.applicationContext.set(new ApplicationContext( Lifecycle.getApplication() ) );
Contexts.conversationContext.set(null); //in case endRequest() was never called
}
-
+
public static void endRequest(HttpServletRequest request)
{
log.debug("After request, destroying contexts");
@@ -61,7 +62,7 @@
boolean sessionInvalid = session!=null && session.isInvalid();
Contexts.flushAndDestroyContexts();
-
+
if (sessionInvalid)
{
Lifecycle.clearThreadlocals();
@@ -75,7 +76,7 @@
log.debug( "<<< End web request" );
}
}
-
+
public static void beginReinitialization(HttpServletRequest request)
{
log.debug(">>> Begin re-initialization");
@@ -109,13 +110,13 @@
Contexts.eventContext.set( new BasicContext(ScopeType.EVENT) );
Contexts.conversationContext.set( new BasicContext(ScopeType.CONVERSATION) );
}
-
+
public static void endInitialization()
{
Contexts.startup(ScopeType.APPLICATION);
Events.instance().raiseEvent("org.jboss.seam.postInitialization");
-
+
// Clean up contexts used during initialization
Contexts.destroy( Contexts.getConversationContext() );
Contexts.conversationContext.set(null);
@@ -123,37 +124,37 @@
Contexts.eventContext.set(null);
Contexts.sessionContext.set(null);
Contexts.applicationContext.set(null);
-
+
log.debug("<<< End initialization");
}
-
+
public static void beginApplication(ServletContext context)
{
// caching the classloader to servletContext
WeakReference<ClassLoader> ref = new WeakReference<ClassLoader>(Thread.currentThread().getContextClassLoader());
context.setAttribute("seam.context.classLoader",ref);
log.debug("Cached the context classloader in servletContext as 'seam.context.classLoader'");
-
+ context.setAttribute(SERVLET_CONTEXT_KEY, context);
servletContext = context;
Lifecycle.beginApplication( new ServletApplicationMap(context) );
}
-
+
public static void endApplication()
{
Lifecycle.endApplication();
servletContext=null;
}
-
+
public static void beginSession(HttpSession session)
{
Lifecycle.beginSession( new ServletSessionMap(session), new ServletApplicationMap(session.getServletContext()) );
}
-
+
public static void endSession(HttpSession session)
{
Lifecycle.endSession( new ServletSessionMap(session) );
}
-
+
public static void resumeConversation(HttpServletRequest request)
{
ServerConversationContext conversationContext = new ServerConversationContext( new ServletRequestSessionMap(request) );
@@ -175,5 +176,5 @@
}
return (ServletContext) Contexts.getApplicationContext().get(SERVLET_CONTEXT_KEY);
}
-
+
}
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java 2009-06-20 20:48:51 UTC (rev 11184)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java 2009-06-21 13:37:42 UTC (rev 11185)
@@ -32,7 +32,7 @@
public class ResourceLoader
{
private static final LogProvider log = Logging.getLogProvider(ResourceLoader.class);
-
+
private String[] bundleNames = {"messages"};
/**
@@ -52,12 +52,12 @@
public InputStream getResourceAsStream(String resource)
{
- return Resources.getResourceAsStream( resource, ServletLifecycle.getServletContext() );
+ return Resources.getResourceAsStream( resource, ServletLifecycle.getCurrentServletContext() );
}
-
+
public URL getResource(String resource)
{
- return Resources.getResource( resource, ServletLifecycle.getServletContext() );
+ return Resources.getResource( resource, ServletLifecycle.getCurrentServletContext() );
}
/**
@@ -75,7 +75,7 @@
bundleName,
Locale.instance(),
Thread.currentThread().getContextClassLoader()
- );
+ );
log.debug("loaded resource bundle: " + bundleName);
return bundle;
}
@@ -92,14 +92,14 @@
String concat = bundleNames==null ? "" : Strings.toString( ", ", (Object[]) bundleNames );
return "ResourceBundle(" + concat + ")";
}
-
+
public static ResourceLoader instance()
{
- if (!Contexts.isApplicationContextActive()) {
- return new ResourceLoader();
- } else {
- return (ResourceLoader) Component.getInstance(ResourceLoader.class, ScopeType.STATELESS);
- }
+ if (!Contexts.isApplicationContextActive()) {
+ return new ResourceLoader();
+ } else {
+ return (ResourceLoader) Component.getInstance(ResourceLoader.class, ScopeType.STATELESS);
+ }
}
}
15 years, 5 months
Seam SVN: r11184 - branches/community/Seam_2_2.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-06-20 16:48:51 -0400 (Sat, 20 Jun 2009)
New Revision: 11184
Modified:
branches/community/Seam_2_2/changelog.txt
Log:
update changelog
Modified: branches/community/Seam_2_2/changelog.txt
===================================================================
--- branches/community/Seam_2_2/changelog.txt 2009-06-20 20:48:07 UTC (rev 11183)
+++ branches/community/Seam_2_2/changelog.txt 2009-06-20 20:48:51 UTC (rev 11184)
@@ -15,7 +15,9 @@
* [JBSEAM-4230] - Target eclipseclasspath generates .classpath file with path to local maven repository for tools.jar, while this shouldn't be in maven repo
* [JBSEAM-4244] - fix for JBSEAM-4131 introduced a performance regression
* [JBSEAM-4246] - Addition of numberDepth to p:chapter
+ * [JBSEAM-4258] - Redirect in navigation rules doesn't work
+
** Feature Request
* [JBSEAM-1587] - page parameters: option to bypass model-based validations
* [JBSEAM-3891] - openid fails on port 80
15 years, 5 months
Seam SVN: r11183 - tags/JBoss_Seam_2_2_0_CR1.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-06-20 16:48:07 -0400 (Sat, 20 Jun 2009)
New Revision: 11183
Modified:
tags/JBoss_Seam_2_2_0_CR1/changelog.txt
Log:
update changelog
Modified: tags/JBoss_Seam_2_2_0_CR1/changelog.txt
===================================================================
--- tags/JBoss_Seam_2_2_0_CR1/changelog.txt 2009-06-20 20:43:43 UTC (rev 11182)
+++ tags/JBoss_Seam_2_2_0_CR1/changelog.txt 2009-06-20 20:48:07 UTC (rev 11183)
@@ -15,7 +15,9 @@
* [JBSEAM-4230] - Target eclipseclasspath generates .classpath file with path to local maven repository for tools.jar, while this shouldn't be in maven repo
* [JBSEAM-4244] - fix for JBSEAM-4131 introduced a performance regression
* [JBSEAM-4246] - Addition of numberDepth to p:chapter
+ * [JBSEAM-4258] - Redirect in navigation rules doesn't work
+
** Feature Request
* [JBSEAM-1587] - page parameters: option to bypass model-based validations
* [JBSEAM-3891] - openid fails on port 80
15 years, 5 months