Author: ekoneil Date: Tue Jan 18 17:31:03 2005 New Revision: 125577 URL: http://svn.apache.org/viewcvs?view=rev&rev=125577 Log: Slight doc tweaks based on feedback from Kyle.
- "check.setup" now checks for JSR 173 - add comment to BUILDING.txt about execute permissions and fix misspelling BB: self DRT: none Modified: incubator/beehive/trunk/BUILDING.txt incubator/beehive/trunk/build.xml Modified: incubator/beehive/trunk/BUILDING.txt Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/BUILDING.txt?view=diff&rev=125577&p1=incubator/beehive/trunk/BUILDING.txt&r1=125576&p2=incubator/beehive/trunk/BUILDING.txt&r2=125577 ============================================================================== --- incubator/beehive/trunk/BUILDING.txt (original) +++ incubator/beehive/trunk/BUILDING.txt Tue Jan 18 17:31:03 2005 @@ -15,7 +15,7 @@ After running this command, you should have a directory "trunk/" which contains the current Beehive source. If you ran this command in: - d:\java\beeinve + d:\java\beehive you should have the directory: @@ -49,7 +49,8 @@ Tomcat is used as the default test environment for Beehive. Install Tomcat and set the CATALINA_HOME environment variable to reference the -Tomcat install directory. +Tomcat install directory. If you're installing Tomcat on Linux, +be sure to set the execute bit on the shell scripts in $CATALINA_HOME/bin. If you installed these into d:\java, your environment variables might look something like: @@ -67,21 +68,16 @@ required in order for the Ant <junit> tasks to work correctly. 2) Ensure that Tomcat has the the "manager" role is defined in -${CATALINA_HOME}/conf/tomcat-users.xml with a username/password of -manager/manager. This step is required in order to use the Tomcat Ant -tasks to deploy applications to Tomcat. An example of this file is -available in ${beehive.home}/test/conf/tomcat-users.xml +${CATALINA_HOME}/conf/tomcat-users.xml with a "manager" role and +manager username/password of manager/manager. This step is required +in order to use the Tomcat Ant tasks to deploy applications to Tomcat. +An example of this file is available here: + + ${beehive.home}/test/conf/tomcat-users.xml In the following examples, '$>' is your propmpt at $BEEHIVE_HOME, so if you see '$>ant', type 'ant' (without the quotes) and press [enter]. -To check your Beehive build setup, run: - - $>ant check.setup - -This should end with "BUILD SUCCESSFUL" if you see any failures, be -sure to re-check your setup steps above. - In addition to the external software installed above, Beehive requires one additional JAR to provide JSR 173 support for StAX, which is required by XMLBeans. This JAR is downloaded from the network when @@ -90,6 +86,13 @@ for any subsequent builds. To install the JSR 173 API, run: $>ant bootstrap + +To check your Beehive build setup, run: + + $>ant check.setup + +This should end with "BUILD SUCCESSFUL" if you see any failures, be +sure to re-check your setup steps above. To build Beehive, run: Modified: incubator/beehive/trunk/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&rev=125577&p1=incubator/beehive/trunk/build.xml&r1=125576&p2=incubator/beehive/trunk/build.xml&r2=125577 ============================================================================== --- incubator/beehive/trunk/build.xml (original) +++ incubator/beehive/trunk/build.xml Tue Jan 18 17:31:03 2005 @@ -9,6 +9,7 @@ <!-- Local properties used to specify the installers and the directories into which they should be installed --> <property name="beehive.installed.dir" location="${beehive.home}/installed"/> + <property name="jsr173.jar" location="${beehive.home}/installed/jsr173/jsr173_1.0_api.jar"/> <target name="bootstrap" depends="ensure.proxysettings" description="Install external dependencies to the installed/ directory"> <antcall target="install.deps"/> @@ -78,7 +79,6 @@ <!-- --> <!-- ============================================= --> <target name="ensure.jsr173"> - <property name="jsr173.jar" location="${beehive.home}/installed/jsr173/jsr173_1.0_api.jar"/> <available file="${jsr173.jar}" type="file" property="jsr173.present"/> <antcall target="get.jsr173"/> </target> @@ -175,6 +175,10 @@ </target> <target name="check.setup"> + <available file="${jsr173.jar}" type="file" property="jsr173.available"/> + <fail unless="jsr173.available" message="The JSR 173 JAR does not appear to be installed. Be sure to run "ant bootstrap"."/> + <echo>JSR 173 is installed correctly as ${jsr173.jar}</echo> + <!-- check to see if the JUnit classes are available --> <available classname="junit.framework.TestCase" property="junit.available"/> <fail unless="junit.available" @@ -190,14 +194,15 @@ <!-- note, to ease the transition when removing Tomcat from the build, this will check a hard reference to CATALINA_HOME --> <loadfile srcFile="${os.CATALINA_HOME}/conf/tomcat-users.xml" property="tomcat.users.file" failOnError="true"/> <condition property="tomcat.manager.defined"> - <contains string="${tomcat.users.file}" substring="username="manager""/> + <and> + <contains string="${tomcat.users.file}" substring="rolename="manager""/> + <contains string="${tomcat.users.file}" substring="username="manager""/> + <contains string="${tomcat.users.file}" substring="password="manager""/> + </and> </condition> <fail unless="tomcat.manager.defined" message="The manager role may not be defined in ${os.CATALINA_HOME}/conf/tomcat-users.xml. Please ensure that there is a manager role defined with username/password of manager/manager"/> <echo>manager role appears to be defined in ${os.CATALINA_HOME}/conf/tomcat-users.xml</echo> - - <echo>PATH: ${os.PATH}</echo> - <echo>CLASSPATH: ${os.CLASSPATH}</echo> </target> </project>
