Seam SVN: r9708 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-12-03 19:19:27 -0500 (Wed, 03 Dec 2008)
New Revision: 9708
Modified:
trunk/src/main/org/jboss/seam/deployment/ClassDescriptor.java
Log:
JBSEAM-3757
Modified: trunk/src/main/org/jboss/seam/deployment/ClassDescriptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/ClassDescriptor.java 2008-12-04 00:19:01 UTC (rev 9707)
+++ trunk/src/main/org/jboss/seam/deployment/ClassDescriptor.java 2008-12-04 00:19:27 UTC (rev 9708)
@@ -35,6 +35,18 @@
{
log.debug("could not load class (missing dependency): " + classname, ncdfe);
}
+
+ try
+ {
+ // IBM JVM will fail if an annotation used on the type is not on the classpath
+ // rendering the class virtually unusable (given Seam's heavy use of annotations)
+ clazz.getAnnotations();
+ }
+ catch (TypeNotPresentException tnpe)
+ {
+ clazz = null;
+ log.debug("could not load class (annotation missing dependency): " + classname, tnpe);
+ }
}
public Class<?> getClazz()
15 years, 5 months
- 1
- 0
Seam SVN: r9707 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-12-03 19:19:01 -0500 (Wed, 03 Dec 2008)
New Revision: 9707
Modified:
trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java
Log:
report that we are loading the class in the correct place
report when a class is being skipped because it could not be loaded
Modified: trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java 2008-12-03 22:27:38 UTC (rev 9706)
+++ trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java 2008-12-04 00:19:01 UTC (rev 9707)
@@ -57,12 +57,16 @@
ClassDeploymentHandler classDeploymentHandler = (ClassDeploymentHandler) deploymentHandler;
if (hasAnnotations(getClassFile(), classDeploymentHandler.getMetadata().getClassAnnotatedWith()))
{
- log.trace("adding class to deployable list " + name + " for deployment handler " + deploymentHandler.getName());
if (getClassDescriptor().getClazz() != null)
{
+ log.trace("adding class to deployable list " + name + " for deployment handler " + deploymentHandler.getName());
classDeploymentHandler.getClasses().add(getClassDescriptor());
handled = true;
}
+ else
+ {
+ log.info("skipping class " + name + " because it cannot be loaded (may reference a type which is not available on the classpath)");
+ }
}
}
}
15 years, 5 months
- 1
- 0
Seam SVN: r9706 - trunk/seam-gen/resources.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-12-03 17:27:38 -0500 (Wed, 03 Dec 2008)
New Revision: 9706
Modified:
trunk/seam-gen/resources/messages_it.properties
Log:
JBSEAM-3393
Modified: trunk/seam-gen/resources/messages_it.properties
===================================================================
--- trunk/seam-gen/resources/messages_it.properties 2008-12-03 22:25:22 UTC (rev 9705)
+++ trunk/seam-gen/resources/messages_it.properties 2008-12-03 22:27:38 UTC (rev 9706)
@@ -75,7 +75,7 @@
javax.faces.converter.ShortConverter.SHORT_detail=il valore deve essere un numero intero compreso -32768 e 32767
javax.faces.validator.DoubleRangeValidator.MAXIMUM=il valore deve essere minore o uguale a {0}
-javax.faces.validator.DoubleRangeValidator.MINIMUM=il valore deve essere maggiore o uguale a {0} {0}
+javax.faces.validator.DoubleRangeValidator.MINIMUM=il valore deve essere maggiore o uguale a {0}
javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=il valore deve essere compreso tra {0} e {1}
javax.faces.validator.DoubleRangeValidator.TYPE=il valore non \u00E8 del tipo corretto
javax.faces.validator.LengthValidator.MAXIMUM=il valore deve essere inferiore o uguale {0} caratteri
15 years, 5 months
- 1
- 0
Seam SVN: r9705 - trunk.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-12-03 17:25:22 -0500 (Wed, 03 Dec 2008)
New Revision: 9705
Modified:
trunk/build.xml
Log:
JBSEAM-3711
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-12-03 22:01:53 UTC (rev 9704)
+++ trunk/build.xml 2008-12-03 22:25:22 UTC (rev 9705)
@@ -427,6 +427,7 @@
<cleanexample name="ui" />
<cleanexample name="spring" />
<cleanexample name="itext" />
+ <cleanexample name="openid" />
<cleanexample name="excel" />
<cleanexample name="rss" />
<cleanexample name="messages" />
@@ -462,6 +463,7 @@
<undeployexample name="seampay" />
<undeployexample name="seamspace" />
<undeployexample name="itext" />
+ <undeployexample name="openid" />
<undeployexample name="excel" />
<undeployexample name="rss" />
<undeployexample name="mail" />
@@ -503,6 +505,7 @@
<testexample name="mail" />
<testexample name="seampay" />
<testexample name="itext" />
+ <testexample name="openid" />
<testexample name="excel" />
<testexample name="rss" />
<testexample name="hibernate" />
@@ -532,6 +535,7 @@
<ant dir="examples/groovybooking" target="validateConfiguration" inheritall="false" />
<ant dir="examples/icefaces" target="validateConfiguration" inheritall="false" />
<ant dir="examples/itext" target="validateConfiguration" inheritall="false" />
+ <ant dir="examples/openid" target="validateConfiguration" inheritall="false" />
<ant dir="examples/mail" target="validateConfiguration" inheritall="false" />
<ant dir="examples/messages" target="validateConfiguration" inheritall="false" />
<ant dir="examples/nestedbooking" target="validateConfiguration" inheritall="false" />
@@ -631,6 +635,7 @@
<include name="registration/**/*" />
<include name="dvdstore/**/*" />
<include name="itext/**/*" />
+ <include name="openid/**/*" />
<include name="excel/**/*" />
<include name="rss/**/*" />
<include name="seambay/**/*" />
15 years, 5 months
- 1
- 0
Seam SVN: r9704 - in trunk/examples: jpa and 1 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-12-03 17:01:53 -0500 (Wed, 03 Dec 2008)
New Revision: 9704
Modified:
trunk/examples/jee5/readme.txt
trunk/examples/jpa/readme.txt
trunk/examples/wiki/build.xml
Log:
invalid reference to location of hsqldb.jar
Modified: trunk/examples/jee5/readme.txt
===================================================================
--- trunk/examples/jee5/readme.txt 2008-12-03 21:57:55 UTC (rev 9703)
+++ trunk/examples/jee5/readme.txt 2008-12-03 22:01:53 UTC (rev 9704)
@@ -96,7 +96,7 @@
/>
9. Copy hsqldb.jar to OC4J:
- cp ../../seam-gen/lib/hsqldb.jar $ORACLE_HOME/j2ee/home/applib/
+ cp ../../lib/hsqldb.jar $ORACLE_HOME/j2ee/home/applib/
10. Copy the application to OC4J:
cp build/jboss-seam-jee5.ear $ORACLE_HOME/j2ee/home/applications/
Modified: trunk/examples/jpa/readme.txt
===================================================================
--- trunk/examples/jpa/readme.txt 2008-12-03 21:57:55 UTC (rev 9703)
+++ trunk/examples/jpa/readme.txt 2008-12-03 22:01:53 UTC (rev 9704)
@@ -59,7 +59,7 @@
Tomcat (5.5 or 6) without JBoss Embedded:
* Install Tomcat
- * Copy the seam-gen/lib/hsqldb.jar into $TOMCAT_HOME/common/lib (Tomcat 5.5) or $TOMCAT_HOME/lib (Tomcat 6)
+ * Copy lib/hsqldb.jar from this distribution into $TOMCAT_HOME/common/lib (Tomcat 5.5) or $TOMCAT_HOME/lib (Tomcat 6)
* ant tomcat55 or ant tomcat6
* Deploy dist-jboss/jboss-seam-jpa.war
* Start Tomcat
Modified: trunk/examples/wiki/build.xml
===================================================================
--- trunk/examples/wiki/build.xml 2008-12-03 21:57:55 UTC (rev 9703)
+++ trunk/examples/wiki/build.xml 2008-12-03 22:01:53 UTC (rev 9704)
@@ -519,7 +519,7 @@
</delete>
<java classname="org.hsqldb.Server"
fork="yes"
- classpath="${seam.dir}/seam-gen/lib/hsqldb.jar"
+ classpath="${seam.dir}/lib/hsqldb.jar"
failonerror="true">
<arg value="-database.0"/>
<arg value="file:${database.dir}/db"/>
15 years, 5 months
- 1
- 0
Seam SVN: r9703 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-12-03 16:57:55 -0500 (Wed, 03 Dec 2008)
New Revision: 9703
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Security.xml
Log:
JBSEAM-3711
Modified: trunk/doc/Seam_Reference_Guide/en-US/Security.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Security.xml 2008-12-03 21:24:03 UTC (rev 9702)
+++ trunk/doc/Seam_Reference_Guide/en-US/Security.xml 2008-12-03 21:57:55 UTC (rev 9703)
@@ -5018,5 +5018,154 @@
</sect1>
+
+
+ <sect1>
+ <title>OpenID</title>
+
+ <para>
+ OpenID is a community standard for external web-based authentication. The basic
+ idea is that any web application can supplement (or replace) its local handling of
+ authentication by delegating responsibility to an external OpenID server of the user's
+ chosing. This benefits the user, who no longer has to remember a name and password for
+ every web application he uses, and the developer, who is relieved of some of the burden of
+ maintaining a complex authentication system.
+ </para>
+
+ <para>When using OpenID, the user selects an OpenID provider, and the provider assigns the user
+ an OpenID. The id will take the form of a URL, for example <literal>http://maximoburrito.myopenid.com</literal> however,
+ it's acceptable to leave off the <literal>http://</literal> part of the identifier when logging into a site. The web application
+ (known as a relying party in OpenID-speak) determines which OpenID server to contact and redirects the user to the remote
+ site for authentication. Upon successful authentication the user is given
+ the (cryptographically secure) token proving his identity and is redirected back to the original web application.The
+ local web application can then be sure the user accessing the application controls the OpenID he presented.
+ </para>
+
+ <para>
+ It's important to realize at this
+ point that authentication does not imply authorization. The web application still needs to make a determination of how to
+ use that information. The web application could treat the user as instantly logged in and give full access to the system or
+ it could try and map the presented OpenID to a local user account, prompting the user to register if he hasn't already.
+ The choice of how to handle the OpenID is left as a design decision for the local application.
+ </para>
+
+ <sect2>
+ <title>Configuring OpenID</title>
+ <para>
+ Seam uses the openid4java package and requires four additional JARs to make use of the Seam integration. These
+ are: <literal>htmlparser.jar</literal>, <literal>openid4java.jar</literal>, <literal>openxri-client.jar</literal>
+ and <literal>openxri-syntax.jar</literal>.
+ </para>
+
+ <para>
+ OpenID processing requires the use of the <literal>OpenIdPhaseListener</literal>, which should be added to your
+ <literal>faces-config.xml</literal> file. The phase listener processes the callback from the OpenID provider, allowing
+ re-entry into the local application.
+ </para>
+
+ <programlisting role="XML"><lifecycle>
+ <phase-listener>org.jboss.seam.security.openid.OpenIdPhaseListener</phase-listener>
+</lifecycle></programlisting>
+
+
+ <para>
+ With this configuration, OpenID support is available to your application.
+ The OpenID support component, <literal>org.jboss.seam.security.openid.openid</literal>, is installed automatically if the openid4java
+ classes are on the classpath.
+ </para>
+ </sect2>
+
+ <sect2>
+ <title>Presenting an OpenIdDLogin form</title>
+
+ <para>
+ To initiate an OpenID login, you can present a simply form to the user asking for the user's OpenID. The <literal>#{openid.id}</literal>
+ value
+ accepts the user's OpenID and the <literal>#{openid.login}</literal> action initiates an authentication request.
+ </para>
+ <programlisting role="XML"><h:form>
+ <h:inputText value="#{openid.id}" />
+ <h:commandButton action="#{openid.login}" value="OpenID Login"/>
+</h:form></programlisting>
+
+ <para>
+ When the user submits the login form, he will be redirected to his OpenID provider. The user will eventually
+ return to your application through the Seam pseudo-view <literal>/openid.xhtml</literal>, which is
+ provided by the <literal>OpenIdPhaseListener</literal>. Your application can handle the OpenID response by means
+ of a <literal>pages.xml</literal> navigation from that view, just as if the user had never left your application.
+ </para>
+ </sect2>
+
+ <sect2>
+ <title>Logging in immediately</title>
+
+ <para> The simplest strategy is to simply login the user immediately. The following navigation rule shows how to handle this using
+ the <literal>#{openid.loginImmediately()}</literal> action.
+ </para>
+
+ <programlisting role="XML"><page view-id="/openid.xhtml">
+ <navigation evaluate="#{openid.loginImmediately()}">
+ <rule if-outcome="true">
+ <redirect view-id="/main.xhtml">
+ <message>OpenID login successful...</message>
+ </redirect>
+ </rule>
+ <rule if-outcome="false">
+ <redirect view-id="/main.xhtml">
+ <message>OpenID login rejected...</message>
+ </redirect>
+ </rule>
+ </navigation>
+</page></programlisting>
+
+ <para>Thie <literal>loginImmediately()</literal> action checks to see if the OpenID is valid. If it is valid, it adds an
+ OpenIDPrincipal to the identity component, marks the user as logged in (i.e. <literal>#{identity.loggedIn}</literal> will be true)
+ and returns true. If the OpenID was not validated, the method returns false, and the user re-enters the application un-authenticated.
+ If the user's OpenID is valid, it will be accessible using the expression <literal>#{openid.validatedId}</literal> and
+ <literal>#{openid.valid}</literal> will be true.
+ </para>
+
+
+ </sect2>
+
+ <sect2>
+ <title>Deferring login</title>
+
+ <para>
+ You may not want the user to be immediately logged in to your application. In that case, your navigation
+ should check the <literal>#{openid.valid}</literal> property and redirect the user to a local registration or processing
+ page. Actions you might take would be asking for more information and creating a local user account or presenting a captcha
+ to avoid programmatic registrations. When you are done processing, if you want to log the user in, you can call
+ the <literal>loginImmediately</literal> method, either through EL as shown previously or by directly interaction with the
+ <literal>org.jboss.seam.security.openid.OpenId</literal> component. Of course, nothing prevents you from writing custom
+ code to interact with the Seam identity component on your own for even more customized behaviour.
+ </para>
+
+ </sect2>
+
+
+ <sect2>
+ <title>Logging out</title>
+
+ <para>
+ Logging out (forgetting an OpenID association) is done by calling <literal>#{openid.logout}</literal>. If you
+ are not using Seam security, you can call this method directly. If you are using Seam security, you should
+ continue to use <literal>#{identity.logout}</literal> and install an event handler to capture the logout event, calling
+ the OpenID logout method.
+
+ </para>
+ <programlisting role="XML"><event type="org.jboss.seam.security.loggedOut">
+ <action execute="#{openid.logout}" />
+</event> </programlisting>
+
+ <para>It's important that you do not leave this out or the user will not be able to login again in the same session.</para>
+ </sect2>
+
+
+
+
+ </sect1>
+
+
</chapter>
15 years, 5 months
- 1
- 0
Seam SVN: r9702 - trunk/examples/spring/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-12-03 16:24:03 -0500 (Wed, 03 Dec 2008)
New Revision: 9702
Modified:
trunk/examples/spring/resources/WEB-INF/web.xml
Log:
JBSEAM-3587
Modified: trunk/examples/spring/resources/WEB-INF/web.xml
===================================================================
--- trunk/examples/spring/resources/WEB-INF/web.xml 2008-12-03 17:43:32 UTC (rev 9701)
+++ trunk/examples/spring/resources/WEB-INF/web.xml 2008-12-03 21:24:03 UTC (rev 9702)
@@ -2,7 +2,7 @@
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" metadata-complete="true">
<!-- Seam -->
15 years, 5 months
- 1
- 0
Seam SVN: r9701 - in branches/enterprise/JBPAPP_4_3_FP01/build: embedded and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-12-03 12:43:32 -0500 (Wed, 03 Dec 2008)
New Revision: 9701
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/build.properties
branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
Log:
updated to jboss-embedded beta3.SP4 and changed hibernate3-search to hibernate-search
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/build.properties
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/build.properties 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/build.properties 2008-12-03 17:43:32 UTC (rev 9701)
@@ -4,4 +4,4 @@
embedded.dir /home/mnovotny/workspaces/jbossembedded/EMBEDDED_JBOSS_BETA3/embedded
#embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib
#embedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip
-embedded.version beta3.SP3
\ No newline at end of file
+embedded.version beta3.SP4
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -35,7 +35,7 @@
<dependency>
<groupId>hibernate-search</groupId>
- <artifactId>hibernate3-search</artifactId>
+ <artifactId>hibernate-search</artifactId>
<optional>true</optional>
</dependency>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency
of hibernate search</description>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS.</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2008-12-03 15:31:33 UTC (rev 9700)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2008-12-03 17:43:32 UTC (rev 9701)
@@ -340,7 +340,7 @@
<dependency>
<groupId>hibernate-search</groupId>
- <artifactId>hibernate3-search</artifactId>
+ <artifactId>hibernate-search</artifactId>
<version>3.0.1.GA_CP01</version>
<exclusions>
<exclusion>
@@ -671,7 +671,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP3</version>
+ <version>beta3.SP4</version>
</dependency>
<dependency>
15 years, 5 months
- 1
- 0
Seam SVN: r9700 - in branches/enterprise/JBPAPP_4_3_FP01/seam-gen: util and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-12-03 10:31:33 -0500 (Wed, 03 Dec 2008)
New Revision: 9700
Modified:
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/util/TypeInfo.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.page.xml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/editproperty.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/error.xhtml
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.page.xml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/param.xml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.page.xml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.xhtml.ftl
branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/viewproperty.xhtml.ftl
Log:
JBPAPP-1466
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/src/EntityList.java.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -1,6 +1,6 @@
<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign listName = componentName + "List">
package ${actionPackage};
@@ -18,7 +18,7 @@
private static final String[] RESTRICTIONS = {
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !util.isToOne(property)>
+<#if !c2h.isCollection(property) && !isToOne(property)>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/util/TypeInfo.ftl
===================================================================
(Binary files differ)
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.page.xml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.page.xml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.page.xml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign homeName = componentName + "Home">
<#assign masterPageName = entityName + "List">
<#assign pageName = entityName>
@@ -15,10 +15,10 @@
<action execute="${'#'}{${homeName}.wire}"/>
<param name="${componentName}From"/>
-<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
+<#assign idName = componentName + pojo.identifierProperty.name?cap_first>
<#if c2j.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
-<#assign cidName = componentName + util.upper(componentProperty.name)>
+<#assign cidName = componentName + componentProperty.name?cap_first>
<param name="${cidName}" value="${'#'}{${homeName}.${idName}.${componentProperty.name}}"/>
</#foreach>
<#else>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/edit.xhtml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -1,7 +1,7 @@
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign homeName = componentName + "Home">
<#assign masterPageName = entityName + "List">
<#assign pageName = entityName>
@@ -69,7 +69,7 @@
</h:form>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
+<#if isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -78,73 +78,73 @@
<rich:tabPanel switchType="ajax">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if util.isToOne(property)>
+<#if isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
-<#assign parentName = util.lower(parentPojo.shortName)>
+<#assign parentName = parentPojo.shortName?uncap_first>
<#if property.optional>
- <rich:tab label="${property.name}">
+ <rich:tab label="${label(property.name)}">
<#else>
- <rich:tab label="${property.name} *" labelClass="required">
+ <rich:tab label="${label(property.name)} *" labelClass="required">
</#if>
<div class="association" id="${property.name}Parent">
<h:outputText value="There is no ${property.name} associated with this ${componentName}."
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
- <rich:dataTable var="${parentName}"
+ <rich:dataTable var="_${parentName}"
value="${'#'}{${homeName}.instance.${property.name}}"
rendered="${'#'}{${homeName}.instance.${property.name} != null}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${label(componentProperty.name)}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${componentProperty.name}}" indent=16/>
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}}
+ <f:facet name="header">${label(parentProperty.name)}</f:facet>
+ <@outputValue property=parentProperty expression="${'#'}{_${parentName}.${parentProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
-<#if util.isToOne(parentProperty)>
+<#if isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}" indent=16/>
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
+ <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
+ <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
- <f:facet name="header">action</f:facet>
+ <f:facet name="header">Action</f:facet>
<s:link view="/${parentPageName}.xhtml"
id="view${parentName}"
value="View"
propagation="none">
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
- <f:param name="${parentName}${util.upper(componentProperty.name)}"
- value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
+ <f:param name="${parentName}${componentProperty.name?cap_first}"
+ value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
- value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
+ <f:param name="${parentName}${parentPojo.identifierProperty.name?cap_first}"
+ value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}}"/>
</#if>
</s:link>
</h:column>
@@ -164,59 +164,59 @@
</#if>
<#if c2h.isOneToManyCollection(property)>
- <rich:tab label="${property.name}">
- <div class="association" id="${property.name}Children">
+ <rich:tab label="${label(property.name)}">
+ <h:form styleClass="association" id="${property.name}Children">
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
<#assign childPageName = childPojo.shortName>
<#assign childEditPageName = childPojo.shortName + "Edit">
-<#assign childName = util.lower(childPojo.shortName)>
+<#assign childName = childPojo.shortName?uncap_first>
<h:outputText value="There are no ${property.name} associated with this ${componentName}."
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
<rich:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
+ var="_${childName}"
rendered="${'#'}{not empty ${homeName}.${property.name}}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
- <h:column>
- <f:facet name="header">${componentProperty.name}</f:facet>
- ${'#'}{${childName}.${childProperty.name}.${componentProperty.name}}
- </h:column>
+ <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}">
+ <f:facet name="header">${label(componentProperty.name)}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}" indent=20/>
+ </rich:column>
</#foreach>
<#else>
- <h:column>
- <f:facet name="header">${childProperty.name}</f:facet>
- <h:outputText value="${'#'}{${childName}.${childProperty.name}}"/>
- </h:column>
+ <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}}">
+ <f:facet name="header">${label(childProperty.name)}</f:facet>
+ <@outputValue property=childProperty expression="${'#'}{_${childName}.${childProperty.name}}" indent=20/>
+ </rich:column>
</#if>
</#if>
</#foreach>
<h:column>
- <f:facet name="header">action</f:facet>
+ <f:facet name="header">Action</f:facet>
<s:link view="/${childPageName}.xhtml"
id="select${childName}"
value="Select"
propagation="none">
<#if childPojo.isComponent(childPojo.identifierProperty)>
<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
- <f:param name="${childName}${util.upper(componentProperty.name)}"
- value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
+ <f:param name="${childName}${componentProperty.name?cap_first}"
+ value="${'#'}{_${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
- value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+ <f:param name="${childName}${childPojo.identifierProperty.name?cap_first}"
+ value="${'#'}{_${childName}.${childPojo.identifierProperty.name}}"/>
</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</rich:dataTable>
- </div>
+ </h:form>
<f:subview rendered="${'#'}{${homeName}.managed}" id="${property.name}">
<div class="actionButtons">
@@ -224,7 +224,7 @@
value="Add ${childName}"
view="/${childEditPageName}.xhtml"
propagation="none">
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${pojo.identifierProperty.name?cap_first}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
<f:param name="${childName}From" value="${entityName}"/>
</s:button>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/editproperty.xhtml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/editproperty.xhtml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -1,6 +1,6 @@
<#include "../util/TypeInfo.ftl">
-<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !isToOne(property) && property != pojo.versionProperty!>
<#assign propertyIsId = property.equals(pojo.identifierProperty)>
<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
<#if pojo.isComponent(property)>
@@ -8,7 +8,7 @@
<#assign column = componentProperty.columnIterator.next()>
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
- <ui:define name="label">${componentProperty.name}</ui:define>
+ <ui:define name="label">${label(componentProperty.name)}</ui:define>
<#if isDate(componentProperty)>
<rich:calendar id="${componentProperty.name}"
<#if propertyIsId>
@@ -123,7 +123,7 @@
<#assign property = property.value.typeName>
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
- <ui:define name="label">${property.name}</ui:define>
+ <ui:define name="label">${label(property.name)}</ui:define>
<#if isDate(property)>
<rich:calendar id="${property.name}"
<#if propertyIsId>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/error.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/error.xhtml 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/error.xhtml 2008-12-03 15:31:33 UTC (rev 9700)
@@ -7,12 +7,13 @@
xmlns:h="http://java.sun.com/jsf/html"
template="layout/template.xhtml">
+<ui:param name="showGlobalMessages" value="false"/>
<ui:define name="body">
<h1>Error</h1>
<p>Something bad happened :-(</p>
- <h:messages styleClass="message"/>
+ <h:messages id="errorMessage" styleClass="message"/>
</ui:define>
</ui:composition>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.page.xml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.page.xml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.page.xml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -5,13 +5,13 @@
<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign listName = componentName + "List">
<param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
<param name="order" value="${'#'}{${listName}.order}"/>
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/list.xhtml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -3,7 +3,7 @@
<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign listName = componentName + "List">
<#assign pageName = entityName>
<#assign editPageName = entityName + "Edit">
@@ -26,12 +26,12 @@
<rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !isToOne(property) && property != pojo.versionProperty!>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#if isString(componentProperty)>
<s:decorate template="layout/display.xhtml">
- <ui:define name="label">${componentProperty.name}</ui:define>
+ <ui:define name="label">${label(componentProperty.name)}</ui:define>
<h:inputText id="${componentProperty.name}" value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"/>
</s:decorate>
@@ -40,7 +40,7 @@
<#else>
<#if isString(property)>
<s:decorate template="layout/display.xhtml">
- <ui:define name="label">${property.name}</ui:define>
+ <ui:define name="label">${label(property.name)}</ui:define>
<h:inputText id="${property.name}" value="${'#'}{${listName}.${componentName}.${property.name}}"/>
</s:decorate>
@@ -65,16 +65,16 @@
rendered="${'#'}{empty ${listName}.resultList}"/>
<rich:dataTable id="${listName}"
- var="${componentName}"
+ var="_${componentName}"
value="${'#'}{${listName}.resultList}"
rendered="${'#'}{not empty ${listName}.resultList}">
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !isToOne(property) && property != pojo.versionProperty!>
<#if pojo.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<h:column>
<f:facet name="header">${componentProperty.name}</f:facet>
- ${'#'}{${componentName}.${property.name}.${componentProperty.name}}
+ <@outputValue property=componentProperty expression="${'#'}{_${componentName}.${property.name}.${componentProperty.name}}" indent=12/>
</h:column>
</#foreach>
<#else>
@@ -85,11 +85,11 @@
<f:param name="order" value="${'#'}{${listName}.order=='${property.name} asc' ? '${property.name} desc' : '${property.name} asc'}"/>
</s:link>
</f:facet>
- ${'#'}{${componentName}.${property.name}}
+ <@outputValue property=property expression="${'#'}{_${componentName}.${property.name}}" indent=12/>
</h:column>
</#if>
</#if>
-<#if util.isToOne(property)>
+<#if isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
@@ -101,7 +101,7 @@
<f:param name="order" value="${'#'}{${listName}.order=='${propertyPath} asc' ? '${propertyPath} desc' : '${propertyPath} asc'}"/>
</s:link>
</f:facet>
- ${'#'}{${componentName}.${propertyPath}}
+ @outputValue property=componentProperty expression="${'#'}{_${componentName}.${propertyPath}}" indent=12/>
</h:column>
</#foreach>
<#else>
@@ -113,24 +113,24 @@
<f:param name="order" value="${'#'}{${listName}.order=='${propertyPath} asc' ? '${propertyPath} desc' : '${propertyPath} asc'}"/>
</s:link>
</f:facet>
- ${'#'}{${componentName}.${propertyPath}}
+ <@outputValue property=parentPojo.identifierProperty expression="${'#'}{_${componentName}.${propertyPath}}" indent=12/>
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
- <f:facet name="header">action</f:facet>
+ <f:facet name="header">Action</f:facet>
<s:link view="/${'#'}{empty from ? '${pageName}' : from}.xhtml"
value="Select"
id="${componentName}">
<#if pojo.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
- <f:param name="${componentName}${util.upper(componentProperty.name)}"
- value="${'#'}{${componentName}.${pojo.identifierProperty.name}.${componentProperty.name}}"/>
+ <f:param name="${componentName}${componentProperty.name?cap_first}"
+ value="${'#'}{_${componentName}.${pojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
- value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/>
+ <f:param name="${componentName}${pojo.identifierProperty.name?cap_first}"
+ value="${'#'}{_${componentName}.${pojo.identifierProperty.name}}"/>
</#if>
</s:link>
</h:column>
@@ -178,10 +178,10 @@
<s:button view="/${editPageName}.xhtml"
id="create"
value="Create ${componentName}">
-<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
+<#assign idName = componentName + pojo.identifierProperty.name?cap_first>
<#if c2j.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
-<#assign cidName = componentName + util.upper(componentProperty.name)>
+<#assign cidName = componentName + componentProperty.name?cap_first>
<f:param name="${cidName}"/>
</#foreach>
<#else>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/param.xml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/param.xml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/param.xml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -1,14 +1,15 @@
+<#include "../util/TypeInfo.ftl">
<#foreach property in pojo.allPropertiesIterator>
-<#if util.isToOne(property)>
+<#if isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#if entities.add(parentPojo.shortName)>
-<#assign parentComponentName = util.lower(parentPojo.shortName)>
+<#assign parentComponentName = parentPojo.shortName?uncap_first>
<#assign parentHomeName = parentComponentName + "Home">
<param name="${parentComponentName}From"/>
-<#assign parentIdName = parentComponentName + util.upper(parentPojo.identifierProperty.name)>
+<#assign parentIdName = parentComponentName + parentPojo.identifierProperty.name?cap_first>
<#if c2j.isComponent(parentPojo.identifierProperty)>
<#foreach parentComponentProperty in parentPojo.identifierProperty.value.propertyIterator>
-<#assign parentCidName = parentComponentName + util.upper(parentComponentProperty.name)>
+<#assign parentCidName = parentComponentName + parentComponentProperty.name?cap_first>
<param name="${parentCidName}" value="${'#'}{${parentHomeName}.${parentIdName}.${parentComponentProperty.name}}"/>
</#foreach>
<#else>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.page.xml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.page.xml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.page.xml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign homeName = componentName + "Home">
<param name="${componentName}From"/>
-<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
+<#assign idName = componentName + pojo.identifierProperty.name?cap_first>
<#if c2j.isComponent(pojo.identifierProperty)>
<#foreach componentProperty in pojo.identifierProperty.value.propertyIterator>
-<#assign cidName = componentName + util.upper(componentProperty.name)>
+<#assign cidName = componentName + componentProperty.name?cap_first>
<param name="${cidName}" value="${'#'}{${homeName}.${idName}.${componentProperty.name}}"/>
</#foreach>
<#else>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.xhtml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/view.xhtml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -1,7 +1,8 @@
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
-<#assign componentName = util.lower(entityName)>
+<#assign componentName = entityName?uncap_first>
<#assign homeName = componentName + "Home">
<#assign masterPageName = entityName + "List">
<#assign editPageName = entityName + "Edit">
@@ -21,7 +22,7 @@
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
-<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
+<#if !c2h.isCollection(property) && !isToOne(property) && property != pojo.versionProperty!>
<#include "viewproperty.xhtml.ftl">
</#if>
</#foreach>
@@ -43,7 +44,7 @@
</div>
<#assign hasAssociations=false>
<#foreach property in pojo.allPropertiesIterator>
-<#if util.isToOne(property) || c2h.isOneToManyCollection(property)>
+<#if isToOne(property) || c2h.isOneToManyCollection(property)>
<#assign hasAssociations=true>
</#if>
</#foreach>
@@ -52,68 +53,68 @@
<rich:tabPanel switchType="ajax">
</#if>
<#foreach property in pojo.allPropertiesIterator>
-<#if util.isToOne(property)>
+<#if isToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign parentPageName = parentPojo.shortName>
-<#assign parentName = util.lower(parentPojo.shortName)>
+<#assign parentName = parentPojo.shortName?uncap_first>
- <rich:tab label="${property.name}">
+ <rich:tab label="${label(property.name)}">
<div class="association" id="${property.name}Parent">
<h:outputText value="There is no ${property.name} associated with this ${componentName}."
rendered="${'#'}{${homeName}.instance.${property.name} == null}"/>
- <rich:dataTable var="${parentName}"
+ <rich:dataTable var="_${parentName}"
value="${'#'}{${homeName}.instance.${property.name}}"
rendered="${'#'}{${homeName}.instance.${property.name} != null}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
-<#if !c2h.isCollection(parentProperty) && !util.isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
+<#if !c2h.isCollection(parentProperty) && !isToOne(parentProperty) && parentProperty != parentPojo.versionProperty!>
<#if parentPojo.isComponent(parentProperty)>
<#foreach componentProperty in parentProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${label(componentProperty.name)}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${componentProperty.name}}" indent=16/>
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}}
+ <f:facet name="header">${label(parentProperty.name)}</f:facet>
+ <@outputValue property=parentProperty expression="${'#'}{_${parentName}.${parentProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
-<#if util.isToOne(parentProperty)>
+<#if isToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
<h:column>
- <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
+ <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet>
+ <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}" indent=16/>
</h:column>
</#foreach>
<#else>
<h:column>
- <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
- ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
+ <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
+ <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
</#foreach>
<h:column>
- <f:facet name="header">action</f:facet>
+ <f:facet name="header">Action</f:facet>
<s:link id="view${parentName}"
value="View"
view="/${parentPageName}.xhtml">
<#if parentPojo.isComponent(parentPojo.identifierProperty)>
<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
- <f:param name="${parentName}${util.upper(componentProperty.name)}"
- value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
+ <f:param name="${parentName}${componentProperty.name?cap_first}"
+ value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
- value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
+ <f:param name="${parentName}${parentPojo.identifierProperty.name?cap_first}"
+ value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}}"/>
</#if>
</s:link>
</h:column>
@@ -124,65 +125,65 @@
</#if>
<#if c2h.isOneToManyCollection(property)>
- <rich:tab label="${property.name}">
- <div class="association" id="${property.name}Children">
+ <rich:tab label="${label(property.name)}">
+ <h:form styleClass="association" id="${property.name}Children">
<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
<#assign childPageName = childPojo.shortName>
<#assign childEditPageName = childPojo.shortName + "Edit">
-<#assign childName = util.lower(childPojo.shortName)>
+<#assign childName = childPojo.shortName?uncap_first>
<#assign childHomeName = childName + "Home">
<h:outputText value="There are no ${property.name} associated with this ${componentName}."
rendered="${'#'}{empty ${homeName}.${property.name}}"/>
<rich:dataTable value="${'#'}{${homeName}.${property.name}}"
- var="${childName}"
+ var="_${childName}"
rendered="${'#'}{not empty ${homeName}.${property.name}}"
rowClasses="rvgRowOne,rvgRowTwo"
id="${property.name}Table">
<#foreach childProperty in childPojo.allPropertiesIterator>
-<#if !c2h.isCollection(childProperty) && !util.isToOne(childProperty) && childProperty != childPojo.versionProperty!>
+<#if !c2h.isCollection(childProperty) && !isToOne(childProperty) && childProperty != childPojo.versionProperty!>
<#if childPojo.isComponent(childProperty)>
<#foreach componentProperty in childProperty.value.propertyIterator>
- <h:column>
- <f:facet name="header">${componentProperty.name}</f:facet>
- ${'#'}{${childName}.${childProperty.name}.${componentProperty.name}}
- </h:column>
+ <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}">
+ <f:facet name="header">${label(componentProperty.name)}</f:facet>
+ <@outputValue property=childProperty expression="${'#'}{_${childName}.${childProperty.name}}" indent=16/>
+ </rich:column>
</#foreach>
<#else>
- <h:column>
- <f:facet name="header">${childProperty.name}</f:facet>
- <h:outputText value="${'#'}{${childName}.${childProperty.name}}"/>
- </h:column>
+ <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}}">
+ <f:facet name="header">${label(childProperty.name)}</f:facet>
+ <@outputValue property=childProperty expression="${'#'}{_${childName}.${childProperty.name}}" indent=16/>
+ </rich:column>
</#if>
</#if>
</#foreach>
<h:column>
- <f:facet name="header">action</f:facet>
+ <f:facet name="header">Action</f:facet>
<s:link id="select${childName}"
value="Select"
view="/${childPageName}.xhtml">
<#if childPojo.isComponent(childPojo.identifierProperty)>
<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
- <f:param name="${childName}${util.upper(componentProperty.name)}"
- value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
+ <f:param name="${childName}${componentProperty.name?cap_first}"
+ value="${'#'}{_${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
</#foreach>
<#else>
- <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
- value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+ <f:param name="${childName}${childPojo.identifierProperty.name?cap_first}"
+ value="${'#'}{_${childName}.${childPojo.identifierProperty.name}}"/>
</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</rich:dataTable>
- </div>
+ </h:form>
<div class="actionButtons">
<s:button
value="Add ${childName}"
view="/${childEditPageName}.xhtml">
- <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
+ <f:param name="${componentName}${pojo.identifierProperty.name?cap_first}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
<f:param name="${childName}From" value="${entityName}"/>
</s:button>
Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/viewproperty.xhtml.ftl
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/viewproperty.xhtml.ftl 2008-12-03 09:03:13 UTC (rev 9699)
+++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/viewproperty.xhtml.ftl 2008-12-03 15:31:33 UTC (rev 9700)
@@ -5,59 +5,15 @@
<#foreach componentProperty in property.value.propertyIterator>
<s:decorate id="${componentProperty.name}" template="layout/display.xhtml">
- <ui:define name="label">${componentProperty.name}</ui:define>
-<#if isDate(componentProperty)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="date" dateStyle="short"/>
- </h:outputText>
-<#elseif isTime(componentProperty)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="time"/>
- </h:outputText>
-<#elseif isTimestamp(componentProperty)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
- </h:outputText>
-<#elseif isBigDecimal(componentProperty)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <f:convertNumber/>
- </h:outputText>
-<#elseif isBigInteger(componentProperty)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <f:convertNumber integerOnly="true"/>
- </h:outputText>
-<#else>
- ${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}
-</#if>
+ <ui:define name="label">${label(componentProperty.name)}</ui:define>
+ <@outputValue property=componentProperty expression="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" indent=12/>
</s:decorate>
</#foreach>
<#else>
<s:decorate id="${property.name}" template="layout/display.xhtml">
- <ui:define name="label">${property.name}</ui:define>
-<#if isDate(property)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
- <s:convertDateTime type="date" dateStyle="short"/>
- </h:outputText>
-<#elseif isTime(property)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
- <s:convertDateTime type="time"/>
- </h:outputText>
-<#elseif isTimestamp(property)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
- </h:outputText>
-<#elseif isBigDecimal(property)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
- <f:convertNumber/>
- </h:outputText>
-<#elseif isBigInteger(property)>
- <h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
- <f:convertNumber integerOnly="true"/>
- </h:outputText>
-<#else>
- ${'#'}{${homeName}.instance.${property.name}}
-</#if>
+ <ui:define name="label">${label(property.name)}</ui:define>
+ <@outputValue property=property expression="${'#'}{${homeName}.instance.${property.name}}" indent=12/>
</s:decorate>
</#if>
</#if>
15 years, 5 months
- 1
- 0
Seam SVN: r9699 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-03 04:03:13 -0500 (Wed, 03 Dec 2008)
New Revision: 9699
Modified:
trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java
trunk/src/main/org/jboss/seam/deployment/Scanner.java
trunk/src/main/org/jboss/seam/deployment/URLScanner.java
trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
Log:
JBSEAM-3722 (excluded dirs)
Modified: trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java 2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java 2008-12-03 09:03:13 UTC (rev 9699)
@@ -1,6 +1,7 @@
package org.jboss.seam.deployment;
import java.io.DataInputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
@@ -206,5 +207,10 @@
{
return new Handler(name, deploymentStrategy.getDeploymentHandlers().entrySet(), deploymentStrategy.getClassLoader()).handle();
}
+
+ public void scanDirectories(File[] directories, File[] excludedDirectories)
+ {
+ scanDirectories(directories);
+ }
}
Modified: trunk/src/main/org/jboss/seam/deployment/Scanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/Scanner.java 2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/Scanner.java 2008-12-03 09:03:13 UTC (rev 9699)
@@ -17,11 +17,18 @@
* Recursively scan directories, skipping directories in the exclusion list.
*
* @param directories An array of the roots of the directory trees to scan
- * @param excludedDirectories Directories to skip over during the recursive scan
*/
public void scanDirectories(File[] directories);
/**
+ * Recursively scan directories, skipping directories in the exclusion list.
+ *
+ * @param directories An array of the roots of the directory trees to scan
+ * @param excludedDirectories Directories to skip over during the recursive scan
+ */
+ public void scanDirectories(File[] directories, File[] excludedDirectories);
+
+ /**
* Scan for structures which contain any of the given resources in their root
*
* @param resources The resources to scan for
Modified: trunk/src/main/org/jboss/seam/deployment/URLScanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/URLScanner.java 2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/URLScanner.java 2008-12-03 09:03:13 UTC (rev 9699)
@@ -40,7 +40,8 @@
scanDirectories(directories, new File[0]);
}
- public void scanDirectories(File[] directories, File... excludedDirectories)
+ @Override
+ public void scanDirectories(File[] directories, File[] excludedDirectories)
{
for (File directory : directories)
{
Modified: trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java 2008-12-03 09:03:13 UTC (rev 9699)
@@ -69,7 +69,7 @@
@Override
public void scan()
{
- getScanner().scanDirectories(warRoot/*, excludedDirectories*/);
+ getScanner().scanDirectories(warRoot, excludedDirectories);
postScan();
}
15 years, 5 months
- 1
- 0