[seam-commits] Seam SVN: r15502 - in branches/enterprise/WFK-2_1/jboss-seam-gen/dist: ivy and 1 other directory.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Tue May 14 09:04:59 EDT 2013


Author: manaRH
Date: 2013-05-14 09:04:59 -0400 (Tue, 14 May 2013)
New Revision: 15502

Removed:
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy-build.xml
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.settings.xml
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.xml
Modified:
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
Log:
bz916998 removed ivy command from seam-gen as unsupported

Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml	2013-05-13 11:22:23 UTC (rev 15501)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml	2013-05-14 13:04:59 UTC (rev 15502)
@@ -1466,22 +1466,6 @@
         <echo message="Type '${seam.cmd} restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/>
     </target>
 
-    <target name="add-ivy" depends="validate-project" description="Add Ivy to the project for downloading dependencies">
-        <copy todir="${project.home}">
-            <fileset dir="${templates.dir}/ivy"/>
-            <filterset refid="project"/>
-        </copy>
-        <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>
 

Deleted: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy-build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy-build.xml	2013-05-13 11:22:23 UTC (rev 15501)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy-build.xml	2013-05-14 13:04:59 UTC (rev 15502)
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<project basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" name="@projectName at -ivy">
-	<property name="ivy.install.version" value="2.2.0"/>
-	<property name="ivy.jar.dir" value="${lib.dir}/ivy"/>
-	<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
-	<property name="ivy.sync" value="false"/>
-	<property name="ivy.use.symlinks" value="false"/>
-	<property name="central.repo" value="http://repo1.maven.org/maven2"/>
-	<property name="jboss.repo" value="http://repository.jboss.org/nexus/content/groups/public"/>
-
-	<!-- centralize some key artifact versions -->
-	<property name="seam.version" value="2.3.1.Final-redhat-1/>
-	<!--<property name="jsf.version" value="1.2_12"/>
-	<property name="richfaces.version" value="3.3.3.Final"/>
-	<property name="icefaces.version" value="1.8.1"/>
-	<property name="jboss-embedded.version" value="beta3.SP10"/> -->
-
-	<target name="init-ivy">
-		<available property="ivy.installed" value="true" file="${ivy.jar.file}" type="file"/>
-	</target>
-
-	<target name="load-ivy" depends="init-ivy,download-ivy">
-		<path id="ivy.lib.path">
-			<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-		</path>
-		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-		<ivy:settings file="${basedir}/ivy.settings.xml"/>
-	</target>   
-
-	<target name="download-ivy" depends="init-ivy" unless="ivy.installed">
-		<mkdir dir="${ivy.jar.dir}"/>
-		<echo message="Installing ivy..."/>
-		<get src="${central.repo}/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
-			 dest="${ivy.jar.file}"/>
-	</target>
-
-	<target name="inflate-core" depends="load-ivy">
-		<ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="default"/>
-	</target>
-
-	<target name="inflate-source" depends="load-ivy">
-		<ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]" type="source" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="sources"/>
-	</target>
-
-	<target name="inflate-test" depends="load-ivy">
-		<ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]" type="test-jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="test"/>
-	</target>
-
-	<target name="inflate" depends="inflate-core,inflate-source,inflate-test"/>
-
-	<target name="uninflate" depends="deflate"/>
-
-	<target name="deflate">
-		<delete includeemptydirs="true" failonerror="false">
-			 <fileset dir="${lib.dir}">
-				  <include name="**/*"/>
-			 </fileset>
-		</delete>
-   </target>
-
-	<target name="clean-ivy" depends="load-ivy">
-		<ivy:cleancache/>
-	</target>
-
-	<target name="dependency-report" depends="inflate">
-		<ivy:report todir="${dist.dir}/dependency-report"/>
-	</target>
-</project>

Deleted: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.settings.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.settings.xml	2013-05-13 11:22:23 UTC (rev 15501)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.settings.xml	2013-05-14 13:04:59 UTC (rev 15502)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivysettings>
-	<settings defaultResolver="seam"/>
-	<include url="${ivy.default.settings.dir}/ivysettings.xml" />
-	<resolvers>
-		<ibiblio name="jboss" m2compatible="true" usepoms="true" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
-		<chain name="seam" dual="true">
-			<!-- local is always checked; public needs to be before jboss to allow Ivy to properly locate sources -->
-			<resolver ref="public"/>
-			<resolver ref="jboss"/>
-		</chain>
-	</resolvers>
-</ivysettings>

