[seam-commits] Seam SVN: r11149 - in branches/community/Seam_2_2/seam-gen: icefaces/src and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Jun 12 19:36:45 EDT 2009
Author: dan.j.allen
Date: 2009-06-12 19:36:45 -0400 (Fri, 12 Jun 2009)
New Revision: 11149
Modified:
branches/community/Seam_2_2/seam-gen/build.xml
branches/community/Seam_2_2/seam-gen/icefaces/src/TimerBeanImpl.java
branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
branches/community/Seam_2_2/seam-gen/ivy/ivy.xml
Log:
add support for ICEfaces in add-ivy command
Modified: branches/community/Seam_2_2/seam-gen/build.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/build.xml 2009-06-12 23:31:25 UTC (rev 11148)
+++ branches/community/Seam_2_2/seam-gen/build.xml 2009-06-12 23:36:45 UTC (rev 11149)
@@ -1474,18 +1474,47 @@
</target>
<target name="add-ivy" depends="validate-project" description="Add Ivy to the project for downloading dependencies">
- <fail message="Currently the Ivy build is only configured to support RichFaces projects" if="icefaces.property"/>
<copy todir="${project.home}">
<fileset dir="${templates.dir}/ivy"/>
<filterset refid="project"/>
</copy>
- <replace file="${project.home}/build.xml">
+ <condition property="ivy.present">
+ <isfileselected file="${project.home}/build.xml">
+ <contains text="ivy-build.xml"/>
+ </isfileselected>
+ </condition>
+ <replace dir="${project.home}">
+ <include name="build.xml" unless="ivy.present"/>
<replacetoken><![CDATA[<target name="init"]]></replacetoken>
<replacevalue><![CDATA[<!-- Import Ivy targets for downloading dependencies -->
<import file="${basedir}/ivy-build.xml"/>
<target name="init"]]></replacevalue>
</replace>
+
+ <!-- uncomment richfaces dependencies if not using icefaces -->
+ <replace dir="${project.home}">
+ <include name="ivy.xml" unless="icefaces.property"/>
+ <replacetoken><![CDATA[ [if richfaces] ->]]></replacetoken>
+ <replacevalue><![CDATA[ [if richfaces] -->]]></replacevalue>
+ </replace>
+ <replace dir="${project.home}">
+ <include name="ivy.xml" unless="icefaces.property"/>
+ <replacetoken><![CDATA[<!- [/endif richfaces] ]]></replacetoken>
+ <replacevalue><![CDATA[<!-- [/endif richfaces] ]]></replacevalue>
+ </replace>
+
+ <!-- uncomment icefaces dependencies if using icefaces -->
+ <replace dir="${project.home}">
+ <include name="ivy.xml" if="icefaces.property"/>
+ <replacetoken><![CDATA[ [if icefaces] ->]]></replacetoken>
+ <replacevalue><![CDATA[ [if icefaces] -->]]></replacevalue>
+ </replace>
+ <replace dir="${project.home}">
+ <include name="ivy.xml" if="icefaces.property"/>
+ <replacetoken><![CDATA[<!- [/endif icefaces] ]]></replacetoken>
+ <replacevalue><![CDATA[<!-- [/endif icefaces] ]]></replacevalue>
+ </replace>
</target>
<!-- Do not remove generate-entities, netbeans depends on it -->
Modified: branches/community/Seam_2_2/seam-gen/icefaces/src/TimerBeanImpl.java
===================================================================
--- branches/community/Seam_2_2/seam-gen/icefaces/src/TimerBeanImpl.java 2009-06-12 23:31:25 UTC (rev 11148)
+++ branches/community/Seam_2_2/seam-gen/icefaces/src/TimerBeanImpl.java 2009-06-12 23:36:45 UTC (rev 11149)
@@ -58,8 +58,8 @@
import com.icesoft.faces.context.effects.BlindDown;
import com.icesoft.faces.context.effects.BlindUp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.log.Log;
/**
* @author ICEsoft Technologies, Inc.
@@ -70,6 +70,8 @@
@Scope(ScopeType.PAGE)
public class TimerBeanImpl implements Renderable, Serializable {
+ @Logger private Log log;
+
// expand/contract effects to take place of panelCollapsible
private Effect currentEffect=new BlindUp();
private boolean visibility=false;
@@ -77,7 +79,6 @@
private boolean expanded = false;
private DateFormat dateFormatter;
- private static Log log = LogFactory.getLog(TimerBeanImpl.class);
@In
private RenderManager renderManager;
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 23:31:25 UTC (rev 11148)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 23:36:45 UTC (rev 11149)
@@ -12,6 +12,7 @@
<property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
<property name="richfaces.version" value="3.3.1.GA"/>
+ <property name="icefaces.version" value="1.8.1"/>
<property name="jboss-embedded.version" value="beta3"/>
<target name="init-ivy">
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy.xml 2009-06-12 23:31:25 UTC (rev 11148)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy.xml 2009-06-12 23:36:45 UTC (rev 11149)
@@ -11,7 +11,6 @@
<!--
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.8-brew" conf="default"/>
-->
- <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.15.B1" conf="default,sources"/>
<dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" conf="default,sources"/>
<dependency org="commons-digester" name="commons-digester" rev="1.7" conf="default,sources"/>
<dependency org="janino" name="janino" rev="2.5.10" conf="default"/>
@@ -49,12 +48,23 @@
<dependency org="org.jboss.seam" name="jboss-seam-ui" rev="${seam.version}" conf="default,sources"/>
<dependency org="org.jbpm" name="jbpm-jpdl" rev="3.2.2" conf="default"/>
<dependency org="org.mvel" name="mvel2" rev="2.0.10" conf="default"/>
+ <!-- [if richfaces] ->
+ <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.15.B1" conf="default,sources"/>
<dependency org="org.richfaces.framework" name="richfaces-api" rev="${richfaces.version}" conf="default,sources"/>
<dependency org="org.richfaces.framework" name="richfaces-impl" rev="${richfaces.version}" conf="default,sources"/>
<dependency org="org.richfaces.ui" name="richfaces-ui" rev="${richfaces.version}" conf="default,sources"/>
<dependency org="org.richfaces.samples" name="glassX" rev="${richfaces.version}" conf="default"/>
<dependency org="org.richfaces.samples" name="darkX" rev="${richfaces.version}" conf="default"/>
<dependency org="org.richfaces.samples" name="laguna" rev="${richfaces.version}" conf="default"/>
+ <!- [/endif richfaces] -->
+ <!-- [if icefaces] ->
+ <dependency org="org.icefaces" name="icefaces" rev="${icefaces.version}" conf="default"/>
+ <dependency org="org.icefaces" name="icefaces-comps" rev="${icefaces.version}" conf="default"/>
+ <dependency org="org.icefaces" name="icefaces-facelets" rev="${icefaces.version}" conf="default"/>
+ <dependency org="backport-util-concurrent" name="backport-util-concurrent" rev="2.2" conf="default"/>
+ <dependency org="commons-digester" name="commons-digester" rev="1.8" conf="default"/>
+ <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" conf="default"/>
+ <!- [/endif icefaces] -->
<dependency org="org.testng" name="testng" rev="5.6" conf="test"/>
<dependency org="org.jboss.seam.embedded" name="hibernate-all" rev="${jboss-embedded.version}" conf="test"/>
<dependency org="org.jboss.seam.embedded" name="thirdparty-all" rev="${jboss-embedded.version}" conf="test"/>
More information about the seam-commits
mailing list