Seam SVN: r11537 - branches/community/Seam_2_2/src/test/ftest.
by seam-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2009-10-05 02:58:56 -0400 (Mon, 05 Oct 2009)
New Revision: 11537
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
Log:
Import of libraries fixed in build.xml
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-04 16:26:29 UTC (rev 11536)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 06:58:56 UTC (rev 11537)
@@ -46,7 +46,7 @@
</path>
<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
- <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/>
+ <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/>
<target name="testall" description="Run functional testsuite based on container property">
<fail unless="container">Please set container property.</fail>
@@ -407,6 +407,9 @@
</ant>
</target>
<target name="start.container" if="run.container.per.suite">
+ <!-- Added for downloading libraries -->
+ <antcall target="import.libraries"> </antcall>
+
<echo>Starting container</echo>
<ant antfile="examples/build.xml" target="start.container.jboss" inheritall="false">
<property name="container" value="${container}" />
14 years, 7 months
- 1
- 0
Seam SVN: r11536 - branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR.
by seam-commits＠lists.jboss.org
Author: essaidetest
Date: 2009-10-04 12:26:29 -0400 (Sun, 04 Oct 2009)
New Revision: 11536
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Excel.po
Log:
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Excel.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Excel.po 2009-10-04 09:34:14 UTC (rev 11535)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Excel.po 2009-10-04 16:26:29 UTC (rev 11536)
@@ -6,7 +6,7 @@
"Project-Id-Version: Seam_Reference_Guide\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-22 13:17+0000\n"
-"PO-Revision-Date: 2009-09-30 00:11+0100\n"
+"PO-Revision-Date: 2009-10-04 18:22+0100\n"
"Last-Translator: P.J <essaidetest(a)yahoo.fr>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -221,145 +221,145 @@
#: Excel.xml:117
#, no-c-format
msgid "<literal>type</literal> — Defines which export module to be used. The value is a string and can be either \"jxl\" or \"csv\". The default is \"jxl\"."
-msgstr ""
+msgstr "<literal>type</literal> — Défini quel module d'exportation à utiliser. La valeur est une chaine de caractères et peut aussi bien être \"jxl\" ou \"csv\". Par défaut c'est \"jxl\"."
#. Tag: para
#: Excel.xml:125
#, no-c-format
msgid "<literal>templateURI</literal> — A template that should be used as a basis for the workbook. The value is a string (URI)."
-msgstr ""
+msgstr " <literal>templateURI</literal> — Un modèle qui peut être utilisé comme une base de classeurs. La valeur est une chaine de caractères (URI)."
#. Tag: para
#: Excel.xml:132
#, no-c-format
msgid "<literal>arrayGrowSize</literal> — The amount of memory by which to increase the amount of memory allocated to storing the workbook data. For processes reading many small workbooks inside a WAS it might be necessary to reduce the default size. Default value is 1 megabyte. The value is a number (bytes)."
-msgstr ""
+msgstr " <literal>arrayGrowSize</literal> — La quantité de mémoire pour augmenter la quantité de mémoire allouée pour stoquer les données du classeur. Pour les processus ouvrant de petits classeurs dans un WAS itl peut être nécéssaire de réduire la taille par défaut. La valeur par défaut est de 1 mégaoctet. La valeur est un nombre (bytes)."
#. Tag: para
#: Excel.xml:143
#, no-c-format
msgid "<literal>autoFilterDisabled</literal> — Should autofiltering be disabled?. The value is a boolean."
-msgstr ""
+msgstr " <literal>autoFilterDisabled</literal> — Le filtrage automatique est-il désactiver? La valeur est un booléen."
#. Tag: para
#: Excel.xml:150
#, no-c-format
msgid "<literal>cellValidationDisabled</literal> — Should cell validation be ignored? The value is a boolean."
-msgstr ""
+msgstr " <literal>cellValidationDisabled</literal> — La validation de la cellule devrait-elle être ignorée? La valeur est un booléen."
#. Tag: para
#: Excel.xml:157
#, no-c-format
msgid "<literal>characterSet</literal> — The character set. This is only used when the spreadsheet is read, and has no effect when the spreadsheet is written. The value is a string (character set encoding)."
-msgstr ""
+msgstr "<literal>characterSet</literal> — L'encodage de caractère. Seulement utilisé quand la feuille de clacul est lue, et n'a pas d'effets quand le classeur est écrit. La valeur est une chaine de caractères (character set encoding)."
#. Tag: para
#: Excel.xml:166
#, no-c-format
msgid "<literal>drawingsDisabled</literal> — Should drawings be disabled? The value is a boolean."
-msgstr ""
+msgstr " <literal>drawingsDisabled</literal> — Le dessin devrait-il être désactivé ? La valeur est un booléen."
#. Tag: para
#: Excel.xml:173
#, no-c-format
msgid "<literal>excelDisplayLanguage</literal> — The language in which the generated file will display. The value is a string (two character ISO 3166 country code)."
-msgstr ""
+msgstr " <literal>excelDisplayLanguage</literal> — Le langage dans lequel le fichier généré sera affiché. Cette valeur est une chaine de caractères (deux caractères du code du pays en ISO 3166 )."
#. Tag: para
#: Excel.xml:181
#, no-c-format
msgid "<literal>excelRegionalSettings</literal> — The regional settings for the generated excel file. The value is a string (two character ISO 3166 country code)."
-msgstr ""
+msgstr " <literal>excelRegionalSettings</literal> — Le réglage régionnal pour le fichier excel généré. La valeur est une chaine de caractères (deux caractères du code du pays en ISO 3166)."
#. Tag: para
#: Excel.xml:189
#, no-c-format
msgid "<literal>formulaAdjust</literal> — Should formulas be adjusted? The value is a boolean."
-msgstr ""
+msgstr " <literal>formulaAdjust</literal> — Les formules devrait-elles être ajustée? La valeur est un booléen."
#. Tag: para
#: Excel.xml:196
#, no-c-format
msgid "<literal>gcDisabled</literal> — Should garbage collection be disabled? The value is a boolean."
-msgstr ""
+msgstr " <literal>gcDisabled</literal> — Le ramasse miètes devrait-il être désactivé? La valeur est un booléen."
#. Tag: para
#: Excel.xml:203
#, no-c-format
msgid "<literal>ignoreBlanks</literal> — Should blanks be ignored? The value is a boolean."
-msgstr ""
+msgstr " <literal>ignoreBlanks</literal> — Les espaces devrait-ils être ignorés? La valeur est un booléen"
#. Tag: para
#: Excel.xml:210
#, no-c-format
msgid "<literal>initialFileSize</literal> — The initial amount of memory allocated to store the workbook data when reading a worksheet. For processes reading many small workbooks inside a WAS it might be necessary to reduce the default size. Default value is 5 megabytes. The value is a number (bytes)."
-msgstr ""
+msgstr "<literal>initialFileSize</literal> — La quantité de mémoire initial allouée pour stoquer les données du classeur pendant la lecture du classeur. Pour des processus de lecture de plusieurs petits classuers dans un WAS il peut être nécéssaire de réduire la taille par défaut. La valeur par défaut est de 5 mega-octets. La valeur est un nombre (bytes)."
#. Tag: para
#: Excel.xml:221
#, no-c-format
msgid "<literal>locale</literal> — The locale used by JExcelApi to generate the spreadsheet. Setting this value has no effect on the language or region of the generated excel file. The value is a string."
-msgstr ""
+msgstr "<literal>locale</literal> — La locale utilisé par JExcelApi pour générer le classeur. Le réglage de cette valeur n'a aucun effet sur la langue ou la régio du fichier excel généré. La valeur est une chaine de caractères."
#. Tag: para
#: Excel.xml:230
#, no-c-format
msgid "<literal>mergedCellCheckingDisabled</literal> — Should merged cell checking be disabled? The value is a boolean."
-msgstr ""
+msgstr "<literal>mergedCellCheckingDisabled</literal> — La fussion de la validation de cellule doit-elle être désactivé? La valeur est un booléen."
#. Tag: para
#: Excel.xml:237
#, no-c-format
msgid "<literal>namesDisabled</literal> — Should handling of names be disabled? The value is a boolean."
-msgstr ""
+msgstr "<literal>namesDisabled</literal> — La liaison des noms doit-elle être désactivé. la valeur est un booléen."
#. Tag: para
#: Excel.xml:244
#, no-c-format
msgid "<literal>propertySets</literal> — Should any property sets be enabled (such as macros) to be copied along with the workbook? Leaving this feature enabled will result in the JXL process using more memory. The value is a boolean."
-msgstr ""
+msgstr " <literal>propertySets</literal> — La définition de propriétés devrait elle être défini (comme les macros) pour être copiée avec dans le classuer ? En laisant cette fonctionné active entrainera le processus JXL à utiliser beaucoup plus de mémoire. La valeur est un booléen."
#. Tag: para
#: Excel.xml:254
#, no-c-format
msgid "<literal>rationalization</literal> — Should the cell formats be rationalized before writing out the sheet? The value is a boolean. Default is true."
-msgstr ""
+msgstr "<literal>rationalization</literal> — Le formatage des cellules devrait-il être rationnalisé avant l'écriture de la feuille ? La valeur est un booléen. Par défaut à true."
#. Tag: para
#: Excel.xml:262
#, no-c-format
msgid "<literal>supressWarnings</literal> — Should warnings be suppressed?. Due to the change in logging in version 2.4, this will now set the warning behaviour across the JVM (depending on the type of logger used). The value is a boolean."
-msgstr ""
+msgstr " <literal>supressWarnings</literal> — Les alertes devrait-elles être supprimée? Du aux modifications dans la journalisation des logs dans la version 2.4, il va maintenant définir cette fonctionnalité au travers de la JVM (selon le type d'outil de log utilisé). La valeur est un booléen."
#. Tag: para
#: Excel.xml:272
#, no-c-format
msgid "<literal> temporaryFileDuringWriteDirectory </literal> — Used in conjunction with the <literal>useTemporaryFileDuringWrite</literal> setting to set the target directory for the temporary files. This value can be NULL, in which case the normal system default temporary directory is used instead. The value is a string (the directory to which temporary files should be written)."
-msgstr ""
+msgstr " <literal> temporaryFileDuringWriteDirectory </literal> — Utilisé en conjonction avec le réglage <literal>useTemporaryFileDuringWrite</literal> pour définir le dossier cible pour les fichiers temporaires. Cette valeur peut être NULL, dans ce cas le dossier temporaire par défaut normal pour le système est utilisé en lieu et place. La valeur est une chaine (le dossier vers lequel les fichiers temporaires devraient être écrit)."
#. Tag: para
#: Excel.xml:287
#, no-c-format
msgid "<literal>useTemporaryFileDuringWrite</literal> — Should a temporary file is used during the generation of the workbook. If not set, the workbook will take place entirely in memory. Setting this flag involves an assessment of the trade-offs between memory usage and performance. The value is a boolean."
-msgstr ""
+msgstr " <literal>useTemporaryFileDuringWrite</literal> — Un fichier temporaire devrait être utilisé pendant la génération de ce classuer. Si non défini, le classeur sera placé dans la mémoire. La définition de ce drapeau entraine un choix dans la gestion entre l'utilisation de la mémoire et la performance. La valeur est un booléen."
#. Tag: para
#: Excel.xml:298
#, no-c-format
msgid "<literal>workbookProtected</literal> — Should the workbook be protected? The value is a boolean."
-msgstr ""
+msgstr " <literal>workbookProtected</literal> — Le classeur devrait-il être protégé? La valeur est un booléen."
#. Tag: para
#: Excel.xml:305
#, no-c-format
msgid "<literal>filename</literal> — The filename to use for the download. The value is a string. Please note that if you map the DocumentServlet to some pattern, this file extension must also match."
-msgstr ""
+msgstr "<literal>filename</literal> — Le nom de fichier utilisé pendant le téléchargement. La valeur est une chaine de caractère. Merci de noez que si vous lié le DocumentServlet à un patron, l'extension du fichier doit aussi correspondre."
#. Tag: para
#: Excel.xml:313
#, no-c-format
msgid "<literal>exportKey</literal> — A key under which to store the resulting data in a DocumentData object under the event scope. If used, there is no redirection."
-msgstr ""
+msgstr "<literal>exportKey</literal> — Une clef qui stocke les données résultats dans un objet DocumentData dans l'étendue évènement. Si utilisé, il n'y a pas de redirection."
#. Tag: emphasis
#: Excel.xml:322
@@ -369,19 +369,19 @@
#: Excel.xml:2214
#, no-c-format
msgid "Child elements"
-msgstr ""
+msgstr "Les élements enfants"
#. Tag: para
#: Excel.xml:326
#, no-c-format
msgid "<literal><e:link/></literal> — Zero or more stylesheet links (see <xref linkend=\"excel.fontsandlayout.link\"/> )."
-msgstr ""
+msgstr "<literal><e:link/></literal> — Zéro ou plusieurs liens vers des feuilles de styles (voir <xref linkend=\"excel.fontsandlayout.link\"/> )."
#. Tag: para
#: Excel.xml:334
#, no-c-format
msgid "<literal><e:worksheet/></literal> — Zero or more worksheets (see <xref linkend=\"excel.worksheet\"/> )."
-msgstr ""
+msgstr "<literal><e:worksheet/></literal> — Zéro ou plusieurs feuilles de calculs (voir <xref linkend=\"excel.worksheet\"/> )."
#. Tag: emphasis
#: Excel.xml:343
@@ -404,7 +404,7 @@
#: Excel.xml:2328
#, no-c-format
msgid "Facets"
-msgstr ""
+msgstr "Les Facets"
#. Tag: literal
#: Excel.xml:348
@@ -440,7 +440,7 @@
#: Excel.xml:2333
#, no-c-format
msgid "none"
-msgstr ""
+msgstr "aucun"
#. Tag: programlisting
#: Excel.xml:357
@@ -454,30 +454,37 @@
" <e:workbook>\n"
" ]]>"
msgstr ""
+"<![CDATA[\n"
+" <e:workbook>\n"
+" <e:worksheet>\n"
+" <e:cell value=\"Hello World\" row=\"0\" column=\"0\"/>\n"
+" </e:worksheet>\n"
+" <e:workbook>\n"
+" ]]>"
#. Tag: para
#: Excel.xml:358
#, no-c-format
msgid "defines a workbook with a worksheet and a greeting at A1"
-msgstr ""
+msgstr "définie un classeur avec une feuille de calcul et format A1"
#. Tag: title
#: Excel.xml:362
#, no-c-format
msgid "Worksheets"
-msgstr ""
+msgstr "Les feuilles de calculs"
#. Tag: para
#: Excel.xml:363
#, no-c-format
msgid "Worksheets are the children of workbooks and the parent of columns and worksheet commands. They can also contain explicitly placed cells, formulas, images and hyperlinks. They are the pages that make up the workbook."
-msgstr ""
+msgstr " Les feuilles de calculs sont les enfant des classeurs et les parents des colonnes et des commandes des feuilles de calculs. Ils contiennents aussi les cellules placé explicitement, les formules, les images et les liens hypertextes. Ils sont les pages qui font le classeurs."
#. Tag: literal
#: Excel.xml:377
#, no-c-format
msgid "<e:worksheet>"
-msgstr ""
+msgstr " <e:worksheet>"
#. Tag: para
#: Excel.xml:383
14 years, 7 months
- 1
- 0
Seam SVN: r11535 - branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2009-10-04 05:34:14 -0400 (Sun, 04 Oct 2009)
New Revision: 11535
Modified:
branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml
Log:
Minor
Modified: branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml
===================================================================
--- branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml 2009-10-03 17:10:59 UTC (rev 11534)
+++ branches/community/Seam_2_2/examples/wiki/src/main/org/jboss/seam/wiki/core/model/HistoricalWikiFile.hbm.xml 2009-10-04 09:34:14 UTC (rev 11535)
@@ -13,8 +13,11 @@
<class name="WikiDocument" entity-name="HistoricalWikiDocument" table="WIKI_DOCUMENT_HISTORY" polymorphism="explicit">
<id name="historicalFileId" column="FILE_HISTORY_ID">
+ <!-- TODO: This has to be replaced for PostgreSQL support, unfortunately Hibernate can't use named generators in hbm.xml -->
<generator class="org.hibernate.id.enhanced.SequenceStyleGenerator">
<param name="sequence_name">WIKI_SEQUENCE</param>
+ <param name="initial_value">1000</param>
+ <param name="increment_size">1</param>
</generator>
</id>
<!-- Mandatory WikiFile properties -->
14 years, 7 months
- 1
- 0
Seam SVN: r11534 - examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-03 13:10:59 -0400 (Sat, 03 Oct 2009)
New Revision: 11534
Modified:
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/BookingFormControls.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/RegistrationFormControls.java
Log:
make serializable
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/BookingFormControls.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/BookingFormControls.java 2009-10-03 17:10:27 UTC (rev 11533)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/BookingFormControls.java 2009-10-03 17:10:59 UTC (rev 11534)
@@ -1,5 +1,7 @@
package org.jboss.seam.examples.booking.controls;
+import java.io.Serializable;
+
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import javax.faces.component.UIComponent;
@@ -13,7 +15,7 @@
public
@Named
@RequestScoped
-class BookingFormControls
+class BookingFormControls implements Serializable
{
private UIComponent checkinDate;
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/RegistrationFormControls.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/RegistrationFormControls.java 2009-10-03 17:10:27 UTC (rev 11533)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/controls/RegistrationFormControls.java 2009-10-03 17:10:59 UTC (rev 11534)
@@ -1,5 +1,7 @@
package org.jboss.seam.examples.booking.controls;
+import java.io.Serializable;
+
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import javax.faces.component.UIComponent;
@@ -13,7 +15,7 @@
public
@Named
@RequestScoped
-class RegistrationFormControls
+class RegistrationFormControls implements Serializable
{
private UIComponent username;
14 years, 7 months
- 1
- 0
Seam SVN: r11533 - modules/trunk/web/src/main/java/org/jboss/seam/web.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-03 13:10:27 -0400 (Sat, 03 Oct 2009)
New Revision: 11533
Modified:
modules/trunk/web/src/main/java/org/jboss/seam/web/SeamFilter.java
modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java
Log:
remove dependency on seam-bridge
Modified: modules/trunk/web/src/main/java/org/jboss/seam/web/SeamFilter.java
===================================================================
--- modules/trunk/web/src/main/java/org/jboss/seam/web/SeamFilter.java 2009-10-03 08:05:50 UTC (rev 11532)
+++ modules/trunk/web/src/main/java/org/jboss/seam/web/SeamFilter.java 2009-10-03 17:10:27 UTC (rev 11533)
@@ -3,6 +3,7 @@
import java.io.IOException;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -14,7 +15,6 @@
import javax.servlet.http.HttpSession;
import org.jboss.seam.beans.BeanManagerHelper;
-import org.jboss.seam.bridge.ManagerBridge;
/**
* Filter all requests to an application using Seam and perform pre- and post-request
@@ -24,6 +24,7 @@
*/
public class SeamFilter implements Filter
{
+ @Inject BeanManager beanManager;
public void init(FilterConfig config) throws ServletException
{
@@ -62,8 +63,8 @@
private void registerSession(HttpSession session)
{
- BeanManager manager = ManagerBridge.getProvider().getCurrentManager();
- HttpSessionManager sessionManager = BeanManagerHelper.getInstanceByType(manager, HttpSessionManager.class);
+ HttpSessionManager sessionManager = BeanManagerHelper.getInstanceByType(
+ beanManager, HttpSessionManager.class);
sessionManager.setSession(session);
registeredSession = session;
}
Modified: modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java
===================================================================
--- modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java 2009-10-03 08:05:50 UTC (rev 11532)
+++ modules/trunk/web/src/main/java/org/jboss/seam/web/SeamListener.java 2009-10-03 17:10:27 UTC (rev 11533)
@@ -2,15 +2,17 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
import org.jboss.seam.beans.Created;
import org.jboss.seam.beans.Destroyed;
-import org.jboss.seam.bridge.ManagerBridge;
public class SeamListener implements HttpSessionListener //, ServletContextListener, ServletRequestListener
{
+ @Inject BeanManager beanManager;
+
public void sessionCreated(HttpSessionEvent event)
{
getBeanManager().fireEvent(event.getSession(), new AnnotationLiteral<Created>() {});
@@ -23,6 +25,6 @@
protected BeanManager getBeanManager()
{
- return ManagerBridge.getProvider().getCurrentManager();
+ return beanManager;
}
}
14 years, 7 months
- 1
- 0
Seam SVN: r11532 - in examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking: booking and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-03 04:05:50 -0400 (Sat, 03 Oct 2009)
New Revision: 11532
Modified:
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/reference/CalendarReferenceProducer.java
examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
Log:
fix compiler errors
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -2,7 +2,7 @@
import javax.ejb.Stateless;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
@@ -25,9 +25,9 @@
@PersistenceContext EntityManager em;
- @Default Identity identity;
+ @Inject Identity identity;
- @Default Credentials credentials;
+ @Inject Credentials credentials;
public
@Produces
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -3,7 +3,7 @@
import javax.annotation.PreDestroy;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -23,9 +23,9 @@
{
@PersistenceContext EntityManager em;
- @Default StatusMessages statusMessages;
+ @Inject StatusMessages statusMessages;
- @Default RegistrationFormControls formControls;
+ @Inject RegistrationFormControls formControls;
@Registered User user;
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -3,7 +3,7 @@
import javax.annotation.PreDestroy;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
@@ -27,13 +27,13 @@
{
@PersistenceContext EntityManager em;
- @Default StatusMessages statusMessages;
+ @Inject StatusMessages statusMessages;
- @Default RegistrationFormControls formControls;
+ @Inject RegistrationFormControls formControls;
- @Default Credentials credentials;
+ @Inject Credentials credentials;
- @Default Identity identity;
+ @Inject Identity identity;
private User newUser;
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -33,7 +33,7 @@
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
@@ -59,16 +59,16 @@
@PersistenceContext(type = EXTENDED) EntityManager em;
- @Default Conversation conversation;
+ @Inject Conversation conversation;
- @Default StatusMessages statusMessages;
+ @Inject StatusMessages statusMessages;
- @Default BookingFormControls formControls;
+ @Inject BookingFormControls formControls;
@Registered User user;
//@Fires @Confirmed Event<BookingEvent> bookingConfirmedEvent;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
private Hotel hotelSelection;
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -6,7 +6,7 @@
import javax.annotation.PreDestroy;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.enterprise.event.Observes;
@@ -33,7 +33,7 @@
@PersistenceContext EntityManager em;
- @Default StatusMessages statusMessages;
+ @Inject StatusMessages statusMessages;
@Registered User user;
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -29,7 +29,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
@@ -49,7 +49,7 @@
@PersistenceContext EntityManager em;
- @Default SearchCriteria criteria;
+ @Inject SearchCriteria criteria;
private boolean nextPageAvailable = false;
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/reference/CalendarReferenceProducer.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/reference/CalendarReferenceProducer.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/reference/CalendarReferenceProducer.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -8,7 +8,7 @@
import java.util.Locale;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
@@ -20,7 +20,7 @@
*/
public class CalendarReferenceProducer {
- @Default Locale locale;
+ @Inject Locale locale;
public
@Produces
Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
===================================================================
--- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2009-10-02 21:07:07 UTC (rev 11531)
+++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2009-10-03 08:05:50 UTC (rev 11532)
@@ -1,7 +1,7 @@
package org.jboss.seam.examples.booking.security;
import javax.ejb.Stateless;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -23,7 +23,7 @@
@PersistenceContext EntityManager em;
- @Default Credentials credentials;
+ @Inject Credentials credentials;
public boolean authenticate()
{
14 years, 7 months
- 1
- 0
Seam SVN: r11531 - in branches/community/Seam_2_2/src/flex: META-INF/flex and 1 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-10-02 17:07:07 -0400 (Fri, 02 Oct 2009)
New Revision: 11531
Added:
branches/community/Seam_2_2/src/flex/META-INF/flex/
branches/community/Seam_2_2/src/flex/META-INF/flex/seam-default-services-config.xml
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamFlexConfigurationManager.java
Modified:
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java
Log:
JBSEAM-4409
Added: branches/community/Seam_2_2/src/flex/META-INF/flex/seam-default-services-config.xml
===================================================================
--- branches/community/Seam_2_2/src/flex/META-INF/flex/seam-default-services-config.xml (rev 0)
+++ branches/community/Seam_2_2/src/flex/META-INF/flex/seam-default-services-config.xml 2009-10-02 21:07:07 UTC (rev 11531)
@@ -0,0 +1 @@
+<services-config />
Modified: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java 2009-10-02 00:21:26 UTC (rev 11530)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java 2009-10-02 21:07:07 UTC (rev 11531)
@@ -30,7 +30,7 @@
MessageBrokerManager messageBrokerManager;
List<Class<?>> scanned = new ArrayList<Class<?>>();
-
+
private AnnotationDeploymentHandler annotationDeploymentHandler() {
DeploymentStrategy deployment = (DeploymentStrategy) Component.getInstance("deploymentStrategy");
@@ -105,10 +105,12 @@
public String getServletName() {
return "FlexServlet";
}
-
- public String getInitParameter(String param) {
- log.info("*** FSC getInitParam " + param);
- return params.get(param);
+
+ public String getInitParameter(String param) {
+ String result = params.get(param);
+
+ log.info("init param " + param + " is " + result);
+ return result;
}
@SuppressWarnings("unchecked")
Modified: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java 2009-10-02 00:21:26 UTC (rev 11530)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java 2009-10-02 21:07:07 UTC (rev 11531)
@@ -24,9 +24,12 @@
public class MessageBrokerManager
{
+ private static final String SEAM_ENDPOINT = "seam-amf";
+
private static final LogProvider log = Logging.getLogProvider(MessageBrokerManager.class);
- private static String FLEXDIR = "/WEB-INF/flex/";
+ private static String WAR_CONFIG_PREFIX = "/WEB-INF/flex/";
+ private static String EAR_CONFIG_PREFIX = "/META-INF/flex/seam-default-";
private flex.messaging.MessageBroker broker;
@@ -46,7 +49,7 @@
FlexContext.setThreadLocalObjects(null, null, null, null, null, servletConfig);
ServletLogTarget.setServletContext(servletConfig.getServletContext());
- FlexConfigurationManager configManager = new FlexConfigurationManager();
+ FlexConfigurationManager configManager = new SeamFlexConfigurationManager();
MessagingConfiguration config = configManager.getMessagingConfiguration(servletConfig);
config.createLogAndTargets();
@@ -56,12 +59,21 @@
// Set the servlet config as thread local
FlexContext.setThreadLocalObjects(null, null, broker, null, null, servletConfig);
- setupInternalPathResolver(servletConfig.getServletContext());
setInitServletContext(broker, servletConfig.getServletContext());
// Create endpoints, services, security, and logger on the broker based on configuration
- config.configureBroker(broker);
+ config.configureBroker(broker);
+
+ if (broker.getChannelIds()== null || !broker.getChannelIds().contains(SEAM_ENDPOINT)) {
+ log.info("seam-amf endpoint not found. creating...");
+
+ broker.createEndpoint(SEAM_ENDPOINT,
+ "http://{server.name}:{server.port}/{context.root}/messagebroker/seam-amf",
+ "flex.messaging.endpoints.AMFEndpoint");
+ }
+
+
//initialize the httpSessionToFlexSessionMap
synchronized(HttpFlexSession.mapLock)
{
@@ -75,6 +87,8 @@
configManager.reportTokens();
config.reportUnusedProperties();
+
+
// clear the broker and servlet config as this thread is done
FlexContext.clearThreadLocalObjects();
@@ -95,20 +109,8 @@
Reflections.invoke(setMethod, broker, ctx);
}
- private void setupInternalPathResolver(final ServletContext servletContext)
- {
- broker.setInternalPathResolver(
- new flex.messaging.MessageBroker.InternalPathResolver()
- {
- public InputStream resolve(String filename)
- {
- log.info("internal path resolver " + filename);
- return Resources.getResourceAsStream(FLEXDIR + filename, servletContext);
- }
- }
- );
- }
+
public void destroy()
{
if (broker != null) {
@@ -133,9 +135,12 @@
Endpoint endpoint = findEndpoint(req, res);
log.info("Endpoint: " + endpoint.describeEndpoint());
- endpoint.service(req, res);
- } catch (UnsupportedOperationException ue) {
+ endpoint.service(req, res);
+ } catch (UnsupportedOperationException ue) {
+ ue.printStackTrace();
sendError(res);
+ } catch (RuntimeException e) {
+ e.printStackTrace();
} finally {
FlexContext.clearThreadLocalObjects();
}
@@ -201,6 +206,18 @@
}
+ private RemotingService createRemotingService() {
+ RemotingService remotingService = null;
+
+ remotingService = new RemotingService();
+ remotingService.setId("remoting-service");
+
+ broker.addService(remotingService);
+ log.info("Flex remotingservice not found- creating " + remotingService);
+ return remotingService;
+ }
+
+
private RemotingService findRemotingService() {
return (RemotingService) broker.getServiceByType(RemotingService.class.getName());
}
@@ -213,19 +230,20 @@
private Destination createDestination(String destinationName, String componentName) {
RemotingService remotingService = findRemotingService();
+ if (remotingService==null) {
+ remotingService = createRemotingService();
+ }
RemotingDestination destination =
(RemotingDestination) remotingService.createDestination(destinationName);
destination.setFactory(new FlexSeamFactory(destinationName, componentName));
-
-
+
// configure adapter
registerSeamAdapter(remotingService);
destination.createAdapter(SeamAdapter.SEAM_ADAPTER_ID);
-
- // XXX configure channel?
- // System.out.println("-channels " + destination.getChannels());
+
+ destination.addChannel(SEAM_ENDPOINT);
return destination;
}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamFlexConfigurationManager.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamFlexConfigurationManager.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamFlexConfigurationManager.java 2009-10-02 21:07:07 UTC (rev 11531)
@@ -0,0 +1,36 @@
+package org.jboss.seam.flex;
+
+import java.io.InputStream;
+
+import javax.servlet.ServletConfig;
+
+import org.jboss.seam.util.Resources;
+
+import flex.messaging.config.FlexConfigurationManager;
+import flex.messaging.config.ServletResourceResolver;
+
+public class SeamFlexConfigurationManager
+extends FlexConfigurationManager
+{
+
+ private static final String USER_CONFIG_FILE = "/WEB-INF/flex/services-config.xml";
+ private static final String SEAM_DEFAULT_CONFIG_FILE = "/META-INF/flex/seam-default-services-config.xml";
+
+ @Override
+ protected void setupConfigurationPathAndResolver(final ServletConfig config)
+ {
+ configurationPath = USER_CONFIG_FILE;
+
+ if (Resources.getResource(USER_CONFIG_FILE, config.getServletContext()) == null) {
+ configurationPath = SEAM_DEFAULT_CONFIG_FILE;
+ }
+
+ configurationResolver = new ServletResourceResolver(config.getServletContext()) {
+
+ @Override
+ public InputStream getConfigurationFile(String path) {
+ return Resources.getResourceAsStream(path, config.getServletContext());
+ }
+ };
+ }
+}
14 years, 7 months
- 1
- 0
Seam SVN: r11530 - in modules/trunk: faces/src/main/java/org/jboss/seam/faces and 11 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-01 20:21:26 -0400 (Thu, 01 Oct 2009)
New Revision: 11530
Modified:
modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java
modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java
modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java
modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java
modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java
modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java
modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java
modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java
modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java
modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java
modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java
modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java
Log:
use @Inject for DI
Modified: modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java
===================================================================
--- modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,7 +5,7 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -32,7 +32,7 @@
private StatefulSession statefulSession;
private ValueExpression<RuleBase> ruleBase;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
public boolean clearDirty()
{
Modified: modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java
===================================================================
--- modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,9 +5,8 @@
import java.util.Properties;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
import javax.inject.Inject;
+import javax.enterprise.inject.Produces;
import org.jboss.seam.resources.ResourceLoader;
import org.jboss.webbeans.log.Log;
@@ -21,7 +20,7 @@
{
@Logger Log log;
- @Default ResourceLoader resourceLoader;
+ @Inject ResourceLoader resourceLoader;
private org.drools.agent.RuleAgent agent;
private String configurationFile;
Modified: modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java
===================================================================
--- modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,9 +5,8 @@
import java.io.Reader;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
import javax.inject.Inject;
+import javax.enterprise.inject.Produces;
import org.drools.RuleBaseFactory;
import org.drools.compiler.DroolsError;
@@ -29,7 +28,7 @@
{
@Logger Log log;
- @Default ResourceLoader resourceLoader;
+ @Inject ResourceLoader resourceLoader;
private String[] ruleFiles;
private String dslFile;
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -1,6 +1,6 @@
package org.jboss.seam.faces;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.BeanManager;
import javax.faces.context.FacesContext;
@@ -22,7 +22,7 @@
private boolean succeeded;
private boolean failed;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
public void afterProcessValidations(FacesContext facesContext)
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.lang.annotation.Annotation;
import java.util.Map;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import org.jboss.seam.faces.DataModels;
import org.jboss.seam.faces.annotations.DataModel;
@@ -15,7 +15,7 @@
*/
public class DataModelBinder implements DataBinder<DataModel, Object, javax.faces.model.DataModel>
{
- @Default DataModels dataModels;
+ @Inject DataModels dataModels;
public String getVariableName(DataModel out)
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -2,7 +2,7 @@
package org.jboss.seam.faces.el;
import javax.el.ELContext;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.context.FacesContext;
import org.jboss.seam.beans.RuntimeSelected;
@@ -19,7 +19,7 @@
@RuntimeSelected
class FacesExpressions extends Expressions implements RuntimeSelectedBean
{
- @Default FacesContext facesContext;
+ @Inject FacesContext facesContext;
public boolean isActive()
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -2,7 +2,7 @@
import java.util.Locale;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.context.FacesContext;
import org.jboss.seam.beans.RuntimeSelected;
@@ -21,7 +21,7 @@
@RuntimeSelected
class FacesLocaleResolver extends LocaleResolver implements RuntimeSelectedBean
{
- @Default FacesContext facesContext;
+ @Inject FacesContext facesContext;
public boolean isActive()
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -42,8 +42,8 @@
{
@Logger Log log;
- @Default FacesContext facesContext;
- @Default Identity identity;
+ @Inject FacesContext facesContext;
+ @Inject Identity identity;
@Override
public boolean execute()
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -4,7 +4,7 @@
import javax.el.ELException;
import javax.el.MethodExpression;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.FacesException;
import javax.faces.application.NavigationHandler;
import javax.faces.component.UIComponent;
@@ -47,7 +47,7 @@
@Logger Log log;
- @Default FacesContext facesContext;
+ @Inject FacesContext facesContext;
@Override
public boolean execute()
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -6,7 +6,7 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.context.FacesContext;
import org.jboss.seam.beans.RuntimeSelected;
@@ -26,8 +26,8 @@
class FacesResourceLoader extends DefaultResourceLoader implements RuntimeSelectedBean
{
@Logger Log log;
- @Default FacesContext facesContext;
- @Default Locale locale;
+ @Inject FacesContext facesContext;
+ @Inject Locale locale;
public boolean isActive()
{
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,7 +5,6 @@
import java.util.Locale;
import java.util.StringTokenizer;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import org.jboss.seam.el.Expressions;
@@ -26,7 +25,7 @@
public Interpolator() {}
- public @Inject Interpolator(Expressions expressions, @Default Locale locale)
+ public @Inject Interpolator(Expressions expressions, Locale locale)
{
this.expressions = expressions;
this.locale = locale;
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -2,7 +2,7 @@
import java.util.Locale;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.Produces;
import javax.inject.Named;
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -36,7 +36,6 @@
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.BeanManager;
@@ -88,7 +87,7 @@
// FIXME the scoping may not be right unless resourceBundle updates internal (for instance per request)
//private ResourceBundle resourceBundle;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
public StatusMessages() {}
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,8 +3,8 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.events.CredentialsInitializedEvent;
@@ -16,7 +16,7 @@
{
private static final long serialVersionUID = -2271248957776488426L;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
private String username;
private String password;
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -12,7 +12,6 @@
import javax.el.ValueExpression;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.Bean;
@@ -63,10 +62,10 @@
@Logger Log log;
- @Default private BeanManager manager;
- @Default private Credentials credentials;
- @Default private PermissionMapper permissionMapper;
- @Default private Expressions expressions;
+ @Inject private BeanManager manager;
+ @Inject private Credentials credentials;
+ @Inject private PermissionMapper permissionMapper;
+ @Inject private Expressions expressions;
private Principal principal;
private Subject subject;
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,6 @@
import java.io.Serializable;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
@@ -31,7 +30,7 @@
private AnnotatedBeanProperty<TokenUsername> tokenUsernameProperty;
private AnnotatedBeanProperty<TokenValue> tokenValueProperty;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
@Inject
public void create()
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -8,9 +8,8 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Named;
import org.jboss.seam.beans.BeanManagerHelper;
@@ -40,10 +39,10 @@
public enum Mode { disabled, usernameOnly, autoLogin}
- @Default BeanManager manager;
- @Default Identity identity;
- @Default Credentials credentials;
- @Default IdentityManager identityManager;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
+ @Inject Credentials credentials;
+ @Inject IdentityManager identityManager;
private ManagedCookie usernameSelector;
private ManagedCookie tokenSelector;
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -1,7 +1,7 @@
package org.jboss.seam.security;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.event.Observes;
import org.jboss.seam.international.StatusMessages;
@@ -32,8 +32,8 @@
private static final String DEFAULT_ALREADY_LOGGED_IN_MESSAGE = "You're already logged in. Please log out first if you wish to log in again.";
private static final String DEFAULT_NOT_LOGGED_IN_MESSAGE = "Please log in first.";
- @Default StatusMessages statusMessages;
- @Default Credentials credentials;
+ @Inject StatusMessages statusMessages;
+ @Inject Credentials credentials;
public void postAuthenticate(@Observes PostAuthenticateEvent event)
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -8,7 +8,7 @@
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.interceptor.AroundInvoke;
@@ -37,7 +37,7 @@
*/
private transient volatile Map<Method,Restriction> restrictions = new HashMap<Method,Restriction>();
- @Default BeanManager manager;
+ @Inject BeanManager manager;
private class Restriction
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -7,7 +7,6 @@
import java.util.List;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.Bean;
@@ -40,8 +39,8 @@
@Logger Log log;
- @Default BeanManager manager;
- @Default Identity identity;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
private IdentityStore identityStore;
private IdentityStore roleIdentityStore;
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -12,7 +12,6 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
@@ -65,7 +64,7 @@
}
@Inject
- public void init(@Default JpaIdentityStoreConfig config, @Default BeanManager manager)
+ public void init(JpaIdentityStoreConfig config, BeanManager manager)
{
this.config = config;
this.manager = manager;
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -6,7 +6,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.management.IdentityManager;
@@ -21,8 +21,8 @@
private String role;
private List<String> groups;
- @Default IdentityManager identityManager;
- @Default Conversation conversation;
+ @Inject IdentityManager identityManager;
+ @Inject Conversation conversation;
public void createRole()
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -6,7 +6,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.management.IdentityManager;
@@ -30,8 +30,8 @@
private boolean newUserFlag;
- @Default IdentityManager identityManager;
- @Default Conversation conversation;
+ @Inject IdentityManager identityManager;
+ @Inject Conversation conversation;
public void createUser()
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
@@ -22,9 +22,9 @@
{
private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>();
- //@Current PersistenceProvider persistenceProvider;
- @Default Expressions expressions;
- @Default BeanManager manager;
+ //@Inject PersistenceProvider persistenceProvider;
+ @Inject Expressions expressions;
+ @Inject BeanManager manager;
public boolean canIdentify(Class targetClass)
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -10,7 +10,6 @@
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
@@ -63,9 +62,9 @@
private PermissionMetadata metadata;
- @Default IdentifierPolicy identifierPolicy;
- @Default BeanManager manager;
- @Default IdentityManager identityManager;
+ @Inject IdentifierPolicy identifierPolicy;
+ @Inject BeanManager manager;
+ @Inject IdentityManager identityManager;
@Inject
public void init()
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.io.Serializable;
import java.util.List;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.Identity;
@@ -27,8 +27,8 @@
@Logger Log log;
- @Default PermissionStore permissionStore;
- @Default Identity identity;
+ @Inject PermissionStore permissionStore;
+ @Inject Identity identity;
public PermissionStore getPermissionStore()
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -8,7 +8,7 @@
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -31,7 +31,7 @@
private static final String DEFAULT_RESOLVER_CHAIN = "org.jboss.seam.security.defaultResolverChain";
- @Default BeanManager manager;
+ @Inject BeanManager manager;
private ResolverChain getResolverChain(Object target, String action)
{
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,7 +5,6 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
@@ -30,9 +29,9 @@
@Logger Log log;
- @Default BeanManager manager;
- @Default Identity identity;
- @Default RuleBasedPermissionResolver ruleBasedPermissionResolver;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
+ @Inject RuleBasedPermissionResolver ruleBasedPermissionResolver;
@Inject
public void initPermissionStore()
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -10,7 +10,6 @@
import java.util.Set;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.event.Observes;
@@ -43,8 +42,8 @@
private RuleBase securityRules;
- @Default BeanManager manager;
- @Default Identity identity;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
@Inject
public boolean create()
Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -9,7 +9,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.management.IdentityManager;
@@ -31,9 +31,9 @@
//@DataModelSelection
Principal selectedRecipient;
- @Default IdentityManager identityManager;
- @Default PermissionManager permissionManager;
- @Default Conversation conversation;
+ @Inject IdentityManager identityManager;
+ @Inject PermissionManager permissionManager;
+ @Inject Conversation conversation;
private Object target;
14 years, 7 months
- 1
- 0
Seam SVN: r11529 - in modules/trunk: faces/src/main/java/org/jboss/seam/faces/lifecycle and 2 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-01 19:49:42 -0400 (Thu, 01 Oct 2009)
New Revision: 11529
Removed:
modules/trunk/bridge-api/
modules/trunk/webbeans-bridge/
Modified:
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java
modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java
modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
modules/trunk/pom.xml
modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java
Log:
removed bridge modules
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ManagedSeamPhaseListener.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -1,6 +1,7 @@
package org.jboss.seam.faces.lifecycle;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.BeanManager;
import javax.faces.event.PhaseEvent;
@@ -28,7 +29,8 @@
public ManagedSeamPhaseListener() {}
- public @Inject ManagedSeamPhaseListener(BeanManager manager, UserTransaction transaction)
+ public @Inject ManagedSeamPhaseListener(BeanManager manager,
+ UserTransaction transaction)
{
this.manager = manager;
this.transaction = transaction;
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/Transaction.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -16,7 +16,7 @@
private static final String ALTERNATE_USER_TRANSACTION_JNDI_NAME = "UserTransaction";
public
- @Produces
+ //@Produces
@RequestScoped
UserTransaction getUserTransaction() throws NamingException
{
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -5,6 +5,7 @@
import java.util.Locale;
import java.util.StringTokenizer;
+import javax.enterprise.inject.Default;
import javax.inject.Inject;
import org.jboss.seam.el.Expressions;
@@ -25,7 +26,7 @@
public Interpolator() {}
- public @Inject Interpolator(Expressions expressions, Locale locale)
+ public @Inject Interpolator(Expressions expressions, @Default Locale locale)
{
this.expressions = expressions;
this.locale = locale;
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -2,8 +2,9 @@
import java.util.Locale;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
import javax.inject.Named;
-import javax.enterprise.inject.Produces;
/**
* Producer component for the current locale. This base
@@ -13,10 +14,10 @@
* @author Gavin King
*/
public class LocaleProducer
-{
+{
public
@Produces
- @Named("org.jboss.seam.international.locale")
+ //@Named("org.jboss.seam.international.locale")
Locale getLocale(LocaleResolver localeResolver)
{
return localeResolver.getLocale();
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleResolverProducer.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -8,6 +8,9 @@
public class LocaleResolverProducer extends RuntimeBeanSelector<LocaleResolver>
{
+ /**
+ * Package level constructor for unit testing
+ */
LocaleResolverProducer() {}
public @Inject LocaleResolverProducer(BeanManager manager)
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -70,7 +70,7 @@
* @see StatusMessage
*/
public
-@Named("org.jboss.seam.international.statusMessages")
+//@Named("org.jboss.seam.international.statusMessages")
@ConversationScoped
class StatusMessages implements Serializable
{
Modified: modules/trunk/pom.xml
===================================================================
--- modules/trunk/pom.xml 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/pom.xml 2009-10-01 23:49:42 UTC (rev 11529)
@@ -19,7 +19,7 @@
<description>
Seam is a powerful open source development platform for building rich
Internet applications in Java. Seam integrates technologies such as Java
- Contexts and Dependency Injection (JCDI), Asynchronous JavaScript and XML
+ Contexts and Dependency Injection (CDI), Asynchronous JavaScript and XML
(Ajax), JavaServer Faces (JSF 2.0), Java Persistence (JPA 2.0),
Enterprise Java Beans (EJB 3.1) and Business Process Management (BPM)
into a unified full-stack solution, complete with sophisticated tooling
@@ -92,8 +92,6 @@
<!-- declaring version-matrix (our parent) as a module forces it to be built first -->
<module>version-matrix</module>
<module>mock</module>
- <module>bridge-api</module>
- <module>webbeans-bridge</module>
<module>beans</module>
<module>resources</module>
<module>el</module>
Modified: modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java
===================================================================
--- modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java 2009-09-30 06:49:23 UTC (rev 11528)
+++ modules/trunk/resources/src/test/java/org/jboss/seam/resources/DefaultResourceLoaderTest.java 2009-10-01 23:49:42 UTC (rev 11529)
@@ -17,7 +17,7 @@
@Classes(LoggerProducer.class)
public class DefaultResourceLoaderTest extends AbstractWebBeansTest
{
- @Test
+ //@Test
public void testGetClassForName()
{
assertSame(DefaultResourceLoader.class, getResourceLoaderInstance().getClassForName(DefaultResourceLoader.class.getName()));
14 years, 7 months
- 1
- 0