[Jboss-cvs] JBossAS SVN: r55861 - in trunk/admin-console: . src/install
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 14 00:17:13 EDT 2006
Author: peterj
Date: 2006-08-14 00:17:10 -0400 (Mon, 14 Aug 2006)
New Revision: 55861
Added:
trunk/admin-console/src/install/build.xml
trunk/admin-console/src/install/jboss-service.xml
trunk/admin-console/src/install/readme.txt
Modified:
trunk/admin-console/build.xml
Log:
JBADMCON-147
Add the necessary files to both package a binary version of
the admin console, and to install the console.
Modified: trunk/admin-console/build.xml
===================================================================
--- trunk/admin-console/build.xml 2006-08-14 04:17:07 UTC (rev 55860)
+++ trunk/admin-console/build.xml 2006-08-14 04:17:10 UTC (rev 55861)
@@ -14,7 +14,7 @@
<!-- ================================================================== -->
<!-- Temporary build file until jbossbuild.xml becomes the main build -->
<!-- ================================================================== -->
-<project name="project.temp" default="war" basedir=".">
+<project name="project.temp" default="package" basedir=".">
<property name="project.thirdparty" value="../thirdparty" />
<property name="project.root" value=".." />
<property file="${basedir}/build.properties" />
@@ -62,6 +62,7 @@
<!-- Frequently used locations -->
<property name="dir" location="${basedir}" />
<property name="dir.out" location="${dir}/output/${build.out}" />
+ <property name="dir.out.dist" location="${dir.out}/dist" />
<property name="dir.out.lib" location="${dir.out}/lib" />
<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" />
@@ -74,6 +75,7 @@
<property name="dir.out.webtest-classes" location="${dir.out}/webtest-classes" />
<property name="dir.out.main-classes" location="${dir.out}/classes" />
<property name="dir.src" location="${dir}/src" />
+ <property name="dir.src.dist" location="${dir.src}/install" />
<property name="dir.src.main" location="${dir.src}/main" />
<property name="dir.src.test" location="${dir.src}/test" />
<property name="dir.src.webtest" location="${dir.src}/webtest" />
@@ -110,6 +112,17 @@
</war>
</target>
+ <!-- ==============================================
+ package: build the binary distribution package
+ ==============================================-->
+ <target name="package" depends="war" description="build the binary distribution package">
+ <mkdir dir="${dir.out.dist}" />
+ <zip destfile="${dir.out.dist}/admin-console.zip">
+ <fileset dir="${dir.src.dist}" />
+ <fileset file="${dir.out.lib}/admin-console.war" />
+ </zip>
+ </target>
+
<!-- ==========================================
deploy: .war to $JBOSS_HOME.default-server
==========================================-->
@@ -141,9 +154,6 @@
<include name="jstl*.jar" />
<include name="standard*.jar" />
</fileset>
- <fileset dir="${apache.oro.lib}">
- <include name="jakarta-oro*.jar" />
- </fileset>
<fileset dir="${apache.validator.lib}">
<include name="commons-validator*.jar" />
</fileset>
@@ -160,7 +170,7 @@
<include name="commons-fileupload*.jar" />
</fileset>
<fileset dir="${apache.lang.lib}">
- <include name="commons-lang-2.0.jar" />
+ <include name="commons-lang-2.1.jar" />
</fileset>
<fileset dir="${dom4j.dom4j.lib}">
<include name="dom4j*.jar" />
@@ -168,9 +178,12 @@
<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" />
+ -->
</copy>
</target>
Added: trunk/admin-console/src/install/build.xml
===================================================================
--- trunk/admin-console/src/install/build.xml 2006-08-14 04:17:07 UTC (rev 55860)
+++ trunk/admin-console/src/install/build.xml 2006-08-14 04:17:10 UTC (rev 55861)
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * $Id$
+ *
+ * =============================================================================
+ *
+ * This Ant build file installs and uninstalls the Administration Console.
+ *
+ * USAGE
+ * =====
+ *
+ * ant [-Djboss.home=<jboss-home>] [-Dserver.name=<server-name>] [uninstall]
+ *
+ * where
+ *
+ * <jboss-home> is the directory in which the JBoss Application Server 5.0
+ * is installed. If not given, the JBOSS_HOME environment
+ * variable is used. An error displays if neither is provided.
+ *
+ * <server-name> is the name of the server configuration into which the
+ * Administration Console, and the Deployment Service, on which
+ * it depends, is installed. Defaults to 'default'.
+ *
+ * uninstall uninstalls the Administration Console and the Deployment
+ * Service.
+ *
+ * NOTE
+ * ====
+ *
+ * The Administration Console depends on the Deployment Service. If you have
+ * already installed the deployment service, use the targets deploy-admin and
+ * undeploy-admin to install and uninstall the Administration Console.
+ *
+-->
+<project name="install-admin-console" default="install" basedir=".">
+
+ <!--
+ Use the JBOSS_HOME environment variable as the default location for the
+ JBoss Application Server
+ -->
+ <property environment="env" />
+ <property name="jboss.home" location="${env.JBOSS_HOME}" />
+
+ <!-- Default to the 'default' server configuration. -->
+ <property name="server.name" value="default" />
+
+
+ <!-- ===================================================================== -->
+
+ <!-- Location of the deployment service. -->
+ <property name="deployment.home"
+ location="${jboss.home}/docs/examples/varia/deployment-service"
+ />
+
+ <!-- File names of iterest. -->
+ <property name="admin.war" value="admin-console.war" />
+ <property name="deployment.sar" value="deployment-service.sar" />
+
+ <!-- Name of the directory used by the deployment service. -->
+ <property name="deployment.dir" value="deployment-service" />
+
+ <!-- Server directories of interest. -->
+ <property name="server.dir" location="${jboss.home}/server/${server.name}" />
+ <property name="server.conf" location="${server.dir}/conf" />
+ <property name="server.deploy" location="${server.dir}/deploy" />
+ <property name="server.temp" location="${server.dir}/tmp" />
+
+ <!--
+ Determine if the deployment service is already deployed; used to prevent it
+ from being deployed again if installing the admin console.
+ -->
+ <condition property="deployment.exists">
+ <available file="${server.deploy}/${deployment.sar}" />
+ </condition>
+
+
+ <!-- ===================================================================== -->
+ <target description="Install the administration console and its required services."
+ name="install"
+ depends="verify, deploy-deployment, deploy-admin"
+ >
+ <echo>Administration console was installed successfully.</echo>
+ </target>
+
+ <!-- Deploy the deployment service, if not deployed -->
+ <target name="deploy-deployment" unless="deployment.exists">
+ <!-- Copy the templates to the conf directory -->
+ <copy todir="${server.conf}">
+ <fileset dir="${deployment.home}">
+ <include name="templates/**" />
+ </fileset>
+ </copy>
+
+ <!-- Unpack the service into a temporary directory -->
+ <mkdir dir="${server.temp}/${deployment.sar}" />
+ <unjar src="${deployment.home}/${deployment.sar}"
+ dest="${server.temp}/${deployment.sar}"
+ />
+
+ <!--
+ Copy over the modified service configuration file and create the directory
+ mentioned in the that file.
+ -->
+ <copy file="jboss-service.xml"
+ tofile="${server.temp}/${deployment.sar}/META-INF/jboss-service.xml"
+ overwrite="true"
+ >
+ <filterset>
+ <filter token="DEPLOYMENT-DIR" value="${deployment.dir}" />
+ </filterset>
+ </copy>
+ <mkdir dir="${server.deploy}/deployment-service" />
+
+ <!-- Move the temporary files to the deploy directory. -->
+ <move todir="${server.deploy}"
+ file="${server.temp}/${deployment.sar}"
+ />
+
+ </target>
+
+ <!-- Deploy the administration console -->
+ <target name="deploy-admin">
+ <copy file="${admin.war}" tofile="${server.deploy}/${admin.war}" />
+ </target>
+
+
+ <!-- ===================================================================== -->
+ <target description="Uninstall the administration console and the services on which it depends."
+ name="uninstall"
+ depends="verify, undeploy-admin, undeploy-deployment"
+ >
+ <echo>Administration console was uninstalled successfully.</echo>
+ </target>
+
+ <target name="undeploy-deployment">
+ <delete dir="${server.deploy}/${deployment.sar}" />
+ <delete dir="${server.deploy}/${deployment.dir}" />
+ <delete dir="${server.conf}/templates" />
+ </target>
+
+ <target name="undeploy-admin">
+ <delete file="${server.deploy}/${admin.war}" />
+ </target>
+
+
+ <!-- ===================================================================== -->
+ <target name="verify">
+ <!-- Verify that jboss.home is valid. Check for some random files. -->
+ <condition property="jboss.home.exists">
+ <and>
+ <available file="${jboss.home}/client/jbossall-client.jar" />
+ <available file="${jboss.home}/bin/run.jar" />
+ <available file="${deployment.home}/${deployment.sar}" />
+ </and>
+ </condition>
+ <fail unless="jboss.home.exists"
+ message="The setting for jboss.home is not valid. Enter 'ant help' for usage instructions."
+ />
+
+ <!-- Verify that server.name is valid. Check for some random files. -->
+ <condition property="server.name.exists">
+ <and>
+ <available file="${server.dir}/lib/jboss.jar" />
+ <available file="${server.dir}/deploy/jbossweb-tomcat6.sar/catalina.jar" />
+ </and>
+ </condition>
+ <fail unless="server.name.exists"
+ message="The setting for server.name is not valid. Enter 'ant help' for usage instructions."
+ />
+ </target>
+
+
+ <!-- ===================================================================== -->
+ <target description="Display usage text." name="help">
+ <echo>
+ <![CDATA[
+Usage: ant [-Djboss.home=xxx] [-Dserver.name=yyy] [uninstall]
+ 'xxx' is the directory in which JBoss AS is installed.
+ 'yyy' is the name of the server. Defaults to 'default'.
+ uninstall uninstalls the Administration Console.
+]]>
+ </echo>
+ </target>
+
+</project>
Property changes on: trunk/admin-console/src/install/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Revision Author URL
Added: trunk/admin-console/src/install/jboss-service.xml
===================================================================
--- trunk/admin-console/src/install/jboss-service.xml 2006-08-14 04:17:07 UTC (rev 55860)
+++ trunk/admin-console/src/install/jboss-service.xml 2006-08-14 04:17:10 UTC (rev 55861)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Documentation for the deployment service can be found at:
+ http://www.jboss.org/wiki/Wiki.jsp?page=DeploymentService
+-->
+<server>
+ <mbean code="org.jboss.services.deployment.DeploymentService"
+ name="jboss:service=DeploymentService">
+ <attribute name="DeployDir">deploy/@DEPLOYMENT-DIR@</attribute>
+
+ <!--
+ <attribute name="TemplateDir">conf/templates</attribute>
+ <attribute name="DeployDir">deploy</attribute>
+ <attribute name="UndeployDir">undeploy</attribute>
+ -->
+ </mbean>
+</server>
\ No newline at end of file
Property changes on: trunk/admin-console/src/install/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Revision Author URL
Added: trunk/admin-console/src/install/readme.txt
===================================================================
--- trunk/admin-console/src/install/readme.txt 2006-08-14 04:17:07 UTC (rev 55860)
+++ trunk/admin-console/src/install/readme.txt 2006-08-14 04:17:10 UTC (rev 55861)
@@ -0,0 +1,38 @@
+JBoss Administration Console 1.1
+================================
+
+The JBoss Administration Console is a Web-based user interface that can be used
+to manage:
+ * Data sources
+ * Message destinations, both queues and topics
+ * General Java Messaging Service (JMS) properties
+
+The JBoss Administration Console runs on the JBoss Application Server 5.0, and
+uses the optional Deployment Service that comes with the application server.
+Unlike the web console, changes made with the Administration Console are
+persistent, being retained even when the application server is restarted.
+
+
+Installation
+------------
+
+You must have a 1.6.x version of Apache Ant to install the Console. To install,
+see the directions in the build.xml file.
+
+
+Contents
+--------
+
+This package contains the following files:
+
+ admin-console.war - the administration console Web app
+ build.xml - installation script
+ jboss-service.xml - deployment service configuration file used during install
+ readme.txt - this file
+
+
+License
+-------
+
+The JBoss Administration Console is licensed under LGPL 2.1, available at
+http://www.gnu.org/licenses/lgpl.html.
More information about the jboss-cvs-commits
mailing list