Author: ekoneil Date: Tue Dec 28 18:51:47 2004 New Revision: 123589 URL: http://svn.apache.org/viewcvs?view=rev&rev=123589 Log: Commit a patch for JIRA 102. This patch is a contribution by Bryan Che and adds support for JOnAS.
This patches the distribution, but there are still issues with running the SVN tree against various servers. More comments / thoughts in the JIRA bug. BB: self DRT: Beehive pass Modified: incubator/beehive/trunk/build.xml incubator/beehive/trunk/test/ant/buildWebapp.xml incubator/beehive/trunk/test/ant/buildWebappCore.xml incubator/beehive/trunk/test/ant/runTomcat.xml incubator/beehive/trunk/test/ant/runTomcatCore.xml incubator/beehive/trunk/user/beehive.properties Modified: incubator/beehive/trunk/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&rev=123589&p1=incubator/beehive/trunk/build.xml&r1=123588&p2=incubator/beehive/trunk/build.xml&r2=123589 ============================================================================== --- incubator/beehive/trunk/build.xml (original) +++ incubator/beehive/trunk/build.xml Tue Dec 28 18:51:47 2004 @@ -281,7 +281,8 @@ <fileset file="${beehive.user.dir}/webappRuntimeCore.xml"/> <fileset file="${beehive.test.dir}/ant/buildWebapp.xml"/> <fileset file="${beehive.test.dir}/ant/buildWebappCore.xml"/> - <fileset file="${beehive.test.dir}/ant/runTomcatCore.xml"/> + <fileset file="${beehive.test.dir}/ant/run*Core.xml"/> + <fileset file="${beehive.test.dir}/ant/beehive.*.properties"/> </copy> <copy todir="${dist.dir}" failOnError="true"> Modified: incubator/beehive/trunk/test/ant/buildWebapp.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/ant/buildWebapp.xml?view=diff&rev=123589&p1=incubator/beehive/trunk/test/ant/buildWebapp.xml&r1=123588&p2=incubator/beehive/trunk/test/ant/buildWebapp.xml&r2=123589 ============================================================================== --- incubator/beehive/trunk/test/ant/buildWebapp.xml (original) +++ incubator/beehive/trunk/test/ant/buildWebapp.xml Tue Dec 28 18:51:47 2004 @@ -5,11 +5,6 @@ <property environment="os"/> <property file="${os.BEEHIVE_HOME}/beehive.properties"/> - <property name="tomcat.home" location="${tomcat.dir}"/> - - <property name="catalina.username" value="manager"/> - <property name="catalina.password" value="manager"/> - <path id="velocity.classpath"> <fileset file="${velocity14.jar}"/> <fileset file="${velocitydep14.jar}"/> Modified: incubator/beehive/trunk/test/ant/buildWebappCore.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/ant/buildWebappCore.xml?view=diff&rev=123589&p1=incubator/beehive/trunk/test/ant/buildWebappCore.xml&r1=123588&p2=incubator/beehive/trunk/test/ant/buildWebappCore.xml&r2=123589 ============================================================================== --- incubator/beehive/trunk/test/ant/buildWebappCore.xml (original) +++ incubator/beehive/trunk/test/ant/buildWebappCore.xml Tue Dec 28 18:51:47 2004 @@ -35,14 +35,12 @@ <fileset dir="${webapp.dir}/WEB-INF/lib"> <include name="*.jar"/> </fileset> - <fileset dir="${tomcat.home}/common/lib"> - <include name="*.jar"/> - </fileset> </path> <!-- this path is separate for now because it includes the velocity JARs used in the control compiler --> <path id="controls.build.classpath"> <path refid="webapp.build.classpath"/> + <path refid="appserver.build.classpath"/> <path refid="velocity.classpath"/> </path> Modified: incubator/beehive/trunk/test/ant/runTomcat.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/ant/runTomcat.xml?view=diff&rev=123589&p1=incubator/beehive/trunk/test/ant/runTomcat.xml&r1=123588&p2=incubator/beehive/trunk/test/ant/runTomcat.xml&r2=123589 ============================================================================== --- incubator/beehive/trunk/test/ant/runTomcat.xml (original) +++ incubator/beehive/trunk/test/ant/runTomcat.xml Tue Dec 28 18:51:47 2004 @@ -3,7 +3,7 @@ <project name="Beehive/RunTomcat" default="usage" basedir="."> <property environment="os"/> - <property file="${os.BEEHIVE_HOME}/beehive.properties"/> + <property file="${os.BEEHIVE_HOME}/ant/beehive.tomcat.properties"/> <!-- define properties needed for runTomcatCore --> <property name="tomcat.home" location="${tomcat.dir}"/> Modified: incubator/beehive/trunk/test/ant/runTomcatCore.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/ant/runTomcatCore.xml?view=diff&rev=123589&p1=incubator/beehive/trunk/test/ant/runTomcatCore.xml&r1=123588&p2=incubator/beehive/trunk/test/ant/runTomcatCore.xml&r2=123589 ============================================================================== --- incubator/beehive/trunk/test/ant/runTomcatCore.xml (original) +++ incubator/beehive/trunk/test/ant/runTomcatCore.xml Tue Dec 28 18:51:47 2004 @@ -1,15 +1,21 @@ <?xml version="1.0"?> -<!-- - Expected properties: - - catalina-ant.jar - - catalina.username - - catalina.password - - tomcat.home ---> <project name="Beehive/RunTomcatTasks" default="usage" basedir="."> + <property file="beehive.tomcat.properties"/> + + <property name="tomcat.home" location="${tomcat.dir}"/> + + <property name="catalina.username" value="manager"/> + <property name="catalina.password" value="manager"/> + <property name="catalina-ant.jar" location="${tomcat.home}/server/lib/catalina-ant.jar"/> + + <path id="appserver.build.classpath"> + <fileset dir="${tomcat.home}/common/lib"> + <include name="*.jar"/> + </fileset> + </path> <target name="deploy" description="Deploy a webapp to a running Tomcat server"> <fail unless="context.path" message="Can't deploy webapp; the value ${context.path} was unspecified"/> Modified: incubator/beehive/trunk/user/beehive.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive.properties?view=diff&rev=123589&p1=incubator/beehive/trunk/user/beehive.properties&r1=123588&p2=incubator/beehive/trunk/user/beehive.properties&r2=123589 ============================================================================== --- incubator/beehive/trunk/user/beehive.properties (original) +++ incubator/beehive/trunk/user/beehive.properties Tue Dec 28 18:51:47 2004 @@ -5,7 +5,6 @@ # beehive.dir=${os.BEEHIVE_HOME} -tomcat.dir=${os.CATALINA_HOME} ant.dir=${os.ANT_HOME} log4j.dir=${os.LOG4J_HOME} @@ -13,8 +12,7 @@ tools.jar=${os.JAVA_HOME}/lib/tools.jar ant.jar=${ant.dir}/lib/ant.jar log4j.jar=${log4j.dir}/dist/lib/log4j-1.2.8.jar -servlet24.jar=${tomcat.dir}/common/lib/servlet-api.jar -jsp20.jar=${tomcat.dir}/common/lib/jsp-api.jar +#servlet24.jar,jsp20.jar set in appserver properties file # External JARs included in the Beehive distribution jsr173.jar=${beehive.dir}/lib/common/jsr173_1.0_api.jar @@ -26,5 +24,6 @@ controls.jar=${beehive.dir}/lib/controls/controls.jar netui-compiler.jar=${beehive.dir}/lib/netui/beehive-netui-compiler.jar -# -appserver.ant=${beehive.dir}/ant/runTomcatCore.xml \ No newline at end of file +# Application Server to use +#appserver.ant=${beehive.dir}/ant/runJonasCore.xml +appserver.ant=${beehive.dir}/ant/runTomcatCore.xml
