[jboss-svn-commits] JBL Code SVN: r12647 - in labs/jbossesb/trunk/product/tools/console: distro and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jun 17 21:20:52 EDT 2007
Author: tcunning
Date: 2007-06-17 21:20:52 -0400 (Sun, 17 Jun 2007)
New Revision: 12647
Added:
labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-application.xml
labs/jbossesb/trunk/product/tools/console/distro/myfaces-application.xml
Modified:
labs/jbossesb/trunk/product/tools/console/build.xml
labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml
labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml
Log:
bug:JBESB-633
Remove el-api.jar and el-ri.jar from the ear we build for jboss-esb-console
Modified: labs/jbossesb/trunk/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/build.xml 2007-06-17 22:36:12 UTC (rev 12646)
+++ labs/jbossesb/trunk/product/tools/console/build.xml 2007-06-18 01:20:52 UTC (rev 12647)
@@ -154,7 +154,6 @@
</copy>
<copy todir="${ear.dir}/META-INF">
<fileset dir="${basedir}/resources/META-INF">
- <include name="application.xml" />
<include name="jboss-app.xml" />
</fileset>
</copy>
Modified: labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml 2007-06-17 22:36:12 UTC (rev 12646)
+++ labs/jbossesb/trunk/product/tools/console/distro/distro-build.xml 2007-06-18 01:20:52 UTC (rev 12647)
@@ -40,18 +40,26 @@
<delete file="console/distro/${db.target}/${dist-props}" />
<ant dir="console/distro/${db.target}" antfile="build.xml" target="capture-config"/>
- <antcall target="filter-files" />
<antcall target="archive" />
<ant dir="console/distro/${db.target}" antfile="build.xml" target="output-instructions" />
</target>
- <target name="jsf-copy" unless="jbossfaces.used">
+ <target name="jsf-copy">
<copy overwrite="true" file="console/distro/${jsf.provider}-web.xml"
tofile="console/jboss-esb-console.war/WEB-INF/web.xml"/>
+ <condition property="is-jbossfaces">
+ <and>
+ <equals arg1="${jsf.provider}" arg2="jbossfaces"/>
+ </and>
+ </condition>
</target>
- <target name="filter-files" depends="jsf-copy">
+ <target name="jsf-excludes" if="is-jbossfaces">
+ <property name="jar.excludes" value="el-*.jar"/>
+ </target>
+
+ <target name="filter-files" depends="jsf-copy,jsf-excludes">
<property file="console/distro/${db.target}/${dist-props}" />
<filterset id="filters" filtersfile="console/distro/${db.target}/${dist-props}"/>
<loadfile property="db.application.modules" srcfile="console/distro/${db.target}/db.application.modules.xml" />
@@ -60,7 +68,7 @@
<copy file="console/distro/${db.target}/persistence.xml" todir="console/${console-package.name}.jar/META-INF" overwrite="true">
<filterset refid="filters" />
</copy>
- <copy file="console/distro/application.xml" todir="console/${console-package.name}.ear/META-INF" overwrite="true">
+ <copy file="console/distro/${jsf.provider}-application.xml" tofile="console/${console-package.name}.ear/META-INF/application.xml" overwrite="true">
<filterset refid="filters" />
<filterset>
<filter token="db.application.modules" value="${db.application.modules}"/>
@@ -77,14 +85,17 @@
</copy>
</target>
- <target name="archive">
+ <target name="archive" depends="filter-files">
<delete dir="temp" failonerror="false"/>
<mkdir dir="temp"/>
-
+
+
<jar jarfile="temp/${console-package.name}.jar" basedir="console/${console-package.name}.jar"/>
<jar jarfile="temp/${console-package.name}.war" basedir="console/${console-package.name}.war"/>
<jar jarfile="${console-package.name}.ear">
- <fileset dir="console/${console-package.name}.ear"/>
+ <fileset dir="console/${console-package.name}.ear">
+ <exclude name="${jar.excludes}"/>
+ </fileset>
<fileset dir="temp">
<include name="${console-package.name}.jar"/>
<include name="${console-package.name}.war"/>
Added: labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-application.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-application.xml (rev 0)
+++ labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-application.xml 2007-06-18 01:20:52 UTC (rev 12647)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application 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/application_5.xsd"
+ version="5">
+
+ <display-name>jboss-esb-console</display-name>
+
+ <module>
+ <web>
+ <web-uri>jboss-esb-console.war</web-uri>
+ <context-root>/jboss-esb-console</context-root>
+ </web>
+ </module>
+
+ <module>
+ <ejb>jboss-esb-console.jar</ejb>
+ </module>
+
+ <module>
+ <java>jboss-esb-console-service.xml</java>
+ </module>
+
+ <!-- Seam and EL -->
+ <module>
+ <java>jboss-seam.jar</java>
+ </module>
+
+ <!-- jBPM -->
+ <module>
+ <java>jbpm-3.1.4.jar</java>
+ </module>
+
+ <!-- Drools and dependencies -->
+ <module>
+ <java>drools-core-3.0.5.jar</java>
+ </module>
+ <module>
+ <java>drools-compiler-3.0.5.jar</java>
+ </module>
+ <module>
+ <java>janino-2.4.3.jar</java>
+ </module>
+ <module>
+ <java>antlr-2.7.6.jar</java>
+ </module>
+ <module>
+ <java>antlr-3.0b7.jar</java>
+ </module>
+ <module>
+ <java>commons-jci-core-1.0-406301.jar</java>
+ </module>
+ <module>
+ <java>commons-jci-janino-2.4.3.jar</java>
+ </module>
+ <module>
+ <java>stringtemplate-3.0.jar</java>
+ </module>
+
+ <!-- Smooks and dependencies -->
+ <module>
+ <java>milyn-smooks-core-0.9-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-commons-0.9-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-edisax-0.2-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-csv-0.1.1.jar</java>
+ </module>
+ <module>
+ <java>opencsv-1.6.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-edi-0.2-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-javabean-0.3-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-misc-0.2.1.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-scripting-0.1.jar</java>
+ </module>
+ <module>
+ <java>groovy-all-1.0.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-templating-0.2.1.jar</java>
+ </module>
+ <module>
+ <java>ognl-2.6.9.jar</java>
+ </module>
+ <module>
+ <java>xbean.jar</java>
+ </module>
+ <module>
+ <java>xmlpublic.jar</java>
+ </module>
+
+
+ <!-- Hypersonic application modules - there are none. -->
+
+
+</application>
Modified: labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml 2007-06-17 22:36:12 UTC (rev 12646)
+++ labs/jbossesb/trunk/product/tools/console/distro/jbossfaces-web.xml 2007-06-18 01:20:52 UTC (rev 12647)
@@ -4,6 +4,16 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
+ <context-param>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+
+
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>/WEB-INF/navigation.xml</param-value>
Added: labs/jbossesb/trunk/product/tools/console/distro/myfaces-application.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/distro/myfaces-application.xml (rev 0)
+++ labs/jbossesb/trunk/product/tools/console/distro/myfaces-application.xml 2007-06-18 01:20:52 UTC (rev 12647)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application 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/application_5.xsd"
+ version="5">
+
+ <display-name>jboss-esb-console</display-name>
+
+ <module>
+ <web>
+ <web-uri>jboss-esb-console.war</web-uri>
+ <context-root>/jboss-esb-console</context-root>
+ </web>
+ </module>
+
+ <module>
+ <ejb>jboss-esb-console.jar</ejb>
+ </module>
+
+ <module>
+ <java>jboss-esb-console-service.xml</java>
+ </module>
+
+ <!-- Seam and EL -->
+ <module>
+ <java>jboss-seam.jar</java>
+ </module>
+ <module>
+ <java>el-api.jar</java>
+ </module>
+ <module>
+ <java>el-ri.jar</java>
+ </module>
+
+ <!-- jBPM -->
+ <module>
+ <java>jbpm-3.1.4.jar</java>
+ </module>
+
+ <!-- Drools and dependencies -->
+ <module>
+ <java>drools-core-3.0.5.jar</java>
+ </module>
+ <module>
+ <java>drools-compiler-3.0.5.jar</java>
+ </module>
+ <module>
+ <java>janino-2.4.3.jar</java>
+ </module>
+ <module>
+ <java>antlr-2.7.6.jar</java>
+ </module>
+ <module>
+ <java>antlr-3.0b7.jar</java>
+ </module>
+ <module>
+ <java>commons-jci-core-1.0-406301.jar</java>
+ </module>
+ <module>
+ <java>commons-jci-janino-2.4.3.jar</java>
+ </module>
+ <module>
+ <java>stringtemplate-3.0.jar</java>
+ </module>
+
+ <!-- Smooks and dependencies -->
+ <module>
+ <java>milyn-smooks-core-0.9-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-commons-0.9-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-edisax-0.2-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-csv-0.1.1.jar</java>
+ </module>
+ <module>
+ <java>opencsv-1.6.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-edi-0.2-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-javabean-0.3-SNAPSHOT.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-misc-0.2.1.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-scripting-0.1.jar</java>
+ </module>
+ <module>
+ <java>groovy-all-1.0.jar</java>
+ </module>
+ <module>
+ <java>milyn-smooks-templating-0.2.1.jar</java>
+ </module>
+ <module>
+ <java>ognl-2.6.9.jar</java>
+ </module>
+ <module>
+ <java>xbean.jar</java>
+ </module>
+ <module>
+ <java>xmlpublic.jar</java>
+ </module>
+
+ @db.application.modules@
+
+</application>
More information about the jboss-svn-commits
mailing list