[Jboss-cvs] JBossAS SVN: r56508 - in trunk/admin-console: . src/resources/admin-console.war/WEB-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 1 11:41:51 EDT 2006
Author: chilin
Date: 2006-09-01 11:41:49 -0400 (Fri, 01 Sep 2006)
New Revision: 56508
Modified:
trunk/admin-console/.classpath
trunk/admin-console/build.xml
trunk/admin-console/src/resources/admin-console.war/WEB-INF/web.xml
Log:
Exclude wsabi & hibernate related definitions/files from the war file. Get standard dom4j.jar (with the xpath package) from jboss repository for the Console build.
Modified: trunk/admin-console/.classpath
===================================================================
--- trunk/admin-console/.classpath 2006-09-01 15:16:08 UTC (rev 56507)
+++ trunk/admin-console/.classpath 2006-09-01 15:41:49 UTC (rev 56508)
@@ -4,6 +4,7 @@
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="src" path="src/webtest"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="tmp_libs/dom4j.jar"/>
<classpathentry kind="lib" path="tmp_libs/webtest/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="tmp_libs/webtest/commons-httpclient-3.0.jar"/>
<classpathentry kind="lib" path="tmp_libs/webtest/commons-io-1.1.jar"/>
@@ -27,7 +28,6 @@
<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/hibernate3.jar"/>
<classpathentry kind="var" path="JBOSS_HOME/lib/endorsed/xalan.jar"/>
<classpathentry kind="var" path="JBOSS_HOME/lib/jboss-common.jar"/>
- <classpathentry kind="var" path="JBOSS_HEAD/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/jaxen/lib/jaxen.jar"/>
<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/apache-struts/lib/struts-1.2.6.jar"/>
<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/apache-log4j/lib/log4j.jar"/>
Modified: trunk/admin-console/build.xml
===================================================================
--- trunk/admin-console/build.xml 2006-09-01 15:16:08 UTC (rev 56507)
+++ trunk/admin-console/build.xml 2006-09-01 15:41:49 UTC (rev 56508)
@@ -82,7 +82,6 @@
<property name="dir.out.lib.webinf-jars" location="${dir.out.lib}/WEB-INF-jars" />
<property name="dir.out.lib.test-jars" location="${dir.out.lib}/test-jars" />
<property name="dir.out.lib.webtest-jars" location="${dir.out.lib}/webtest-jars" />
- <property name="dir.out.lib.tmp" location="${dir.out.lib}/tmp" />
<property name="dir.out.report" location="${dir.out}/test-reports" />
<property name="dir.out.report.text" location="${dir.out.report}/text" />
<property name="dir.out.classes" location="${dir.out}/classes" />
@@ -96,11 +95,23 @@
<property name="dir.src.webtest" location="${dir.src}/webtest" />
<property name="dir.src.resources" location="${dir.src}/resources" />
<property name="dir.src.resources.war" location="${dir.src.resources}/admin-console.war" />
+ <property name="dir.tmp_libs" location="${dir}/tmp_libs" />
+ <!-- ==============================================
+ get-dom4j: get dom4j.jar from jboss repository
+ ============================================== -->
+ <target name="get-dom4j" description="get dom4j.jar from jboss repository">
+ <get src="http://repository.jboss.com/dom4j-dom4j/1.6/lib/dom4j.jar"
+ dest="${dir.tmp_libs}/dom4j.jar"
+ usetimestamp="true" />
+ <available file="${dir.tmp_libs}/dom4j.jar" property="dom4j.jar.present" />
+ <fail unless="dom4j.jar.present" message="dom4j.jar is not present under the tmp_libs directory"/>
+ </target>
+
<!-- ===============================
compile: production source code
=============================== -->
- <target name="compile" description="compile: production source code">
+ <target name="compile" depends="get-dom4j" description="compile: production source code">
<mkdir dir="${dir.out.classes}" />
<depend destdir="${dir.out.classes}" srcdir="${dir.src.main}">
<classpath>
@@ -121,8 +132,8 @@
<target name="war" depends="compile,copy-WEB-INF-jars" description="war: package console in a .war">
<mkdir dir="${dir.out.lib}" />
<war destfile="${dir.out.lib}/admin-console.war" webxml="${dir.src.resources.war}/WEB-INF/web.xml">
- <classes dir="${dir.out.classes}" includes="**" />
- <fileset dir="${dir.src.resources.war}" includes="**" excludes="**/web.xml" />
+ <classes dir="${dir.out.classes}" excludes="**/hibernate/**" />
+ <fileset dir="${dir.src.resources.war}" excludes="**/web.xml, **/wsabi/**, **/wsabi.*, **/hibernate/**" />
<lib dir="${dir.out.lib.webinf-jars}" />
</war>
</target>
@@ -187,18 +198,16 @@
<fileset dir="${apache.lang.lib}">
<include name="commons-lang-2.1.jar" />
</fileset>
- <fileset dir="${dom4j.dom4j.lib}">
- <include name="dom4j*.jar" />
+ <fileset dir="${dir.tmp_libs}">
+ <include name="dom4j.jar" />
</fileset>
<fileset dir="${jaxen.jaxen.lib}">
<include name="jaxen.jar" />
</fileset>
- <!--
- *** Do not include the unauthorized thrid-party libraries at this time
- <fileset dir="${basedir}/tmp_libs" includes="displaytag-1.0-rc1.jar,
- wsabi4j2ee.jar,
- wsabi4j2ee-jboss.jar" />
- -->
+ <!-- *** Do not include the unauthorized thrid-party libraries at this time -->
+ <fileset dir="${dir.tmp_libs}"
+ includes="displaytag-1.0-rc1.jar"
+ excludes="wsabi4j2ee.jar, wsabi4j2ee-jboss.jar" />
</copy>
</target>
@@ -216,7 +225,7 @@
<fileset dir="${dir.out}/lib">
<include name="**/*.jar" />
</fileset>
- <fileset dir="${dir}/tmp_libs">
+ <fileset dir="${dir.tmp_libs}">
<include name="*.jar" />
</fileset>
<fileset dir="${apache.log4j.lib}">
@@ -341,8 +350,8 @@
required to run webtest but are either not available in
thirdparty or has a version conflict with what's currently
used in thirdparty. -->
- <fileset dir="${dir}/tmp_libs">
- <include name="webtest/*.jar" />
+ <fileset dir="${dir.tmp_libs}/webtest">
+ <include name="*.jar" />
</fileset>
<fileset dir="${apache.codec.lib}">
@@ -412,23 +421,4 @@
<copy file="${dir.src.test}/log4j.xml" todir="${dir.out.test-classes}" overwrite="true" />
</target>
- <!-- =================================
- set-xxx-classpath:
- A different classpath is required for building and running the webtest.
- This presents no problem when running the build from the command shell, but eclipse does
- not provide a "classpath-per-source-subset", so we cheat by adding the .jars needed by webtest
- when we want to build or run it.
- NOTE THAT THE FOLLOWING TWO TARGETS OVERWRITE THE .classpath FILE, so be sure to save yours
- if it contains changes you wish to keep.
- ================================= -->
- <target name="set-eclipse-webtest-classpath" description="set classpath for eclipse build of webtest">
- <copy verbose="true" overwrite="true" file="${dir}/.classpath-webtest" tofile="${dir}/.classpath" />
- <echo>Please refresh the eclipse project to apply changes.</echo>
- </target>
-
- <target name="set-production-classpath" description="set the classpath to its production value">
- <copy verbose="true" overwrite="true" file="${dir}/.classpath-production" tofile="${dir}/.classpath" />
- <echo>Please refresh the eclipse project to apply changes.</echo>
- </target>
-
- </project>
+</project>
Modified: trunk/admin-console/src/resources/admin-console.war/WEB-INF/web.xml
===================================================================
--- trunk/admin-console/src/resources/admin-console.war/WEB-INF/web.xml 2006-09-01 15:16:08 UTC (rev 56507)
+++ trunk/admin-console/src/resources/admin-console.war/WEB-INF/web.xml 2006-09-01 15:41:49 UTC (rev 56508)
@@ -34,6 +34,8 @@
/WEB-INF/conf/jms/struts-config.xml
</param-value>
</init-param>
+
+ <!-- Not fully implementated yet......
<init-param>
<param-name>config/wsabi</param-name>
<param-value>/WEB-INF/conf/wsabi/wsabi-struts.xml</param-value>
@@ -42,6 +44,8 @@
<param-name>config/hibernate</param-name>
<param-value>/WEB-INF/conf/hibernate/struts-config.xml</param-value>
</init-param>
+ -->
+
<init-param>
<param-name>debug</param-name>
<param-value>2</param-value>
More information about the jboss-cvs-commits
mailing list