Seam SVN: r14712 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-05-21 07:13:37 -0400 (Mon, 21 May 2012)
New Revision: 14712
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java
Log:
JBSEAM-4943 proper check for SFSBs
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java 2012-05-21 11:04:51 UTC (rev 14711)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java 2012-05-21 11:13:37 UTC (rev 14712)
@@ -6,6 +6,7 @@
import javax.ejb.Stateful;
+import org.jboss.seam.ComponentType;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.annotations.intercept.InterceptorType;
@@ -48,7 +49,7 @@
public boolean isInterceptorEnabled()
{
// JBSEAM-4943
- return getComponent().isSynchronize() && !getComponent().businessInterfaceHasAnnotation(Stateful.class);
+ return getComponent().isSynchronize() && !ComponentType.STATEFUL_SESSION_BEAN.equals(getComponent().getType());
}
}
13 years, 10 months
- 1
- 0
Seam SVN: r14711 - in branches/community/Seam_2_3/examples-ee6: seambay/seambay-web/src/main/webapp and 4 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-05-21 07:04:51 -0400 (Mon, 21 May 2012)
New Revision: 14711
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml
Log:
JBSEAM-4852 - fixed some remaining migrations to JSF2
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -12,7 +12,8 @@
<dt><h:outputText value="#{messages.searchCategory}"/></dt>
<dd>
<h:selectOneMenu value="#{search.category}">
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
<s:selectItems value="#{allCategories.resultList}"
var="category"
label="#{category.name}"/>
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -34,7 +34,8 @@
<h:inputText id="searchTerm" value="#{auctionSearch.searchTerm}" styleClass="searchTerm"/>
<h:selectOneMenu id="selectedCat" value="#{auctionSearch.searchCategory}">
<s:selectItems value="#{categories}" var="cat" label="#{cat.name}" noSelectionLabel="All Categories"/>
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
</h:selectOneMenu>
<br/>
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -25,7 +25,8 @@
<h:inputText id="searchTerm" value="#{auctionSearch.searchTerm}" styleClass="searchTerm"/>
<h:selectOneMenu id="selectedCat" value="#{auctionSearch.searchCategory}">
<s:selectItems value="#{categories}" var="cat" label="#{cat.name}" noSelectionLabel="All Categories"/>
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
</h:selectOneMenu>
<h:commandButton action="#{auctionSearch.queryAuctions}" value="Search"/>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -26,7 +26,8 @@
<tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1" readOnly="#{not identity.loggedIn}" />
<tr:selectOneChoice value="#{disc.artist}" label="Artist" required="true" readOnly="#{not identity.loggedIn}">
<s:selectItems value="#{allArtists.resultList}" var="artist" label="#{artist.name}" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" />
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
</tr:selectOneChoice>
<tr:panelLabelAndMessage label="Details">
<tr:inputText simple="true" value="#{disc.description}" rendered="#{identity.loggedIn}" rows="4" columns="60" id="description">
Modified: branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -132,7 +132,8 @@
<h:selectOneRadio id="radioList"
layout="lineDirection"
value="#{newPayment.paymentFrequency}">
- <s:convertEnum />
+ <!--<s:convertEnum /> -->
+ <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
<s:enumItem id="once" enumValue="ONCE" label="Only Once" />
<s:enumItem id="everyMinute" enumValue="EVERY_MINUTE" label="Every Minute (testing)" />
<s:enumItem id="hourly" enumValue="HOURLY" label="Every Hour (testing)" />
Modified: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -54,7 +54,8 @@
<div class="selectMany">
<h:selectManyListbox id="friends" value="#{imagePermission.selectedFriends}" styleClass="roles" size="6">
<s:selectItems value="#{imagePermission.availableFriends}" var="friend" label="#{friend.memberName}"/>
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
</h:selectManyListbox>
</div>
<div class="validationError"><h:message for="friends"/></div>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -29,7 +29,8 @@
</f:facet>
<h:selectOneMenu value="#{country.continent}">
<s:selectItems value="#{continents.resultList}" var="continent" label="#{continent.name}" />
- <s:convertEntity />
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+ <!-- <s:convertEntity /> -->
</h:selectOneMenu>
</h:column>
</h:dataTable>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -27,7 +27,8 @@
<ui:define name="label">Title</ui:define>
<h:selectOneMenu value="#{person.honorific}">
<s:selectItems value="#{honorifics}" var="honorific" label="#{honorific.label}" noSelectionLabel="Please select" />
- <s:convertEnum />
+ <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
+<!-- look above how JSF 2 changed, no need to create custom Tag <s:convertEnum /> -->
</h:selectOneMenu>
</s:decorate>
@@ -41,15 +42,17 @@
<ui:define name="label">Continent of Birth</ui:define>
<h:selectOneMenu value="#{personHome.instance.continent}" required="true" id="continent">
<s:selectItems value="#{continents.resultList}" var="continent" label="#{continent.name}" noSelectionLabel="Please Select..."/>
- <s:convertEntity />
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectOneMenu>
</s:decorate>
<s:decorate template="decorateField.xhtml">
<ui:define name="label">Country of Birth</ui:define>
<h:selectOneRadio value="#{personHome.instance.country}" required="true" disabled="#{empty person.continent}">
- <s:selectItems value="#{personHome.instance.continent.countries}" var="country" label="#{country.name} (#{country.continent.name})" noSelectionLabel="Please Select..." hideNoSelectionLabel="true"/>
- <s:convertEntity />
+ <s:selectItems value="#{personHome.instance.continent.countries}" var="country" label="#{country.name} (#{country.continent.name})" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" converter="org.jboss.seam.ui.EntityConverter"/>
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectOneRadio>
</s:decorate>
@@ -57,7 +60,8 @@
<ui:define name="label">Roles</ui:define>
<h:selectManyCheckbox value="#{person.roles}" required="true" collectionType="java.util.ArrayList">
<s:selectItems value="#{roles}" var="role" label="#{role.name}"/>
- <s:convertEnum />
+ <f:converter converterId="org.jboss.seam.ui.EnumConverter" />
+<!-- <s:convertEnum /> -->
</h:selectManyCheckbox>
</s:decorate>
@@ -82,8 +86,9 @@
<ui:define name="label">Favourite Colours</ui:define>
<ui:define name="description">A colour is an entity</ui:define>
<h:selectManyListbox value="#{personHome.instance.favouriteColours}" collectionType="java.util.ArrayList">
- <s:selectItems value="#{colours.resultList}" var="colour" label="#{colour.name}" />
- <s:convertEntity />
+ <s:selectItems value="#{colours.resultList}" var="colour" label="#{colour.name}"/>
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectManyListbox>
</s:decorate>
@@ -91,8 +96,9 @@
<ui:define name="label">Favourite Book</ui:define>
<ui:define name="description">A book has a composite key</ui:define>
<h:selectOneListbox value="#{person.favouriteBook}" >
- <s:selectItems value="#{books.resultList}" var="book" label="#{book.name} by #{book.author} (#{book.nationality})" />
- <s:convertEntity />
+ <s:selectItems value="#{books.resultList}" var="book" label="#{book.name} by #{book.author} (#{book.nationality})"/>
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectOneListbox>
</s:decorate>
@@ -100,7 +106,7 @@
<ui:define name="label">Favourite Film</ui:define>
<ui:define name="description">Film uses <code>@Converter(forClass="...")</code> - there is no converter specified in the facelet</ui:define>
<h:selectOneListbox value="#{person.favouriteFilm}">
- <s:selectItems value="#{films.resultList}" var="film" label="#{film.name} directed by #{film.director}" noSelectionLabel="Please Select..."/>
+ <s:selectItems value="#{films.resultList}" var="film" label="#{film.name} directed by #{film.director}" noSelectionLabel="Please Select..." />
</h:selectOneListbox>
</s:decorate>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml 2012-05-21 11:04:12 UTC (rev 14710)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml 2012-05-21 11:04:51 UTC (rev 14711)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:s="http://jboss.org/schema/seam/taglib">
-<head>
+<h:head>
<title>UI Example: #{tagName}</title>
<link href="date.css" rel="stylesheet" type="text/css" />
<style type="text/css">
@@ -67,7 +67,7 @@
}
</style>
<ui:debug id="debug" />
-</head>
+</h:head>
<body>
<s:div styleClass="menu">
13 years, 10 months
- 1
- 0
Seam SVN: r14710 - in branches/community/Seam_2_3: bom and 4 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-05-21 07:04:12 -0400 (Mon, 21 May 2012)
New Revision: 14710
Removed:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java
Modified:
branches/community/Seam_2_3/bom/pom.xml
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/mock/SeamWicketTester.java
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/pom.xml
Log:
cleaned up Seam parent pom and BOM, removed embedded bootstrap
Modified: branches/community/Seam_2_3/bom/pom.xml
===================================================================
--- branches/community/Seam_2_3/bom/pom.xml 2012-05-21 11:03:48 UTC (rev 14709)
+++ branches/community/Seam_2_3/bom/pom.xml 2012-05-21 11:04:12 UTC (rev 14710)
@@ -32,18 +32,18 @@
<properties>
<!-- Version string properties -->
<version.seam>2.3.0.Beta2-SNAPSHOT</version.seam>
- <version.arquillian_core>1.0.0.CR7</version.arquillian_core>
<version.wicket>1.4.14</version.wicket>
<version.drools>5.1.1</version.drools>
<version.resteasy>2.0.1.GA</version.resteasy>
<version.spring>3.1.1.RELEASE</version.spring>
- <version.jbossembedded>beta3.SP15</version.jbossembedded>
<version.jbossas7>7.1.1.Final</version.jbossas7>
<version.jsf2>2.1.7</version.jsf2>
<version.webdriver>0.9.7376</version.webdriver>
<version.infinispan>5.1.3.FINAL</version.infinispan>
<version.junit>4.8.2</version.junit>
<version.testng>5.14.10</version.testng>
+ <version.richfaces>4.2.2.Final</version.richfaces>
+ <version.arquillian_core>1.0.0.Final</version.arquillian_core>
<!-- ***************** -->
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-bom</artifactId>
- <version>4.2.2.Final</version>
+ <version>${version.richfaces}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-21 11:03:48 UTC (rev 14709)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-21 11:04:12 UTC (rev 14710)
@@ -37,7 +37,7 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+<!-- <version>1.6</version> -->
<configuration>
<target>
<jar destfile="${project.build.directory}/${project.artifactId}-wls-compatible.jar">
@@ -340,12 +340,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
<optional>true</optional>
Deleted: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java 2012-05-21 11:03:48 UTC (rev 14709)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java 2012-05-21 11:04:12 UTC (rev 14710)
@@ -1,31 +0,0 @@
-package org.jboss.seam.mock;
-
-import org.jboss.embedded.Bootstrap;
-
-public class EmbeddedBootstrap
-{
-
- public void startAndDeployResources() throws Exception
- {
- Bootstrap bootstrap = Bootstrap.getInstance();
- bootstrap.bootstrap();
-
- if (resourceExists("seam.properties"))
- {
- bootstrap.deployResourceBases("seam.properties");
- }
- if (resourceExists("META-INF/components.xml"))
- {
- bootstrap.deployResourceBases("META-INF/components.xml");
- }
- if (resourceExists("META-INF/seam.properties"))
- {
- bootstrap.deployResourceBases("META-INF/seam.properties");
- }
- }
-
- private boolean resourceExists(String name)
- {
- return Thread.currentThread().getContextClassLoader().getResource(name)!=null;
- }
-}
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-21 11:03:48 UTC (rev 14709)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-21 11:04:12 UTC (rev 14710)
@@ -10,10 +10,6 @@
<artifactId>jboss-seam-ui</artifactId>
<name>Seam UI JSF2 support</name>
- <properties>
-<!-- <version.richfaces>4.2.2.Final</version.richfaces> -->
- </properties>
-
<build>
<!-- <finalName>jboss-seam-ui</finalName> -->
<plugins>
@@ -33,6 +29,7 @@
<library>
<prefix>org.jboss.seam.ui</prefix>
<description>JSF controls for JBoss Seam</description>
+ <!-- This is configured now in java-package.info file in UI component package -->
<!-- <taglib> -->
<!-- <displayName>JBoss Seam UI</displayName> -->
<!-- <shortName>s</shortName> -->
Modified: branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/mock/SeamWicketTester.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/mock/SeamWicketTester.java 2012-05-21 11:03:48 UTC (rev 14709)
+++ branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/mock/SeamWicketTester.java 2012-05-21 11:04:12 UTC (rev 14710)
@@ -19,7 +19,6 @@
import org.jboss.seam.contexts.ServletLifecycle;
import org.jboss.seam.core.Init;
import org.jboss.seam.init.Initialization;
-import org.jboss.seam.mock.EmbeddedBootstrap;
import org.jboss.seam.wicket.SeamWebApplication;
@@ -138,7 +137,7 @@
}
}
ServletContext context = super.newServletContext(path);
- startJbossEmbeddedIfNecessary();
+ //startJbossEmbeddedIfNecessary();
ServletLifecycle.beginApplication(context);
new Initialization(context).create().init();
((Init) context.getAttribute(Seam.getComponentName(Init.class))).setDebug(false);
@@ -159,33 +158,33 @@
private static boolean started;
- protected void startJbossEmbeddedIfNecessary()
- {
- try
- {
- if (!started && embeddedJBossAvailable())
- {
- new EmbeddedBootstrap().startAndDeployResources();
- }
- started = true;
- }
- catch (Exception exception)
- {
- throw new RuntimeException("Failure starting up Embedded Jboss",exception);
- }
- }
+// protected void startJbossEmbeddedIfNecessary()
+// {
+// try
+// {
+// if (!started && embeddedJBossAvailable())
+// {
+// new EmbeddedBootstrap().startAndDeployResources();
+// }
+// started = true;
+// }
+// catch (Exception exception)
+// {
+// throw new RuntimeException("Failure starting up Embedded Jboss",exception);
+// }
+// }
+//
+// private boolean embeddedJBossAvailable()
+// {
+// try
+// {
+// Class.forName("org.jboss.embedded.Bootstrap");
+// return true;
+// }
+// catch (ClassNotFoundException e)
+// {
+// return false;
+// }
+// }
- private boolean embeddedJBossAvailable()
- {
- try
- {
- Class.forName("org.jboss.embedded.Bootstrap");
- return true;
- }
- catch (ClassNotFoundException e)
- {
- return false;
- }
- }
-
}
Modified: branches/community/Seam_2_3/pom.xml
===================================================================
--- branches/community/Seam_2_3/pom.xml 2012-05-21 11:03:48 UTC (rev 14709)
+++ branches/community/Seam_2_3/pom.xml 2012-05-21 11:04:12 UTC (rev 14710)
@@ -54,6 +54,7 @@
<version.emma>2.0.5312</version.emma>
<version.jsf2>2.1.7</version.jsf2>
<version.junit>4.8.2</version.junit>
+ <version.richfaces>4.2.2.Final</version.richfaces>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
@@ -77,104 +78,6 @@
<scope>import</scope>
</dependency>
- <!-- All Seam modules -->
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>distribution</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-reference-guide</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-gen</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ioc</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-mail</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-pdf</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-remoting</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-resteasy</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jul</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-excel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-wicket</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- thirdparty dependencies -->
<dependency>
<groupId>antlr</groupId>
@@ -201,40 +104,7 @@
<version>1.7.0</version>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.10.SP3_seam2</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.SP9</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2.3</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- You should adjust this in the initcore task in build.xml as well -->
<dependency>
<groupId>org.jboss.cache</groupId>
@@ -259,128 +129,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${version.resteasy}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tjws</groupId>
- <artifactId>webserver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scannotation</groupId>
- <artifactId>scannotation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>${version.resteasy}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.stream</groupId>
- <artifactId>sjsxp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jettison-provider</artifactId>
- <version>${version.resteasy}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-atom-provider</artifactId>
- <version>${version.resteasy}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1-jbossorg-1</version>
- </dependency>
-
- <dependency>
<groupId>jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>1.0.0.CR8</version>
@@ -441,44 +189,7 @@
<version>4.2.3.GA</version>
</dependency>
- <!-- Excel export module dependency -->
<dependency>
- <groupId>net.sourceforge.jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>2.6.8-seam</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.yarfraw</groupId>
- <artifactId>yarfraw</artifactId>
- <version>0.92</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.12.0.GA</version>
@@ -514,306 +225,14 @@
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.5.4</version>
- <exclusions>
- <!-- groovy-all imports a lot of stuff, would be better to just use
- specific bits -->
- <exclusion>
- <groupId>bsf</groupId>
- <artifactId>bsf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </exclusion>
- <exclusion>
- <groupId>openejb</groupId>
- <artifactId>openejb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-core</artifactId>
- <version>${version.drools}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-decisiontables</artifactId>
- <version>${version.drools}</version>
- <exclusions>
- <exclusion>
- <groupId>jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-api</artifactId>
- <version>${version.drools}</version>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-templates</artifactId>
- <version>${version.drools}</version>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- <version>${version.drools}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>1.0_02.CR6</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
- <version>${version.jbossembedded}</version>
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <version>1.6.5</version>
- </dependency>
-
-
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2</version>
</dependency>
-
-<!-- <dependency>
- <groupId>jboss.jboss-aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>1.5.0.GA</version>
- </dependency>
--->
<dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-common</artifactId>
- <version>3.2.0.3978</version>
- </dependency>
-
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-proxy</artifactId>
- <version>3.2.0.3978</version>
- </dependency>
-
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-core</artifactId>
- <version>3.2.0.3978</version>
- </dependency>
-
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-remoting</artifactId>
- <version>3.2.0.3978</version>
- </dependency>
-
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>2.1.2</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcmail-jdk14</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext-rtf</artifactId>
- <version>2.1.2</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcmail-jdk14</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>1.0.13</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java-consumer</artifactId>
- <version>0.9.6</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>1.5.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>1.5.2</version>
- </dependency>
-
- <dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1-brew</version>
@@ -831,121 +250,8 @@
<version>2.0b4</version>
</dependency>
- <dependency>
- <groupId>org.tuckey</groupId>
- <artifactId>urlrewritefilter</artifactId>
- <version>3.0.4</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- </exclusion>
- <exclusion>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-ioc</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${version.wicket}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${version.wicket}</version>
- </dependency>
-
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tools</artifactId>
<version>3.2.4.GA</version>
@@ -1055,49 +361,12 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
<version>3.4.2.v_883_R34x</version>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${version.jsf2}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<version>${version.jbossas7}</version>
13 years, 10 months
- 1
- 0
Seam SVN: r14709 - in branches/community/Seam_2_3/jboss-seam-ui: src/main/java/org/jboss/seam/ui and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-05-21 07:03:48 -0400 (Mon, 21 May 2012)
New Revision: 14709
Modified:
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/EntityConverter.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java
Log:
JBSEAM-4875 fixed missing linking of GraphicImage with renderer and missing FacesConverter annotation for EntityConverter
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-20 21:44:27 UTC (rev 14708)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-21 11:03:48 UTC (rev 14709)
@@ -11,7 +11,7 @@
<name>Seam UI JSF2 support</name>
<properties>
- <version.richfaces>4.2.2.Final</version.richfaces>
+<!-- <version.richfaces>4.2.2.Final</version.richfaces> -->
</properties>
<build>
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/EntityConverter.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/EntityConverter.java 2012-05-20 21:44:27 UTC (rev 14708)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/EntityConverter.java 2012-05-21 11:03:48 UTC (rev 14709)
@@ -8,6 +8,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;
+import javax.faces.convert.FacesConverter;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
@@ -26,6 +27,7 @@
@Scope(CONVERSATION)
@Install(precedence = BUILT_IN)
@Converter
+@FacesConverter("org.jboss.seam.ui.EntityConverter")
@BypassInterceptors
public class EntityConverter implements
javax.faces.convert.Converter, Serializable
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2012-05-20 21:44:27 UTC (rev 14708)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2012-05-21 11:03:48 UTC (rev 14709)
@@ -9,7 +9,9 @@
import org.jboss.seam.ui.graphicImage.GraphicImageStore.ImageWrapper;
import org.jboss.seam.ui.util.HTML;
import org.jboss.seam.ui.util.cdk.RendererBase;
+import org.richfaces.cdk.annotations.JsfRenderer;
+@JsfRenderer(type="org.jboss.seam.ui.graphicImage.GraphicImageRenderer", family="org.jboss.seam.ui.GraphicImageRenderer")
public class GraphicImageRendererBase extends RendererBase
{
Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-05-20 21:44:27 UTC (rev 14708)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-05-21 11:03:48 UTC (rev 14709)
@@ -11,7 +11,7 @@
@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.graphicImage.GraphicImage",value="Output an image to the view. You can specify the file as a path, a java.io.File, java.io.InputStream, java.net.URL or byte[]"),
family="org.jboss.seam.ui.graphicImage.GraphicImage", type="org.jboss.seam.ui.graphicImage.GraphicImage",generate="org.jboss.seam.ui.component.html.HtmlGraphicImage",
tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="graphicImage"),
-renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.graphicImage.GraphicImageRendererBase", family="org.jboss.seam.ui.GraphicImageRenderer"),
+renderer = @JsfRenderer(type="org.jboss.seam.ui.graphicImage.GraphicImageRenderer", family="org.jboss.seam.ui.GraphicImageRenderer"),
attributes = {"core-props.xml", "javax.faces.component.UIGraphic.xml", "javax.faces.component.UIOutput.xml", "graphicImage.xml" })
public abstract class UIGraphicImage extends HtmlGraphicImage
{
13 years, 10 months
- 1
- 0
Seam SVN: r14708 - branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-05-20 17:44:27 -0400 (Sun, 20 May 2012)
New Revision: 14708
Modified:
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml
Log:
replaced old JSF2 context param facelets.SKIP_COMMENT with new one - javax.faces.FACELETS_SKIP_COMMENTS
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml 2012-05-19 22:56:44 UTC (rev 14707)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml 2012-05-20 21:44:27 UTC (rev 14708)
@@ -52,7 +52,7 @@
-->
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
13 years, 11 months
- 1
- 0
Seam SVN: r14707 - in branches/community/Seam_2_3: examples/remoting/chatroom/chatroom-ejb and 2 other directories.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-05-19 18:56:44 -0400 (Sat, 19 May 2012)
New Revision: 14707
Modified:
branches/community/Seam_2_3/
branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam/
branches/community/Seam_2_3/jboss-seam/pom.xml
Log:
added jar-dependencies to ignore list
Property changes on: branches/community/Seam_2_3
___________________________________________________________________
Modified: svn:ignore
- *.ipr
*.iws
*.iml
jboss-seam.jar
jboss-seam-ui.jar
jboss-seam-debug.jar
jboss-seam-gen.jar
jboss-seam-pdf.jar
jboss-seam-mail.jar
jboss-seam-remoting.jar
jboss-seam-ioc.jar
jboss-seam-trinidad.jar
test-output
test-report
testng-failures.xml
report
output
classes
.classpath
.project
.settings
build.properties
coverage.ec
dvdindexes
coverage-output
blogindexes
.ant-targets-build.xml
dependency-report.txt
lacewikiIndex
jmimemagic.log
dist
bin
target
.idea
+ *.ipr
*.iws
*.iml
jboss-seam.jar
jboss-seam-ui.jar
jboss-seam-debug.jar
jboss-seam-gen.jar
jboss-seam-pdf.jar
jboss-seam-mail.jar
jboss-seam-remoting.jar
jboss-seam-ioc.jar
jboss-seam-trinidad.jar
test-output
test-report
testng-failures.xml
report
output
classes
.classpath
.project
.settings
build.properties
coverage.ec
dvdindexes
coverage-output
blogindexes
.ant-targets-build.xml
dependency-report.txt
lacewikiIndex
jmimemagic.log
dist
bin
target
.idea
jar-dependencies
Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml
===================================================================
--- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml 2012-05-19 22:55:21 UTC (rev 14706)
+++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/chatroom-ejb.iml 2012-05-19 22:56:44 UTC (rev 14707)
@@ -24,11 +24,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jboss-seam" scope="PROVIDED" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.seam:jboss-seam:ejb:2.3.0-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.thoughtworks.xstream:xstream:1.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:jdk15:5.10" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.el:jboss-el:1.0_02.CR6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.el:el-api:1.0" level="project" />
<orderEntry type="library" name="Maven: jboss:jboss-cache:1.4.1.SP9" level="project" />
@@ -36,7 +36,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.ejb:ejb-api:3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.faces:jsf-api:1.2_12" level="project" />
- <orderEntry type="module" module-name="jboss-seam-remoting" />
+ <orderEntry type="library" name="Maven: org.jboss.seam:jboss-seam-remoting:2.3.0-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.jms:jms:1.1" level="project" />
</component>
</module>
Property changes on: branches/community/Seam_2_3/jboss-seam
___________________________________________________________________
Modified: svn:ignore
- .classpath
.settings
.project
target
+ .classpath
.settings
.project
target
*.iml
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-19 22:55:21 UTC (rev 14706)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-19 22:56:44 UTC (rev 14707)
@@ -370,8 +370,6 @@
<optional>true</optional>
</dependency>
-
-
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId>
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-19 22:55:21 UTC (rev 14706)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-19 22:56:44 UTC (rev 14707)
@@ -1,163 +1,166 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>jboss-seam-parent</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>2.3.0.Beta2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>jboss-seam-ui</artifactId>
- <name>Seam UI JSF2 support</name>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>jboss-seam-parent</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>jboss-seam-ui</artifactId>
+ <name>Seam UI JSF2 support</name>
+
<properties>
<version.richfaces>4.2.2.Final</version.richfaces>
</properties>
-
- <build>
-<!-- <finalName>jboss-seam-ui</finalName> -->
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- <version>${version.richfaces}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <library>
- <prefix>org.jboss.seam.ui</prefix>
- <description>JSF controls for JBoss Seam</description>
-<!-- <taglib> -->
-<!-- <displayName>JBoss Seam UI</displayName> -->
-<!-- <shortName>s</shortName> -->
-<!-- <uri>http://jboss.com/products/seam/taglib</uri> -->
-<!-- <tlibVersion>2.0</tlibVersion> -->
-<!-- <jspVersion>2.1</jspVersion> -->
-<!-- </taglib> -->
- </library>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <build>
+ <!-- <finalName>jboss-seam-ui</finalName> -->
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>${version.richfaces}</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <library>
+ <prefix>org.jboss.seam.ui</prefix>
+ <description>JSF controls for JBoss Seam</description>
+ <!-- <taglib> -->
+ <!-- <displayName>JBoss Seam UI</displayName> -->
+ <!-- <shortName>s</shortName> -->
+ <!-- <uri>http://jboss.com/products/seam/taglib</uri> -->
+ <!-- <tlibVersion>2.0</tlibVersion> -->
+ <!-- <jspVersion>2.1</jspVersion> -->
+ <!-- </taglib> -->
+ </library>
+ </configuration>
+ </plugin>
- <!-- See parent pom for notes on how to declare dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
+ </plugins>
+ </build>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
- <artifactId>jboss-jsp-api_2.2_spec</artifactId>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
+ <!-- See parent pom for notes on how to declare dependencies -->
+ <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jul</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
- <dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <version>${version.richfaces}</version>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jul</artifactId>
+ </dependency>
<dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.1_spec</artifactId>
- <scope>provided</scope>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ <!--<version>${version.richfaces}</version>-->
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-api</artifactId>
+ <!--<version>${version.richfaces}</version>-->
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${version.richfaces}</version>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
<profile>
<id>code-coverage</id>
<build>
@@ -167,8 +170,8 @@
<artifactId>emma-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -181,13 +184,13 @@
</plugins>
</build>
</profile>
- <profile>
+ <profile>
<id>distribution</id>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
<execution>
<id>copy-dependencies</id>
<goals>
@@ -203,33 +206,35 @@
<transitive>true</transitive>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <links>
- <link>http://docs.oracle.com/javase/6/docs/api/</link>
- </links>
- <keywords>true</keywords>
- <author>true</author>
- <stylesheetfile>jdstyle.css</stylesheetfile>
- <doctitle>JBoss Seam ${project.name} API ${project.version}</doctitle> <!-- Used by javadoc:javadoc goal -->
- <detectOfflineLinks>false</detectOfflineLinks>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin></plugins>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <links>
+ <link>http://docs.oracle.com/javase/6/docs/api/</link>
+ </links>
+ <keywords>true</keywords>
+ <author>true</author>
+ <stylesheetfile>jdstyle.css</stylesheetfile>
+ <doctitle>JBoss Seam ${project.name} API ${project.version}</doctitle>
+ <!-- Used by javadoc:javadoc goal -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</profile>
</profiles>
-
+
</project>
13 years, 11 months
- 1
- 0
Seam SVN: r14706 - branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-05-19 18:55:21 -0400 (Sat, 19 May 2012)
New Revision: 14706
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
Log:
Added mvel2 to all dependencies
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list 2012-05-19 22:53:54 UTC (rev 14705)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear-war.list 2012-05-19 22:55:21 UTC (rev 14706)
@@ -25,5 +25,5 @@
yarfraw.jar
jboss-seam-ui.jar
jboss-seam-jul.jar
-richfaces-impl.jar
-richfaces-ui.jar
\ No newline at end of file
+richfaces-components-ui.jar
+richfaces-core-impl.jar
\ No newline at end of file
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-05-19 22:53:54 UTC (rev 14705)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-05-19 22:55:21 UTC (rev 14706)
@@ -23,4 +23,5 @@
jempbox.jar
derby.jar
mvel2.jar
-richfaces-api.jar
+richfaces-components-api.jar
+richfaces-core-api.jar
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2012-05-19 22:53:54 UTC (rev 14705)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2012-05-19 22:55:21 UTC (rev 14706)
@@ -62,6 +62,8 @@
fontbox.jar
jempbox.jar
derby.jar
-richfaces-api.jar
-richfaces-impl.jar
-richfaces-ui.jar
\ No newline at end of file
+richfaces-components-api.jar
+richfaces-components-ui.jar
+richfaces-core-api.jar
+richfaces-core-impl.jar
+mvel2.jar
\ No newline at end of file
13 years, 11 months
- 1
- 0
Seam SVN: r14705 - branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-05-19 18:53:54 -0400 (Sat, 19 May 2012)
New Revision: 14705
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml
Log:
Migrated template to JSF2
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml 2012-05-19 22:51:35 UTC (rev 14704)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml 2012-05-19 22:53:54 UTC (rev 14705)
@@ -7,16 +7,16 @@
xmlns:a="http://richfaces.org/a4j"
xmlns:s="http://jboss.com/products/seam/taglib"
contentType="text/html">
-<html>
- <head>
+<h:html>
+ <h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>@projectName@</title>
<link rel="shortcut icon" href="#{request.contextPath}/favicon.ico"/>
<h:outputStylesheet name="/stylesheet/theme.ecss"/>
<h:outputStylesheet name="/stylesheet/theme.css"/>
<ui:insert name="head"/>
- </head>
- <body>
+ </h:head>
+ <h:body>
<ui:include src="menu.xhtml">
<ui:param name="projectName" value="@projectName@"/>
</ui:include>
@@ -41,6 +41,6 @@
</p>
</s:fragment>
</div>
- </body>
-</html>
+ </h:body>
+</h:html>
</f:view>
13 years, 11 months
- 1
- 0
Seam SVN: r14704 - branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-05-19 18:51:35 -0400 (Sat, 19 May 2012)
New Revision: 14704
Added:
branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/jboss-deployment-structure.xml
Log:
added jboss-deployment-structure.xml
Added: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/jboss-deployment-structure.xml (rev 0)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/jboss-deployment-structure.xml 2012-05-19 22:51:35 UTC (rev 14704)
@@ -0,0 +1,11 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+ <dependencies>
+ <module name="org.hibernate" export="true"/>
+ <module name="javax.faces.api" export="true" />
+ <module name="com.sun.jsf-impl" export="true"/>
+ <module name="org.dom4j" export="true"/>
+ <module name="org.hibernate.validator" export="true"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
13 years, 11 months
- 1
- 0
Seam SVN: r14703 - branches/community/Seam_2_3/jboss-seam-gen/dist.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-05-19 18:50:14 -0400 (Sat, 19 May 2012)
New Revision: 14703
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
Log:
added jboss-deployment to build
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-05-18 19:55:29 UTC (rev 14702)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-05-19 22:50:14 UTC (rev 14703)
@@ -859,6 +859,7 @@
<fileset dir="${templates.dir}/resources">
<include name="META-INF/orm.xml"/>
<include name="META-INF/persistence-*-war.xml"/>
+ <include name="META-INF/jboss-deployment-structure.xml"/>
<!-- <include name="WEB-INF/jboss-web.xml"/> -->
</fileset>
<filterset refid="project"/>
13 years, 11 months
- 1
- 0