Deleted: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.xml	2013-05-13 11:22:23 UTC (rev 15501)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ivy/ivy.xml	2013-05-14 13:04:59 UTC (rev 15502)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
-	<info organisation="@projectName@" module="@projectName@"/>
-	<configurations defaultconfmapping="default->default;sources->sources;test->default">
-		<conf name="sources" transitive="false" visibility="private"/>
-		<conf name="test" transitive="false" visibility="private"/>
-		<conf name="default" transitive="false"/>
-	</configurations>
-	<dependencies defaultconf="default">
-		<!-- Add your JDBC driver dependency here if you need it -->
-		<!--
-		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.8-brew" conf="default"/>
-		-->
-		<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"/>
-		<dependency org="javax.ejb" name="ejb-api" rev="3.0" conf="default"/>
-		<dependency org="javax.el" name="el-api" rev="1.0" conf="default"/>
-		<dependency org="javax.faces" name="jsf-api" rev="${jsf.version}" conf="default,sources"/>
-		<dependency org="javax.faces" name="jsf-impl" rev="${jsf.version}" conf="default,sources"/>
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default"/>
-		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="default"/>
-		<dependency org="javax.transaction" name="jta" rev="1.1" conf="default"/>
-		<dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.8-seam" conf="default"/>
-		<dependency org="org.antlr" name="antlr-runtime" rev="3.0" conf="default"/>
-		<dependency org="org.drools" name="knowledge-api" rev="5.3.3.Final" conf="default"/>
-		<dependency org="org.drools" name="drools-compiler" rev="5.3.3.Final" conf="default"/>
-		<dependency org="org.drools" name="drools-core" rev="5.3.3.Final" conf="default"/>
-		<dependency org="org.drools" name="drools-decisiontables" rev="5.3.3.Final" conf="default"/>
-		<dependency org="org.drools" name="drools-templates" rev="5.3.3.Final" conf="default"/>
-		<dependency org="xstream" name="xstream" rev="1.1.3" conf="default"/>
-		<dependency org="xpp3" name="xpp3_min" rev="1.1.3.4.O" conf="default"/>
-		<dependency org="org.eclipse.jdt" name="core" rev="3.2.3.v_686_R32x" conf="default"/>
-		<dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4" conf="default"/>
-		<dependency org="org.hibernate" name="hibernate-validator" rev="3.1.0.GA" conf="default"/>
-		<dependency org="org.jboss.el" name="jboss-el" rev="1.0_02.CR5" conf="default"/>
-		<!-- Seam jar is a special case because it's an EJB type and Ivy (at least right now)
-		believes the extension should be ejb, so we have to tell it the correct one. -->
-		<dependency org="org.jboss.seam" name="jboss-seam" rev="${seam.version}" conf="default,sources">
-			<artifact name="jboss-seam" type="jar" ext="jar"/>
-			<artifact name="jboss-seam" type="source" ext="jar" m:classifier="sources"/>
-		</dependency>
-		<dependency org="org.jboss.seam" name="jboss-seam-debug" rev="${seam.version}" conf="default,sources"/>
-		<dependency org="org.jboss.seam" name="jboss-seam-excel" rev="${seam.version}" conf="default,sources"/>
-		<dependency org="org.jboss.seam" name="jboss-seam-ioc" rev="${seam.version}" conf="default,sources"/>
-		<dependency org="org.jboss.seam" name="jboss-seam-mail" rev="${seam.version}" conf="default,sources"/>
-		<dependency org="org.jboss.seam" name="jboss-seam-pdf" rev="${seam.version}" conf="default,sources"/>
-		<dependency org="org.jboss.seam" name="jboss-seam-remoting" rev="${seam.version}" conf="default,sources"/>
-		<dependency org="org.jboss.seam" name="jboss-seam-rss" rev="${seam.version}" conf="default,sources"/>
-		<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.9" 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"/>
-		<dependency org="org.jboss.seam.embedded" name="jboss-embedded-all" rev="${jboss-embedded.version}" conf="test"/>
-		<dependency org="org.jboss.seam.embedded" name="jboss-embedded-api" rev="${jboss-embedded.version}" conf="test"/>
-	</dependencies>
-</ivy-module>



More information about the seam-commits mailing list