[jboss-cvs] jboss-profiler ...

[Takuro Okada]

  User: tokada  
  Date: 07/02/19 06:07:46

  Modified:    jboss-profiler    Tag: JBossProfiler_Expansion
                        project.properties build.xml .classpath
  Log:
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.5   +3 -2      jboss-profiler/project.properties
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: project.properties
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/project.properties,v
  retrieving revision 1.7.2.4
  retrieving revision 1.7.2.5
  diff -u -b -r1.7.2.4 -r1.7.2.5
  --- project.properties	16 Feb 2007 08:47:43 -0000	1.7.2.4
  +++ project.properties	19 Feb 2007 11:07:46 -0000	1.7.2.5
  @@ -5,7 +5,8 @@
   src.dir=${basedir}/java/src
   src.java.dir=${basedir}/java/src/expansion
   src.webapp.dir=${basedir}/java/webapp
  -src.mbean.dir=${basedir}/java/jboss/mbean
  +src.config.dir=${basedir}/java/config
  +src.config.agent.dir=${basedir}/java/config/jboss
   build.dir=${basedir}/build
   build.java.dir=${build.dir}/bin
   build.webapp.dir=${build.dir}/webapp
  @@ -14,7 +15,7 @@
   
   # Change these properties for the JBoss Application Server used.
   jboss.dir=C:/Servers/jboss-4.0.5.GA
  -jboss.deploy.dir=${jboss.dir}/server/profiler
  +jboss.deploy.dir=${jboss.dir}/server/default
   
   # Change these properties for the JBoss AOP used.
   jboss.aop.lib.dir=C:/Java/Library/AOP/jboss-aop_1.5.2.GA/lib
  
  
  
  1.37.2.6  +5 -6      jboss-profiler/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/build.xml,v
  retrieving revision 1.37.2.5
  retrieving revision 1.37.2.6
  diff -u -b -r1.37.2.5 -r1.37.2.6
  --- build.xml	15 Feb 2007 08:33:30 -0000	1.37.2.5
  +++ build.xml	19 Feb 2007 11:07:46 -0000	1.37.2.6
  @@ -1,12 +1,11 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<project name="jboss-profiler-exp" default="deploy" basedir=".">
  +<project name="jboss-profiler-exp" default="deploy-jboss" basedir=".">
     
     <property file="project.properties" />
     
     <path id="build.classpath">
       <pathelement location="${build.java.dir}"/>
       <fileset dir="${lib.dir}" includes="*.jar"/>
  -    <fileset dir="${jboss.dir}/lib" includes="log4j-boot.jar"/>
       <fileset dir="${jboss.dir}/server/default/lib" includes="javax.servlet.jar"/>
       <fileset dir="${jboss.aop.lib.dir}" includes="${jboss.aop.lib.jar}"/>
     </path>
  @@ -63,16 +62,16 @@
       </war>
     </target>
     
  -  <target name="deploy" depends="jar,war">
  +  <target name="deploy-jboss" depends="jar,war">
       <delete dir="${jboss.deploy.dir}/deploy/${service.name}.sar"/>
       <mkdir dir="${jboss.deploy.dir}/deploy/${service.name}.sar"/>
       <copy todir="${jboss.deploy.dir}/lib">
  -      <fileset dir="${lib.dir}" includes="*.jar"/>
  +      <fileset dir="${lib.dir}" includes="*.jar" excludes="log4j*"/>
         <fileset file="${build.dir}/${service.name}.jar"/>
       </copy>
       <mkdir dir="${jboss.deploy.dir}/deploy/${service.name}.sar/META-INF"/>
  -    <copy todir="${jboss.deploy.dir}/deploy/${service.name}.sar/META-INF" file="${src.mbean.dir}/jboss-service.xml"/>
  -    <copy todir="${jboss.deploy.dir}/deploy/${service.name}.sar" file="${src.mbean.dir}/collector-config.xml"/>
  +    <copy todir="${jboss.deploy.dir}/deploy/${service.name}.sar/META-INF" file="${src.config.agent.dir}/jboss-service.xml"/>
  +    <copy todir="${jboss.deploy.dir}/conf" file="${src.config.dir}/collector-config.xml"/>
       <copy todir="${jboss.dir}/docs/licenses">
         <fileset dir="${docs.dir}/licenses" includes="*.txt"/>
       </copy>
  
  
  
  1.18.2.5  +2 -2      jboss-profiler/.classpath
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: .classpath
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/.classpath,v
  retrieving revision 1.18.2.4
  retrieving revision 1.18.2.5
  diff -u -b -r1.18.2.4 -r1.18.2.5
  --- .classpath	15 Feb 2007 08:33:30 -0000	1.18.2.4
  +++ .classpath	19 Feb 2007 11:07:46 -0000	1.18.2.5
  @@ -3,10 +3,10 @@
   	<classpathentry kind="src" path="java/src/expansion"/>
   	<classpathentry output="build/test" kind="src" path="java/src/tests"/>
   	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  -	<classpathentry kind="lib" path="java/libs/javolution.jar"/>
   	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
  -	<classpathentry kind="var" path="JBOSS_SERVER/lib/log4j-boot.jar"/>
   	<classpathentry kind="var" path="JBOSS_SERVER/server/default/lib/javax.servlet.jar"/>
   	<classpathentry kind="var" path="JBOSS_SERVER/server/default/deploy/jboss-aop.deployer/jboss-aop.jar"/>
  +	<classpathentry kind="lib" path="java/libs/javolution-4.2.5.jar"/>
  +	<classpathentry kind="lib" path="java/libs/log4j-1.2.14.jar"/>
   	<classpathentry kind="output" path="build/bin"/>
   </classpath>