Seam SVN: r10615 - branches/community/Seam_2_1/seam-gen/icefaces/view.
by seam-commits＠lists.jboss.org
Author: jguglielmin
Date: 2009-04-23 16:33:10 -0400 (Thu, 23 Apr 2009)
New Revision: 10615
Modified:
branches/community/Seam_2_1/seam-gen/icefaces/view/editproperty.xhtml.ftl
Log:
JBSEAM-3299
Modified: branches/community/Seam_2_1/seam-gen/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- branches/community/Seam_2_1/seam-gen/icefaces/view/editproperty.xhtml.ftl 2009-04-23 18:57:37 UTC (rev 10614)
+++ branches/community/Seam_2_1/seam-gen/icefaces/view/editproperty.xhtml.ftl 2009-04-23 20:33:10 UTC (rev 10615)
@@ -13,31 +13,29 @@
<ice:selectInputDate id="${componentProperty.name}"
renderAsPopup="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="date"/>
- </ice:selectInputDate>
+ </ice:selectInputDate>
<#elseif isTime(componentProperty)>
- <ice:inputText id="${componentProperty.name}"
- size="5"
+ <ice:selectInputDate id="${componentProperty.name}"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="time"/>
- </ice:inputText>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ <s:convertDateTime type="time"/>
+ </ice:selectInputDate>
<#elseif isTimestamp(componentProperty)>
- <ice:inputText id="${componentProperty.name}"
- size="16"
+ <ice:selectInputDate id="${componentProperty.name}"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
+ <s:convertDateTime type="both" dateStyle="short"/>
</ice:inputText>
<#elseif isBigDecimal(componentProperty)>
<ice:inputText id="${componentProperty.name}"
@@ -125,61 +123,60 @@
<s:decorate id="${property.name}Field" template="layout/edit.xhtml">
<ui:define name="label">${label(property.name)}</ui:define>
<#if isDate(property)>
- <ice:selectInputDate id="${property.name}"
+ <ice:selectInputDate id="${property.name}"
renderAsPopup="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="date"/>
- </ice:selectInputDate>
+ </ice:selectInputDate>
<#elseif isTime(property)>
- <ice:inputText id="${property.name}"
- size="5"
- partialSubmit="true"
+ <ice:selectInputDate id="${property.name}"
+ partialSubmit="true"
<#if !column.nullable>
required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="time"/>
- </ice:inputText>
+ </ice:selectInputDate>
<#elseif isTimestamp(property)>
- <ice:inputText id="${property.name}"
+ <ice:selectInputDate id="${property.name}"
size="16"
- partialSubmit="true"
+ partialSubmit="true"
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="both" dateStyle="short"/>
- </ice:inputText>
+ </ice:selectInputDate>
<#elseif isBigDecimal(property)>
<ice:inputText id="${property.name}"
- partialSubmit="true"
+ partialSubmit="true"
<#if !column.nullable>
required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}}"
- size="${column.precision+7}">
+ value="${'#'}{${homeName}.instance.${property.name}}"
+ size="${column.precision+7}">
</ice:inputText>
<#elseif isBigInteger(property)>
<ice:inputText id="${property.name}"
partialSubmit="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}"
size="${column.precision+6}"/>
<#elseif isBoolean(property)>
<ice:selectBooleanCheckbox id="${property.name}"
- partialSubmit="true"
+ partialSubmit="true"
<#if !column.nullable>
required="true"
</#if>
@@ -211,12 +208,12 @@
<#assign size = column.length>
</#if>
<ice:inputText id="${property.name}"
- partialSubmit="true"
+ partialSubmit="true"
<#if propertyIsId>
- disabled="${'#'}{${homeName}.managed}"
+ disabled="${'#'}{${homeName}.managed}"
</#if>
<#if !column.nullable>
- required="true"
+ required="true"
</#if>
size="${size}"
maxlength="${column.length}"
@@ -225,7 +222,7 @@
</#if>
<#else>
<ice:inputText id="${property.name}"
- partialSubmit="true"
+ partialSubmit="true"
<#if !column.nullable>
required="true"
</#if>
17 years
Seam SVN: r10614 - branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT.
by seam-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-04-23 14:57:37 -0400 (Thu, 23 Apr 2009)
New Revision: 10614
Modified:
branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po
branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Glassfish.po
Log:
JBSEAM-3767: Italian translation of Seam guide
Modified: branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po
===================================================================
--- branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po 2009-04-23 16:04:24 UTC (rev 10613)
+++ branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po 2009-04-23 18:57:37 UTC (rev 10614)
@@ -6,7 +6,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-18 15:00+0000\n"
-"PO-Revision-Date: 2009-04-23 14:46+0100\n"
+"PO-Revision-Date: 2009-04-23 20:57+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -346,7 +346,7 @@
#: Concepts.xml:270
#, no-c-format
msgid "Since the session context is multithreaded, and often contains volatile state, session scope components are always protected by Seam from concurrent access so long as the Seam interceptors are not disabled for that component. If interceptors are disabled, then any thread-safety that is required must be implemented by the component itself. Seam serializes requests to session scope session beans and JavaBeans by default (and detects and breaks any deadlocks that occur). This is not the default behaviour for application scoped components however, since application scoped components do not usually hold volatile state and because synchronization at the global level is <emphasis>extremely</emphasis> expensive. However, you can force a serialized threading model on any session bean or JavaBean component by adding the <literal>@Synchronized</literal> annotation."
-msgstr ""
+msgstr "Poiché il contesto sessione è multithread, e spesso contiene uno stato volatile, i componenti con scope sessione sono sempre protetti da Seam verso accessi concorrenti fintantoché gli interceptor Seam non vengano disabilitati per quel componente. Se gli interceptor sono disabilitati, allora ogni sicurezza di thread che viene richiesta deve essere implementata dal componente stesso. Seam serializza di default le richieste a bean con scope sessione e JavaBean (e rileva e rompe ogni deadlock che sopravviene). Questo non è il comportamento di default per i componenti con scope applicazione, poiché tali componenti solitamente non mantengono uno stato volatile e poiché la sincronizzazione a livello globale è <emphasis>estremamente</emphasis> dispensiosa. Comunque si può forzare il modello di thread serializzato su un qualsiasi session bean o componente JavaBean aggiungendo l'annotazione <literal>@Synchronized</literal>."
#. Tag: para
#: Concepts.xml:281
@@ -364,7 +364,7 @@
#: Concepts.xml:291
#, no-c-format
msgid "Seam components are POJOs (Plain Old Java Objects). In particular, they are JavaBeans or EJB 3.0 enterprise beans. While Seam does not require that components be EJBs and can even be used without an EJB 3.0 compliant container, Seam was designed with EJB 3.0 in mind and includes deep integration with EJB 3.0. Seam supports the following <emphasis>component types</emphasis>."
-msgstr ""
+msgstr "I componenti Seam sono POJO (Plain Old Java Objects). In particolare sono JavaBean o bean enterprise EJB 3.0. Mentre Seam non richiede che i componenti siano EJB e possono anche essere usati senza un container EJB 3.0, Seam è stato progettato con EJB 3.0 in mente ed realizza una profonda integrazione con EJB 3.0. Seam supporta i seguenti <emphasis>tipi di componenti</emphasis>."
#. Tag: para
#: Concepts.xml:300
@@ -412,31 +412,31 @@
#: Concepts.xml:321
#, no-c-format
msgid "Stateless session bean components are not able to hold state across multiple invocations. Therefore, they usually work by operating upon the state of other components in the various Seam contexts. They may be used as JSF action listeners, but cannot provide properties to JSF components for display."
-msgstr ""
+msgstr "I componenti bean di sessione stateless non sono in grado di mantenere lo stato lungo le diverse invocazioni. Quindi solitamente lavorano operando sullo statto di altri componenti in vari contesti Seam. Possono essere usati come action listener JSF, ma non forniscono proprietà ai componenti JSF da mostrare."
#. Tag: para
#: Concepts.xml:326
#, no-c-format
msgid "Stateless session beans always live in the stateless context."
-msgstr ""
+msgstr "I bean di sessione stateless vivono sempre nel contesto stateless."
#. Tag: para
#: Concepts.xml:329
#, no-c-format
msgid "Stateless session beans can be accessed concurrently as a new instance is used for each request. Assigning the instance to the request is the responsibility of the EJB3 container (normally instances will be allocated from a reusable pool meaning that you may find any instance variables contain data from previous uses of the bean)."
-msgstr ""
+msgstr "Si può accedere ai bean di sessione stateless in modo concorrente poiché viene usata una nuova istanza ad ogni richiesta. L'assegnazione di un'istanza alla richiesta è responsabilità del container EJB3 (normalmente le istanze vengono allocate da un pool riutilizzabile, ciò significa che si possono trovare variabili d'istanza contenenti dati da precedenti utilizzi del bean)."
#. Tag: para
#: Concepts.xml:335
#, no-c-format
msgid "Stateless session beans are the least interesting kind of Seam component."
-msgstr ""
+msgstr "I bean di sessione stateless sono i tipi di componenti Seam meno interessanti."
#. Tag: para
#: Concepts.xml:338
#, no-c-format
msgid "Seam stateless session bean components may be instantiated using <literal>Component.getInstance()</literal> or <literal>@In(create=true)</literal>. They should not be directly instantiated via JNDI lookup or the <literal>new</literal> operator."
-msgstr ""
+msgstr "I bean di sessione stateless Seam possono essere istanziati usando <literal>Component.getInstance()</literal> o <literal>@In(create=true)</literal>. Non dovrebbero essere istanziati direttamente tramite ricerca JNDI o tramite operatore <literal>new</literal>."
#. Tag: title
#: Concepts.xml:346
@@ -448,31 +448,31 @@
#: Concepts.xml:347
#, no-c-format
msgid "Stateful session bean components are able to hold state not only across multiple invocations of the bean, but also across multiple requests. Application state that does not belong in the database should usually be held by stateful session beans. This is a major difference between Seam and many other web application frameworks. Instead of sticking information about the current conversation directly in the <literal>HttpSession</literal>, you should keep it in instance variables of a stateful session bean that is bound to the conversation context. This allows Seam to manage the lifecycle of this state for you, and ensure that there are no collisions between state relating to different concurrent conversations."
-msgstr ""
+msgstr "I componenti bean di sessione stateful sono in grado di mantenere lo stato non solo lungo più invocazioni del bean, ma anche attraverso richieste multiple. Lo stato dell'applicazione che non appartiene al database dovrebbe essere mantenuto dai bean di sessione stateful. Questa è la grande differenza tra Seam e molti altri framework per applicazioni web. Invece di mettere informazioni sulla conversazione corrente direttamente nella <literal>HttpSession</literal>, si dovrebbe mantenerla nelle variabili d'istanza di un bean di sessione stateful, che è legato al contesto conversazione. Questo consente a Seam di gestire il ciclo di vita di questo stato per voi e di assicurare che non ci siano collisioni tra lo stato delle diverse conversazioni concorrenti."
#. Tag: para
#: Concepts.xml:357
#, no-c-format
msgid "Stateful session beans are often used as JSF action listener, and as backing beans that provide properties to JSF components for display or form submission."
-msgstr ""
+msgstr "I bean di sessione stateful sono spesso usati come action listener JSF ed in qualità di backing bean forniscono proprietà ai componenti JSF da mostrare o per l'invio di form."
#. Tag: para
#: Concepts.xml:361
#, no-c-format
msgid "By default, stateful session beans are bound to the conversation context. They may never be bound to the page or stateless contexts."
-msgstr ""
+msgstr "Di default i bean di sessione stateful sono legati al contesto conversazione. Non possono mai essere legati ai contesti pagina o stateless."
#. Tag: para
#: Concepts.xml:365
#, no-c-format
msgid "Concurrent requests to session-scoped stateful session beans are always serialized by Seam as long as the Seam interceptors are not disabled for the bean."
-msgstr ""
+msgstr "Richieste concorrenti a bean di sessione stateful con scope sessione sono sempre serializzati da Seam fintantoché gli interceptor di Seam non vengono disabilitati per tale bean."
#. Tag: para
#: Concepts.xml:370
#, no-c-format
msgid "Seam stateful session bean components may be instantiated using <literal>Component.getInstance()</literal> or <literal>@In(create=true)</literal>. They should not be directly instantiated via JNDI lookup or the <literal>new</literal> operator."
-msgstr ""
+msgstr "I bean di sessione stateful Seam possono essere istanziati usando <literal>Component.getInstance()</literal> o <literal>@In(create=true)</literal>. Non dovrebbero essere istanziati direttamente tramite ricerca JNDI o tramite operatore <literal>new</literal>."
#. Tag: title
#: Concepts.xml:378
@@ -484,7 +484,7 @@
#: Concepts.xml:379
#, no-c-format
msgid "Entity beans may be bound to a context variable and function as a seam component. Because entities have a persistent identity in addition to their contextual identity, entity instances are usually bound explicitly in Java code, rather than being instantiated implicitly by Seam."
-msgstr ""
+msgstr "Gli entity bean possono essere associati ad una variabile di contesto e funzionare come componenti Seam. Poiché gli entity hanno un'identità persistente in aggiunta alla loro identità contestuale, le istanze entity sono solitamente associate esplicitamente nel codice Java, piuttosto che essere istanziate implicitamente da Seam. "
#. Tag: para
#: Concepts.xml:384
@@ -538,7 +538,7 @@
#: Concepts.xml:423
#, no-c-format
msgid "By default, JavaBeans are bound to the event context."
-msgstr ""
+msgstr "Di default i JavaBean sono legati al contesto evento."
#. Tag: para
#: Concepts.xml:426
@@ -550,7 +550,7 @@
#: Concepts.xml:429
#, no-c-format
msgid "Seam JavaBean components may be instantiated using <literal>Component.getInstance()</literal> or <literal>@In(create=true)</literal>. They should not be directly instantiated using the <literal>new</literal> operator."
-msgstr ""
+msgstr "I componenti JavaBean di Seam possono essere istanziati usando <literal>Component.getInstance()</literal> o <literal>@In(create=true)</literal>. Non dovrebbero essere istanziati direttamente tramite operatore <literal>new</literal>."
#. Tag: title
#: Concepts.xml:437
Modified: branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Glassfish.po
===================================================================
--- branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Glassfish.po 2009-04-23 16:04:24 UTC (rev 10613)
+++ branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Glassfish.po 2009-04-23 18:57:37 UTC (rev 10614)
@@ -6,7 +6,7 @@
"Project-Id-Version: Seam_Reference_Guide\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-27 11:29+0000\n"
-"PO-Revision-Date: 2008-12-27 12:50+0100\n"
+"PO-Revision-Date: 2009-04-23 20:44+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -217,7 +217,7 @@
#: Glassfish.xml:238
#, no-c-format
msgid "Select the <literal>OK</literal> button."
-msgstr ""
+msgstr "Selezionare il pulsante <literal>OK</literal>."
#. Tag: para
#: Glassfish.xml:164
@@ -331,7 +331,7 @@
#: Glassfish.xml:271
#, no-c-format
msgid "<para>Configuration file changes</para>"
-msgstr ""
+msgstr "<para>Cambiamenti al file di configurazione</para>"
#. Tag: para
#: Glassfish.xml:276
@@ -367,7 +367,7 @@
#: Glassfish.xml:316
#, no-c-format
msgid "Running <literal>seam-gen</literal> Setup"
-msgstr ""
+msgstr "Eseguire il setup in <literal>seam-gen</literal>"
#. Tag: para
#: Glassfish.xml:318
@@ -559,7 +559,7 @@
#: Glassfish.xml:342
#, no-c-format
msgid "<title>Configuration file changes</title>"
-msgstr ""
+msgstr "<title>Cambiamenti al file di configurazione</title>"
#. Tag: literal
#: Glassfish.xml:347
@@ -871,7 +871,7 @@
#: Glassfish.xml:565
#, no-c-format
msgid "Add Hibernate dependencies"
-msgstr ""
+msgstr "Aggiungere dipendenze Hibernate"
#. Tag: programlisting
#: Glassfish.xml:566
@@ -897,7 +897,7 @@
#: Glassfish.xml:569
#, no-c-format
msgid "Add third party dependencies."
-msgstr ""
+msgstr "Aggiungere dipendenze di terze parti"
#. Tag: programlisting
#: Glassfish.xml:570
@@ -999,5 +999,5 @@
#: Glassfish.xml:604
#, no-c-format
msgid "Checkout the app at <literal>http://localhost:8081/seamgen_example/</literal>"
-msgstr ""
+msgstr "Controllare l'applicazione all'indirizzo <literal>http://localhost:8081/seamgen_example/</literal>"
17 years
Seam SVN: r10613 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/faces.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-04-23 12:04:24 -0400 (Thu, 23 Apr 2009)
New Revision: 10613
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/faces/Redirect.java
Log:
JBPAPP-1920
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/faces/Redirect.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/faces/Redirect.java 2009-04-23 15:25:30 UTC (rev 10612)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/faces/Redirect.java 2009-04-23 16:04:24 UTC (rev 10613)
@@ -94,17 +94,24 @@
}
/**
- * Capture the view id and page parameters from the
- * current request and squirrel them away so we can
- * return here later in the conversation. If no
- * conversation is active, begin a conversation.
+ * Capture the view id, request parameters and page parameters (which take
+ * precedence) from the current request and squirrel them away so we can
+ * return here later in the conversation. If no conversation is active, begin
+ * a conversation. The conversation is terminated by
+ * {@link Redirect#returnToCapturedView()} if begun by this method.
*
* @see Redirect#returnToCapturedView()
*/
public void captureCurrentView()
{
FacesContext context = FacesContext.getCurrentInstance();
- parameters = Pages.instance().getStringValuesFromPageContext(context);
+ if ( context == null ) return;
+
+ // first capture all request parameters
+ parameters.putAll( context.getExternalContext().getRequestParameterMap() );
+ // then preserve page parameters, overwriting request parameters with same names
+ parameters.putAll( Pages.instance().getStringValuesFromPageContext(context) );
+
viewId = Pages.getViewId(context);
conversationBegun = Conversation.instance().begin(true, false);
setDirty();
17 years
Seam SVN: r10612 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-04-23 11:25:30 -0400 (Thu, 23 Apr 2009)
New Revision: 10612
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/QueryParser.java
Log:
JBPAPP-1927
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/QueryParser.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/QueryParser.java 2009-04-23 14:30:16 UTC (rev 10611)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/QueryParser.java 2009-04-23 15:25:30 UTC (rev 10612)
@@ -36,28 +36,23 @@
public QueryParser(String ejbql, int startingParameterNumber)
{
StringTokenizer tokens = new StringTokenizer(ejbql, "#}", true);
- ejbqlBuilder = new StringBuilder( ejbql.length() );
+ ejbqlBuilder = new StringBuilder(ejbql.length());
while ( tokens.hasMoreTokens() )
{
String token = tokens.nextToken();
- if ( "#".equals(token) )
+ if ( "#".equals(token) && tokens.hasMoreTokens() )
{
- if ( !tokens.hasMoreTokens() )
- {
- throw new IllegalArgumentException("query fragment terminates in #");
- }
String expressionToken = tokens.nextToken();
- if ( !expressionToken.startsWith("{") )
+ if ( !expressionToken.startsWith("{") || !tokens.hasMoreTokens() )
{
- throw new IllegalArgumentException("missing { after # in query fragment");
+ ejbqlBuilder.append(token).append(expressionToken);
}
- if ( !tokens.hasMoreTokens() )
+ else
{
- throw new IllegalArgumentException("missing } after expression in query fragment");
+ String expression = token + expressionToken + tokens.nextToken();
+ ejbqlBuilder.append(':').append(getParameterName(startingParameterNumber + parameterValueBindings.size()));
+ parameterValueBindings.add(Expressions.instance().createValueExpression(expression));
}
- String expression = token + expressionToken + tokens.nextToken();
- ejbqlBuilder.append(':').append( getParameterName( startingParameterNumber + parameterValueBindings.size() ) );
- parameterValueBindings.add( Expressions.instance().createValueExpression(expression) );
}
else
{
17 years
Seam SVN: r10611 - in branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting: wrapper and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-04-23 10:30:16 -0400 (Thu, 23 Apr 2009)
New Revision: 10611
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/DateWrapper.java
branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/WrapperFactory.java
Log:
JBPAPP-1919
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2009-04-23 13:35:51 UTC (rev 10610)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2009-04-23 14:30:16 UTC (rev 10611)
@@ -10,6 +10,7 @@
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -656,7 +657,7 @@
else if (type instanceof Class)
{
Class cls = (Class) type;
- if (Date.class.isAssignableFrom(cls))
+ if (Date.class.isAssignableFrom(cls) || Calendar.class.isAssignableFrom(cls))
return "date";
else if (cls.isArray())
return "bag";
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/DateWrapper.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/DateWrapper.java 2009-04-23 13:35:51 UTC (rev 10610)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/DateWrapper.java 2009-04-23 14:30:16 UTC (rev 10611)
@@ -6,55 +6,87 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
/**
* Handles date conversions
- *
+ *
* @author Shane Bryzak
*/
public class DateWrapper extends BaseWrapper implements Wrapper
{
- private static final byte[] DATE_TAG_OPEN = "<date>".getBytes();
- private static final byte[] DATE_TAG_CLOSE = "</date>".getBytes();
- private static final DateFormat df = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-
- public void marshal(OutputStream out) throws IOException
- {
- out.write(DATE_TAG_OPEN);
- out.write(df.format(value).getBytes());
- out.write(DATE_TAG_CLOSE);
- }
-
- public Object convert(Type type)
- throws ConversionException
- {
- if ((type instanceof Class && Date.class.isAssignableFrom((Class) type)) ||
- type.equals(Object.class))
- {
- try {
- value = df.parse(element.getStringValue());
+ private static final byte[] DATE_TAG_OPEN = "<date>".getBytes();
+ private static final byte[] DATE_TAG_CLOSE = "</date>".getBytes();
+
+ private static final String DATE_FORMAT = "yyyyMMddHHmmssSSS";
+
+ private DateFormat getDateFormat()
+ {
+ return new SimpleDateFormat(DATE_FORMAT);
+ }
+
+ public void marshal(OutputStream out) throws IOException
+ {
+ out.write(DATE_TAG_OPEN);
+ if (Date.class.isAssignableFrom(value.getClass()))
+ {
+ out.write(getDateFormat().format(value).getBytes());
}
- catch (ParseException ex) {
- throw new ConversionException(String.format(
- "Date value [%s] is not in a valid format.", element.getStringValue()));
+ else if (Calendar.class.isAssignableFrom(value.getClass()))
+ {
+ out.write(getDateFormat().format(((Calendar) value).getTime()).getBytes());
}
- }
- else
- throw new ConversionException(String.format(
- "Value [%s] cannot be converted to type [%s].", element.getStringValue(),
- type));
-
- return value;
- }
-
- public ConversionScore conversionScore(Class cls)
- {
- if (Date.class.isAssignableFrom(cls))
- return ConversionScore.exact;
- else if (cls.equals(Object.class))
- return ConversionScore.compatible;
- else
- return ConversionScore.nomatch;
- }
+ out.write(DATE_TAG_CLOSE);
+ }
+
+ public Object convert(Type type) throws ConversionException
+ {
+ if ((type instanceof Class && Date.class.isAssignableFrom((Class) type)) || type.equals(Object.class))
+ {
+ try
+ {
+ value = getDateFormat().parse(element.getStringValue());
+ }
+ catch (ParseException ex)
+ {
+ throw new ConversionException(String.format("Date value [%s] is not in a valid format.", element.getStringValue()));
+ }
+ }
+ else if ((type instanceof Class && Calendar.class.isAssignableFrom((Class) type)))
+ {
+ try
+ {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(getDateFormat().parse(element.getStringValue()));
+ value = cal;
+ }
+ catch (ParseException ex)
+ {
+ throw new ConversionException(String.format("Date value [%s] is not in a valid format.", element.getStringValue()));
+ }
+ }
+ else
+ {
+ throw new ConversionException(String.format("Value [%s] cannot be converted to type [%s].", element.getStringValue(), type));
+ }
+
+ return value;
+ }
+
+ public ConversionScore conversionScore(Class cls)
+ {
+ if (Date.class.isAssignableFrom(cls) || Calendar.class.isAssignableFrom(cls))
+ {
+ return ConversionScore.exact;
+ }
+ else if (cls.equals(Object.class))
+ {
+ return ConversionScore.compatible;
+ }
+ else
+ {
+ return ConversionScore.nomatch;
+ }
+ }
}
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/WrapperFactory.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/WrapperFactory.java 2009-04-23 13:35:51 UTC (rev 10610)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/remoting/org/jboss/seam/remoting/wrapper/WrapperFactory.java 2009-04-23 14:30:16 UTC (rev 10611)
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -106,7 +107,7 @@
w = new BooleanWrapper();
else if (obj.getClass().isEnum())
w = new StringWrapper();
- else if (Date.class.isAssignableFrom(obj.getClass()))
+ else if (Date.class.isAssignableFrom(obj.getClass()) || Calendar.class.isAssignableFrom(obj.getClass()))
w = new DateWrapper();
else if (classRegistry.containsKey(obj.getClass()))
{
17 years
Seam SVN: r10610 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-04-23 09:35:51 -0400 (Thu, 23 Apr 2009)
New Revision: 10610
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceContexts.java
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceProvider.java
Log:
JBPAPP-1918
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2009-04-23 12:46:43 UTC (rev 10609)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2009-04-23 13:35:51 UTC (rev 10610)
@@ -22,6 +22,7 @@
import org.jboss.seam.Entity;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Entity.NotEntityException;
+import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -142,6 +143,12 @@
}
@Override
+ public void setRenderFlushMode()
+ {
+ PersistenceContexts.instance().changeFlushMode(FlushModeType.MANUAL, true);
+ }
+
+ @Override
public boolean isDirty(EntityManager entityManager)
{
try
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceContexts.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceContexts.java 2009-04-23 12:46:43 UTC (rev 10609)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceContexts.java 2009-04-23 13:35:51 UTC (rev 10610)
@@ -16,13 +16,15 @@
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.AbstractMutable;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
/**
- * Maintains the set of persistence contexts that have been
- * touched in a conversation.
+ * Maintains the set of persistence contexts that have been touched in a
+ * conversation. Also controls the flush mode used by the persistence contexts
+ * during the render phase.
*
* @author Gavin King
- *
*/
@Name("org.jboss.seam.persistence.persistenceContexts")
@Scope(ScopeType.CONVERSATION)
@@ -31,9 +33,10 @@
public class PersistenceContexts extends AbstractMutable implements Serializable
{
private static final long serialVersionUID = -4897350516435283182L;
+ private static final LogProvider log = Logging.getLogProvider(PersistenceContexts.class);
private Set<String> set = new HashSet<String>();
private FlushModeType flushMode = FlushModeType.AUTO;
- private FlushModeType actualFlushMode = FlushModeType.AUTO;
+ private FlushModeType originalFlushMode;
public FlushModeType getFlushMode()
{
@@ -66,11 +69,18 @@
return null;
}
}
-
+
public void changeFlushMode(FlushModeType flushMode)
{
+ changeFlushMode(flushMode, false);
+ }
+
+ public void changeFlushMode(FlushModeType flushMode, boolean temporary)
+ {
+ if (temporary) {
+ this.originalFlushMode = this.flushMode;
+ }
this.flushMode = flushMode;
- this.actualFlushMode = flushMode;
changeFlushModes();
}
@@ -85,8 +95,10 @@
{
pcm.changeFlushMode(flushMode);
}
- catch (UnsupportedOperationException uoe) {
- //swallow
+ catch (UnsupportedOperationException uoe)
+ {
+ // we won't be nasty and throw and exception, but we'll log a warning to the developer
+ log.warn(uoe.getMessage());
}
}
}
@@ -94,14 +106,17 @@
public void beforeRender()
{
- flushMode = FlushModeType.MANUAL;
- changeFlushModes();
+ // some JPA providers may not support MANUAL flushing
+ // defer the decision to the provider manager component
+ PersistenceProvider.instance().setRenderFlushMode();
}
public void afterRender()
{
- flushMode = actualFlushMode;
- changeFlushModes();
+ if (originalFlushMode != null && originalFlushMode != flushMode) {
+ flushMode = originalFlushMode;
+ changeFlushModes();
+ }
}
}
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceProvider.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceProvider.java 2009-04-23 12:46:43 UTC (rev 10609)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/PersistenceProvider.java 2009-04-23 13:35:51 UTC (rev 10610)
@@ -11,6 +11,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.Entity;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -42,7 +43,28 @@
{
throw new UnsupportedOperationException("For use of FlushMode.MANUAL, please use Hibernate as the persistence provider or use a custom PersistenceProvider");
}
+
/**
+ * <p>
+ * Set the FlushMode the persistence contexts should use during rendering by
+ * calling {@link PersistenceContexts#changeFlushMode(FlushModeType, boolean)}. The
+ * actual changing of the flush mode is handled by the
+ * {@link PersistenceContexts} instance. The boolean argument indicates whether
+ * the flush mode is temporary and should be set to true. The original flush
+ * mode will be restore after rendering is complete.
+ * </p>
+ * <p>
+ * Ideally, this should be MANUAL since changes should never flush to the
+ * database while in render response and the cost of a dirty check can be
+ * avoided. However, since the MANUAL mode is not officially part of the JPA
+ * specification, the default implementation will perform no operation.
+ * </p>
+ */
+ public void setRenderFlushMode() {
+ // no-op in default implementation
+ }
+
+ /**
* Does the persistence context have unflushed changes? If
* it does not, persistence context replication can be
* optimized.
17 years
Seam SVN: r10609 - branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT.
by seam-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-04-23 08:46:43 -0400 (Thu, 23 Apr 2009)
New Revision: 10609
Modified:
branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po
Log:
JBSEAM-3767: Italian translation of Seam guide
Modified: branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po
===================================================================
--- branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po 2009-04-23 12:26:44 UTC (rev 10608)
+++ branches/community/Seam_2_1/doc/Seam_Reference_Guide/it-IT/Concepts.po 2009-04-23 12:46:43 UTC (rev 10609)
@@ -6,7 +6,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-18 15:00+0000\n"
-"PO-Revision-Date: 2009-04-22 12:42+0100\n"
+"PO-Revision-Date: 2009-04-23 14:46+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -328,19 +328,19 @@
#: Concepts.xml:250
#, no-c-format
msgid "Neither the servlet nor EJB specifications define any facilities for managing concurrent requests originating from the same client. The servlet container simply lets all threads run concurrently and leaves enforcing threadsafeness to application code. The EJB container allows stateless components to be accessed concurrently, and throws an exception if multiple threads access a stateful session bean."
-msgstr ""
+msgstr "Né il servlet né le specifiche EJB definiscono dei modi per gestire le richieste correnti originate dallo stesso client. Il servlet container semplicemente lascia girare tutti i thread in modo concorrente e lascia la gestione della sicurezza dei thread al codice dell'applicazione. Il container EJB consente di accedere ai componenti stateless e lancia un'eccezione se dei thread multipli accedono ad un bean di sessione stateful."
#. Tag: para
#: Concepts.xml:256
#, no-c-format
msgid "This behavior might have been okay in old-style web applications which were based around fine-grained, synchronous requests. But for modern applications which make heavy use of many fine-grained, asynchronous (AJAX) requests, concurrency is a fact of life, and must be supported by the programming model. Seam weaves a concurrency management layer into its context model."
-msgstr ""
+msgstr "Questo comportamento potrebbe risultare corretto nel vecchio stile delle applicazioni web, che erano basate su richieste sincrone con granularità fine. Ma per le moderne applicazioni che fanno ampio uso di molte richieste asincrone (AJAX) a granularità fine, la concorrenza è un fattore vitale e deve essere supportato dal modello di programmazione. Seam possiede un layer per la gestione della concorrenza nel suo modello di contesto."
#. Tag: para
#: Concepts.xml:262
#, no-c-format
msgid "The Seam session and application contexts are multithreaded. Seam will allow concurrent requests in a context to be processed concurrently. The event and page contexts are by nature single threaded. The business process context is strictly speaking multi-threaded, but in practice concurrency is sufficiently rare that this fact may be disregarded most of the time. Finally, Seam enforces a <emphasis>single thread per conversation per process</emphasis> model for the conversation context by serializing concurrent requests in the same long-running conversation context."
-msgstr ""
+msgstr "I contesti Seam di sessione e applicazione sono multithread. Seam lascia le richieste concorrenti in un contesto che verrà processato in modo concorrente. I contesti evento e pagina sono per natura a singolo thread. Il contesto business è strettamente multithread, ma in pratica la concorenza è abbastanza rara e questo fatto può essere ignorato per la maggior parte delle volte. Infine Seam forza un modello a <emphasis>singolo thread per conversazione per processo</emphasis> per il contesto conversazione, serializzando le richieste concorrenti nello stesso contesto di conversazione long-running."
#. Tag: para
#: Concepts.xml:270
@@ -830,7 +830,7 @@
#: Concepts.xml:552
#, no-c-format
msgid "<literal>org.jboss.seam.ScopeType</literal> defines an enumeration of possible scopes."
-msgstr ""
+msgstr "<literal>org.jboss.seam.ScopeType</literal> definisce un'enumeration dei possibili scope."
#. Tag: title
#: Concepts.xml:559
@@ -908,7 +908,7 @@
#: Concepts.xml:589
#, no-c-format
msgid "The built-in components may be injected, just like any Seam components, but they also provide convenient static <literal>instance()</literal> methods:"
-msgstr ""
+msgstr "I componenti predefiniti possono essere iniettati, come ogni altro componente Seam, ma possono anche fornire dei metodi statici <literal>instance()</literal> di convenienza."
#. Tag: programlisting
#: Concepts.xml:593
@@ -1034,7 +1034,7 @@
#: Concepts.xml:674
#, no-c-format
msgid "You can even inject the value of an expression:"
-msgstr ""
+msgstr "Si può anche iniettare il valore di un'espressione:"
#. Tag: programlisting
#: Concepts.xml:678
@@ -1058,7 +1058,7 @@
#: Concepts.xml:680
#, no-c-format
msgid "Injected values are disinjected (i.e., set to <literal>null</literal>) immediately after method completion and outjection."
-msgstr ""
+msgstr "I valori iniettati sono disiniettati (cioè impostati a <literal>null</literal>) immediatamente dopo il completamento del metodo e dell'outjection."
#. Tag: para
#: Concepts.xml:685
@@ -1376,7 +1376,7 @@
#: Concepts.xml:862
#, no-c-format
msgid "Who is not totally fed up with seeing noisy code like this?"
-msgstr ""
+msgstr "Chi non è nauseato dal vedere codice incasinato come questo?"
#. Tag: programlisting
#: Concepts.xml:866
@@ -1414,7 +1414,7 @@
#: Concepts.xml:874
#, no-c-format
msgid "Seam provides a logging API that simplifies this code significantly:"
-msgstr ""
+msgstr "Seam fornisce un'API per il logging che semplifica in modo significativo questo codice:"
#. Tag: programlisting
#: Concepts.xml:878
@@ -1438,7 +1438,7 @@
#: Concepts.xml:880
#, no-c-format
msgid "It doesn't matter if you declare the <literal>log</literal> variable static or not — it will work either way, except for entity bean components which require the <literal>log</literal> variable to be static."
-msgstr ""
+msgstr "Non importa se si dichiara la variabile <literal>log</literal> statica o no — funzionerà in entrambi i modi, tranne per i componenti entity bean che richiedono la variabile <literal>log</literal> statica."
#. Tag: para
#: Concepts.xml:886
@@ -1548,7 +1548,7 @@
#: Concepts.xml:945
#, no-c-format
msgid "Or, you can use the <literal>@ReadOnly</literal> annotation to achieve a similar effect:"
-msgstr ""
+msgstr "O si può usare l'annotazione <literal>@ReadOnly</literal> per ottenere un effetto simile:"
#. Tag: programlisting
#: Concepts.xml:949
@@ -1678,7 +1678,7 @@
#: Concepts.xml:990
#, no-c-format
msgid "The second style is a method of type <literal>void</literal> which binds the value to the context variable itself:"
-msgstr ""
+msgstr "Il secondo stile è un metodo di tipo <literal>void</literal> che associa il valore alla variabile di contesto stessa:"
#. Tag: programlisting
#: Concepts.xml:995
17 years
Seam SVN: r10608 - in branches/enterprise/JBPAPP_4_3_FP01/seam-gen: build-scripts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-04-23 08:26:44 -0400 (Thu, 23 Apr 2009)
New Revision: 10608
Modified:
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml
Log:
JBPAPP-1915
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml 2009-04-23 12:12:55 UTC (rev 10607)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml 2009-04-23 12:26:44 UTC (rev 10608)
@@ -21,7 +21,7 @@
<property name="classes.action.dir" value="${war.dir}/${action.dir}" />
<property name="test.dir" value="test-build" />
<property name="bootstrap.dir" value="${basedir}/bootstrap" />
- <property name="deploy.dir" value="${jboss.home}/server/${server.profile}/deploy" />
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy" />
<property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" />
<property name="testng.jar" value="${basedir}/lib/testng.jar" />
<property name="javac.debug" value="true" />
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties 2009-04-23 12:12:55 UTC (rev 10607)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties 2009-04-23 12:26:44 UTC (rev 10608)
@@ -1,2 +1,2 @@
jboss.home =@jbossHome@
-server.profile=production
\ No newline at end of file
+jboss.domain=@jbossDomain@
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml 2009-04-23 12:12:55 UTC (rev 10607)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml 2009-04-23 12:26:44 UTC (rev 10608)
@@ -20,7 +20,7 @@
<property name="war.dir" value="exploded-archives/${project.name}.war" />
<property name="test.dir" value="test-build" />
<property name="bootstrap.dir" value="${basedir}/bootstrap" />
- <property name="deploy.dir" value="${jboss.home}/server/${server.profile}/deploy" />
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy" />
<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" />
<property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" />
<property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" />
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2009-04-23 12:12:55 UTC (rev 10607)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2009-04-23 12:26:44 UTC (rev 10608)
@@ -106,6 +106,7 @@
<filterset id="project">
<filter token="projectName" value="${project.name}" />
<filter token="jbossHome" value="${jboss.home}" />
+ <filter token="jbossDomain" value="${jboss.domain}"/>
<filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/>
<filter token="driverJar" value="${driver.file}"/>
<filter token="skin" value="${richfaces.skin}" />
@@ -141,6 +142,8 @@
<property file="./build.properties" prefix="old" />
<echo message="Welcome to seam-gen :-)"/>
+ <echo message="Answer each question or hit ENTER to accept the default (in brackets)"/>
+ <echo message=""/>
<property name="old.workspace.home" value="C:/Projects"/>
<input addproperty="workspace.home.new"
message="Enter the directory where you want the project to be created (should not contain spaces) [${old.workspace.home}]"
@@ -152,6 +155,11 @@
message="Enter your JBoss home directory [${old.jboss.home}]"
defaultvalue="${old.jboss.home}"/>
<pathFixer property="jboss.home.new" />
+
+ <property name="old.jboss.domain" value="production"/>
+ <input addproperty="jboss.domain.new"
+ message="Enter your JBoss AS domain [${old.jboss.domain}]"
+ defaultvalue="${old.jboss.domain}"/>
<property name="old.project.name" value="myproject"/>
<input addproperty="project.name.new"
@@ -330,7 +338,7 @@
defaultvalue="${old.driver.jar}"/>
<input addproperty="hibernate.connection.driver_class.new"
- message="Enter JDBC driver class for your database [${hibernate.connection.driver_class.default}]"
+ message="Enter the JDBC driver class for your database [${hibernate.connection.driver_class.default}]"
defaultvalue="${hibernate.connection.driver_class.default}"/>
<input addproperty="hibernate.connection.url.new"
@@ -422,7 +430,7 @@
</propertyfile>
<echo message="Installing JDBC driver jar to JBoss server"/>
- <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/${server.profile}/lib"/>
+ <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/${jboss.domain.new}/lib"/>
<echo message="Type 'seam create-project' to create the new project"/>
</target>
17 years
Seam SVN: r10607 - in branches/enterprise/JBPAPP_4_3_FP01/seam-gen: resources/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-04-23 08:12:55 -0400 (Thu, 23 Apr 2009)
New Revision: 10607
Modified:
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/resources/WEB-INF/web.xml
Log:
JBPAPP-1908
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml 2009-04-23 06:44:06 UTC (rev 10606)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml 2009-04-23 12:12:55 UTC (rev 10607)
@@ -27,6 +27,9 @@
<property name="javac.debug" value="true" />
<property name="javac.deprecation" value="false" />
<property name="debug" value="false" />
+ <condition property="is.debug">
+ <istrue value="${debug}"/>
+ </condition>
<fileset id="lib" dir="${lib.dir}">
<include name="*.jar" />
@@ -181,6 +184,7 @@
<fileset dir="${lib.dir}">
<includesfile name="deployed-jars.list"/>
<exclude name="jboss-seam-gen.jar"/>
+ <exclude name="jboss-seam-debug.jar" unless="is.debug"/>
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml 2009-04-23 06:44:06 UTC (rev 10606)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml 2009-04-23 12:12:55 UTC (rev 10607)
@@ -28,6 +28,9 @@
<property name="javac.debug" value="true" />
<property name="javac.deprecation" value="false" />
<property name="debug" value="false" />
+ <condition property="is.debug" value="true">
+ <istrue value="${debug}"/>
+ </condition>
<!--Properties for validating configuration files -->
<property name="validate.resources.dir" value="${basedir}/exploded-archives" />
@@ -123,6 +126,7 @@
<fileset dir="${lib.dir}">
<includesfile name="deployed-jars-war.list" />
<exclude name="jboss-seam-gen.jar" />
+ <exclude name="jboss-seam-debug.jar" unless="is.debug"/>
</fileset>
</copy>
<copy todir="${war.dir}/WEB-INF/classes">
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/resources/WEB-INF/web.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/resources/WEB-INF/web.xml 2009-04-23 06:44:06 UTC (rev 10606)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/resources/WEB-INF/web.xml 2009-04-23 12:12:55 UTC (rev 10607)
@@ -65,7 +65,7 @@
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
+ <param-value>@debug@</param-value>
</context-param>
<!-- JSF -->
17 years
Seam SVN: r10606 - examples/trunk/booking.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-04-23 02:44:06 -0400 (Thu, 23 Apr 2009)
New Revision: 10606
Modified:
examples/trunk/booking/readme.txt
Log:
whitespace
Modified: examples/trunk/booking/readme.txt
===================================================================
--- examples/trunk/booking/readme.txt 2009-04-23 06:43:49 UTC (rev 10605)
+++ examples/trunk/booking/readme.txt 2009-04-23 06:44:06 UTC (rev 10606)
@@ -27,9 +27,9 @@
mvn -f seam-booking-ear/pom.xml jboss:undeploy
-Here's the restart (mega) command:
+Here's the chained restart command:
-mvn -f seam-booking-ear/pom.xml jboss:undeploy && mvn package && mvn -f seam-booking-ear/pom.xml jboss:deploy
+ mvn -f seam-booking-ear/pom.xml jboss:undeploy && mvn package && mvn -f seam-booking-ear/pom.xml jboss:deploy
If you would rather deploy more traditional way by copying the archive directly
to the deploy directory of the JBoss AS domain, use this command instead:
17 years