[jboss-cvs] jboss-profiler ...

Takuro Okada t2-okada at nri.co.jp
Fri Mar 2 00:39:04 EST 2007


  User: tokada  
  Date: 07/03/02 00:39:04

  Modified:    jboss-profiler     Tag: JBossProfiler_Expansion
                        project.properties build.xml .classpath readme.txt
  Log:
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.6   +10 -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.5
  retrieving revision 1.7.2.6
  diff -u -b -r1.7.2.5 -r1.7.2.6
  --- project.properties	19 Feb 2007 11:07:46 -0000	1.7.2.5
  +++ project.properties	2 Mar 2007 05:39:04 -0000	1.7.2.6
  @@ -15,7 +15,11 @@
   
   # Change these properties for the JBoss Application Server used.
   jboss.dir=C:/Servers/jboss-4.0.5.GA
  -jboss.deploy.dir=${jboss.dir}/server/default
  +jboss.deploy.dir=${jboss.dir}/server/profiler
  +
  +# Change these properties for the Apache Geronimo used.
  +geronimo.dir=C:/Servers/geronimo-1.1.1
  +geronimo.kernel.jar=geronimo-kernel-1.1.1.jar
   
   # Change these properties for the JBoss AOP used.
   jboss.aop.lib.dir=C:/Java/Library/AOP/jboss-aop_1.5.2.GA/lib
  @@ -27,5 +31,9 @@
   openlaszlo.target.canvas=jbossprofiler.lzx
   
   # This property is used to name .sar folder and .war file
  -service.name=jboss-profiler
  +artifact.id=jboss-profiler
  +
  +# This property is used as JMX service name (object name)
  +#jmx.service.name=jboss.profiler:service=ProfilerService
  +jmx.service.name=geronimo:J2EEServer=geronimo,ServiceModule=jboss-profiler/jboss-profiler/1.5.0/car,j2eeType=GBean,name=ProfilerService
   
  
  
  
  1.37.2.7  +43 -13    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.6
  retrieving revision 1.37.2.7
  diff -u -b -r1.37.2.6 -r1.37.2.7
  --- build.xml	19 Feb 2007 11:07:46 -0000	1.37.2.6
  +++ build.xml	2 Mar 2007 05:39:04 -0000	1.37.2.7
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<project name="jboss-profiler-exp" default="deploy-jboss" basedir=".">
  +<project name="jboss-profiler-exp" default="build-all" basedir=".">
     
     <property file="project.properties" />
     
  @@ -8,6 +8,7 @@
       <fileset dir="${lib.dir}" includes="*.jar"/>
       <fileset dir="${jboss.dir}/server/default/lib" includes="javax.servlet.jar"/>
       <fileset dir="${jboss.aop.lib.dir}" includes="${jboss.aop.lib.jar}"/>
  +    <fileset dir="${geronimo.dir}/lib" includes="${geronimo.kernel.jar}"/>
     </path>
     
     <path id="openlaszlo.build.classpath">
  @@ -17,8 +18,14 @@
       <fileset dir="${openlaszlo.dir}/WEB-INF/lib" includes="*.jar"/>
     </path>
     
  +  <target name="build-all">
  +    <antcall target="jar"/>
  +    <antcall target="jar-interceptor-only"/>
  +    <antcall target="war"/>
  +  </target>
  +  
     <target name="compile-java">
  -    <delete dir="${build.dir}"/>
  +    <delete dir="${build.java.dir}"/>
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.java.dir}"/>
       <javac srcdir="${src.java.dir}" destdir="${build.java.dir}"
  @@ -31,6 +38,8 @@
     </target>
     
     <target name="compile-webapp">
  +    <delete dir="${build.webapp.dir}"/>
  +    <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.webapp.dir}"/>
       <input message="This script applies some patches to LPS components in ${openlaszlo.dir}. Do you want to continue? " validargs="y,n" addproperty="openlaszlo.updatable"/>
       <condition property="openlaszlo.update.abort">
  @@ -48,35 +57,56 @@
     </target>
     
     <target name="jar" depends="compile-java">
  -    <jar jarfile="${build.dir}/${service.name}.jar">
  +    <delete file="${build.dir}/${artifact.id}.jar"/>
  +    <jar jarfile="${build.dir}/${artifact.id}.jar">
         <fileset dir="${build.java.dir}"/>
       </jar>
     </target>
     
  +  <target name="jar-interceptor-only" depends="compile-java">
  +    <delete file="${build.dir}/${artifact.id}-interceptor.jar"/>
  +    <jar jarfile="${build.dir}/${artifact.id}-interceptor.jar">
  +      <fileset dir="${build.java.dir}">
  +        <include name="**/adaptor/*.class"/>
  +        <include name="**/agent/IProfilerService.class"/>
  +        <include name="**/agent/collector/*.class"/>
  +        <include name="**/agent/collector/model/*.class"/>
  +        <include name="**/interceptor/**"/>
  +        <include name="**/util/*.class"/>
  +      </fileset>
  +    </jar>
  +  </target>
  +  
     <target name="war" depends="compile-webapp">
  +    <delete file="${build.dir}/${artifact.id}.war"/>
       <copy todir="${build.webapp.dir}">
         <fileset dir="${src.webapp.dir}" includes="*.html"/>
       </copy>
  -    <war warfile="${build.dir}/${service.name}.war" webxml="${src.webapp.dir}/WEB-INF/web.xml">
  +    <copy file="${src.webapp.dir}/WEB-INF/web.xml" tofile="${build.webapp.dir}/WEB-INF/web.xml" filtering="yes">
  +      <filterset>
  +        <filter token="jmx.service.name" value="${jmx.service.name}"/>
  +      </filterset>
  +    </copy>
  +    <war warfile="${build.dir}/${artifact.id}.war" webxml="${build.webapp.dir}/WEB-INF/web.xml">
         <fileset dir="${build.webapp.dir}" includes="**/*"/>
       </war>
     </target>
     
  -  <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"/>
  +  <target name="deploy-to-jboss" depends="jar,war">
  +    <delete dir="${jboss.deploy.dir}/deploy/${artifact.id}.sar"/>
  +    <mkdir dir="${jboss.deploy.dir}/deploy/${artifact.id}.sar"/>
       <copy todir="${jboss.deploy.dir}/lib">
         <fileset dir="${lib.dir}" includes="*.jar" excludes="log4j*"/>
  -      <fileset file="${build.dir}/${service.name}.jar"/>
  +      <fileset file="${build.dir}/${artifact.id}.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.config.agent.dir}/jboss-service.xml"/>
  -    <copy todir="${jboss.deploy.dir}/conf" file="${src.config.dir}/collector-config.xml"/>
  +    <mkdir dir="${jboss.deploy.dir}/deploy/${artifact.id}.sar/META-INF"/>
  +    <copy todir="${jboss.deploy.dir}/deploy/${artifact.id}.sar/META-INF" file="${src.config.agent.dir}/jboss-service.xml"/>
  +    <copy todir="${jboss.deploy.dir}/conf" file="${src.config.dir}/jboss/collector-config.xml"/>
       <copy todir="${jboss.dir}/docs/licenses">
         <fileset dir="${docs.dir}/licenses" includes="*.txt"/>
       </copy>
  -    <delete file="${jboss.deploy.dir}/deploy/${service.name}.war"/>
  -    <copy todir="${jboss.deploy.dir}/deploy" file="${build.dir}/${service.name}.war"/>
  +    <delete file="${jboss.deploy.dir}/deploy/${artifact.id}.war"/>
  +    <copy todir="${jboss.deploy.dir}/deploy" file="${build.dir}/${artifact.id}.war"/>
     </target>
     
   </project>
  
  
  
  1.18.2.6  +4 -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.5
  retrieving revision 1.18.2.6
  diff -u -b -r1.18.2.5 -r1.18.2.6
  --- .classpath	19 Feb 2007 11:07:46 -0000	1.18.2.5
  +++ .classpath	2 Mar 2007 05:39:04 -0000	1.18.2.6
  @@ -4,9 +4,11 @@
   	<classpathentry output="build/test" kind="src" path="java/src/tests"/>
   	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   	<classpathentry kind="var" path="JUNIT_HOME/junit.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="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jar"/>
  +	<classpathentry kind="var" path="JBOSS_HOME/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="var" path="GERONIMO_HOME/lib/geronimo-kernel-1.1.1.jar"/>
  +	<classpathentry kind="lib" path="java/libs/aspectwerkz-2.0.jar"/>
   	<classpathentry kind="output" path="build/bin"/>
   </classpath>
  
  
  
  1.10.2.3  +5 -2      jboss-profiler/readme.txt
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: readme.txt
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/readme.txt,v
  retrieving revision 1.10.2.2
  retrieving revision 1.10.2.3
  diff -u -b -r1.10.2.2 -r1.10.2.3
  --- readme.txt	26 Oct 2006 08:43:48 -0000	1.10.2.2
  +++ readme.txt	2 Mar 2007 05:39:04 -0000	1.10.2.3
  @@ -1,3 +1,6 @@
  +JBoss Profiler Expansion 1.5
  +
  +
   REQUIREMENT
   
   - JDK 5.0
  @@ -5,7 +8,7 @@
   - OpenLaszlo 3.3 (Development Kit)
   
   
  -BUILDING AND DEPLOYING
  +BUILDING
   
   1. Edit the project.properties file for your environment.
   2. Run Apache Ant.
  @@ -32,5 +35,5 @@
   COPYRIGHT
   
   Copyright 2006, JBoss Inc.
  -Copyright 2006 Nomura Research Institute, Ltd. All Rights Reserved.
  +Copyright 2006-2007 Nomura Research Institute, Ltd. All Rights Reserved.
   Copyright(c) Information-technology Promotion Agency, Japan. All rights reserved 2006.
  
  
  



More information about the jboss-cvs-commits mailing list