[seam-commits] Seam SVN: r8506 - in trunk: build and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2008-07-28 08:07:03 -0400 (Mon, 28 Jul 2008) New Revision: 8506 Removed: trunk/build/jbas5.pom.xml trunk/src/interop/jbas5/ Modified: trunk/build.xml trunk/build/build.xml trunk/build/ci.build.xml trunk/build/common.build.xml Log: Remove the jbas5 integration code, this is now going to be hosted in the as svn repo Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2008-07-28 08:00:02 UTC (rev 8505) +++ trunk/build/build.xml 2008-07-28 12:07:03 UTC (rev 8506) @@ -47,7 +47,6 @@ <deployWithSources pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/> <deployWithSources pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/> <deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/> - <deployWithSources pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/interop/jboss-seam-jbas5-sources.jar"/> <deployWithSources pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/interop/jboss-seam-jul-sources.jar"/> <deployWithSources pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar"/> <deployExample name="booking" repositoryId="offline.repository.jboss.org"/> Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-07-28 08:00:02 UTC (rev 8505) +++ trunk/build/ci.build.xml 2008-07-28 12:07:03 UTC (rev 8506) @@ -23,7 +23,6 @@ <deploySnapshotPom pom="${parent.pom}" /> <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" /> <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/> - <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/> <deploySnapshot pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/> <deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar"/> <deploySnapshot pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar"/> Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-07-28 08:00:02 UTC (rev 8505) +++ trunk/build/common.build.xml 2008-07-28 12:07:03 UTC (rev 8506) @@ -100,7 +100,6 @@ <pomfile name="core.wls.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam-wls-compatible" /> <pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" /> <pomfile name="wicket.pom" value="${build.dir}/wicket.pom.xml" /> - <pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" /> <pomfile name="jul.pom" value="${build.dir}/jul.pom.xml" /> <pomfile name="resteasy.pom" value="${build.dir}/resteasy.pom.xml" /> <pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" /> @@ -213,7 +212,6 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> - <propertyref name="jbas5.pom" /> <propertyref name="wicket.pom" /> <propertyref name="testng.jvmargs"/> <propertyref name="maven.settings.xml" /> @@ -249,8 +247,7 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> - <propertyref name="wicket.pom" /> - <propertyref name="jbas5.pom" /> + <propertyref name="wicket.pom" /> <propertyref name="testng.jvmargs"/> </propertyset> </ant> @@ -284,7 +281,6 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> - <propertyref name="jbas5.pom" /> <propertyref name="wicket.pom" /> <propertyref name="testng.jvmargs"/> <propertyref name="maven.settings.xml" /> @@ -348,7 +344,6 @@ <outputDependencyReport module="ioc" /> <outputDependencyReport module="wicket" /> <outputDependencyReport module="resteasy" /> - <outputDependencyReport module="jbas5" /> <outputDependencyReport module="jul" /> <echo>Dependency Report written to ${seam.dir}/dependency-report.txt</echo> </target> Deleted: trunk/build/jbas5.pom.xml =================================================================== --- trunk/build/jbas5.pom.xml 2008-07-28 08:00:02 UTC (rev 8505) +++ trunk/build/jbas5.pom.xml 2008-07-28 12:07:03 UTC (rev 8506) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jbas5</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>parent</artifactId> - <version&gt;@seam.version(a)&lt;/version&gt; - </parent> - <description>Seam integration with JBoss AS 5</description> - - <!-- 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</groupId> - <artifactId>jboss-vfs</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-07-28 08:00:02 UTC (rev 8505) +++ trunk/build.xml 2008-07-28 12:07:03 UTC (rev 8506) @@ -19,7 +19,6 @@ <property name="classes.mail.dir" value="${classes.dir}/mailclasses" /> <property name="classes.debug.dir" value="${classes.dir}/debugclasses" /> <property name="classes.wicket.dir" value="${classes.dir}/wicketclasses" /> - <property name="classes.jbas5.dir" value="${classes.dir}/jbas5classes" /> <property name="classes.jul.dir" value="${classes.dir}/julclasses" /> <property name="classes.resteasy.dir" value="${classes.dir}/resteasyclasses" /> <property name="classes.remoting.dir" value="${classes.dir}/remotingclasses" /> @@ -38,7 +37,6 @@ <property name="src.mail.dir" value="src/mail" /> <property name="src.debug.dir" value="src/debug" /> <property name="src.wicket.dir" value="src/wicket" /> - <property name="src.jbas5.dir" value="src/interop/jbas5" /> <property name="src.jul.dir" value="src/interop/jul" /> <property name="src.resteasy.dir" value="src/resteasy" /> <property name="src.gen.dir" value="src/gen" /> @@ -72,7 +70,6 @@ <property name="dist.src.mail.dir" value="${dist.dir}/src/mail" /> <property name="dist.src.debug.dir" value="${dist.dir}/src/debug" /> <property name="dist.src.wicket.dir" value="${dist.dir}/src/wicket" /> - <property name="dist.src.jbas5.dir" value="${dist.dir}/src/interop/jbas5" /> <property name="dist.src.jul.dir" value="${dist.dir}/src/interop/jul" /> <property name="dist.src.resteasy.dir" value="${dist.dir}/src/resteasy" /> <property name="dist.src.gen.dir" value="${dist.dir}/src/gen" /> @@ -160,7 +157,7 @@ <delete dir="${lib.dir}" quiet="${quietclean}" /> </target> - <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarjbas5,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" /> + <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" /> <target name="select-compiler"> <available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> @@ -280,20 +277,6 @@ <archive classesdir="${classes.wicket.dir}" module="jboss-seam-wicket" pom="${wicket.pom}" srcdir="${src.wicket.dir}"/> </target> - <!-- ########################### JBAS5 TARGETS ###########################--> - - <target name="initjbas5" depends="init, jarcore"> - <init classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" modulename="jbas5" pom="${jbas5.pom}" /> - </target> - - <target name="compilejbas5" depends="initjbas5, select-compiler"> - <compile classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" classpath="compile.jbas5.path" /> - </target> - - <target name="jarjbas5" depends="compilejbas5" description="Build the distribution .jar file for the JBAS5 integration package"> - <archive classesdir="${classes.jbas5.dir}" module="jboss-seam-jbas5" pom="${jbas5.pom}" srcdir="${src.jbas5.dir}" outputdir="${lib.dir}/interop" /> - </target> - <!-- ########################### JUL TARGETS ###########################--> <target name="initjul" depends="init, jarcore"> @@ -486,7 +469,6 @@ <copysource destdir="${dist.src.mail.dir}" srcdir="${src.mail.dir}" /> <copysource destdir="${dist.src.debug.dir}" srcdir="${src.debug.dir}" /> <copysource destdir="${dist.src.wicket.dir}" srcdir="${src.wicket.dir}" /> - <copysource destdir="${dist.src.jbas5.dir}" srcdir="${src.jbas5.dir}" /> <copysource destdir="${dist.src.jul.dir}" srcdir="${src.jul.dir}" /> <copysource destdir="${dist.src.resteasy.dir}" srcdir="${src.resteasy.dir}" /> <copysource destdir="${dist.src.gen.dir}" srcdir="${src.gen.dir}" /> @@ -995,7 +977,6 @@ <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> <propertyref name="wicket.pom" /> - <propertyref name="jbas5.pom" /> <propertyref name="resteasy.pom" /> <propertyref name="testng.jvmargs"/> </propertyset> @@ -1007,7 +988,6 @@ <dependenciesWithSources id="core" scope="compile" pom="${core.pom}" /> <dependenciesWithSources id="debug" scope="compile" pom="${debug.pom}" /> <dependenciesWithSources id="wicket" scope="compile" pom="${wicket.pom}" /> - <dependenciesWithSources id="jbas5" scope="compile" pom="${jbas5.pom}" /> <dependenciesWithSources id="jul" scope="compile" pom="${jul.pom}" /> <dependenciesWithSources id="resteasy" scope="compile" pom="${resteasy.pom}" /> <dependenciesWithSources id="gen" scope="compile" pom="${gen.pom}" /> @@ -1027,7 +1007,6 @@ <dependencies id="core" scope="compile" pom="${core.pom}" /> <dependencies id="debug" scope="compile" pom="${debug.pom}" /> <dependencies id="wicket" scope="compile" pom="${wicket.pom}" /> - <dependencies id="jbas5" scope="compile" pom="${jbas5.pom}" /> <dependencies id="jul" scope="compile" pom="${jul.pom}" /> <dependencies id="resteasy" scope="compile" pom="${resteasy.pom}" /> <dependencies id="gen" scope="compile" pom="${gen.pom}" /> @@ -1045,7 +1024,6 @@ <path refid="compile.pdf.path" /> <path refid="compile.remoting.path" /> <path refid="compile.ui.path" /> - <path refid="compile.jbas5.path" /> <path refid="compile.jul.path" /> <path refid="compile.resteasy.path" /> <path refid="compile.wicket.path" />