[jboss-cvs] jboss-profiler ...

Takuro Okada t2-okada at nri.co.jp
Wed Apr 11 07:23:39 EDT 2007


  User: tokada  
  Date: 07/04/11 07:23:39

  Modified:    jboss-profiler     Tag: JBossProfiler_Expansion
                        project.properties build.xml .classpath readme.txt
  Log:
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.8   +8 -8      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.7
  retrieving revision 1.7.2.8
  diff -u -b -r1.7.2.7 -r1.7.2.8
  --- project.properties	2 Mar 2007 05:39:59 -0000	1.7.2.7
  +++ project.properties	11 Apr 2007 11:23:39 -0000	1.7.2.8
  @@ -13,23 +13,23 @@
   lib.dir=${basedir}/java/libs
   docs.dir=${basedir}/docs
   
  -# 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
  -
  -# 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
   jboss.aop.lib.jar=jboss-aop.jar
   
  +# 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
  +
   # Change these properties for the OpenLaszlo Development Kit used.
   openlaszlo.dir=C:/Temp/openlaszlo-3.3.3
   openlaszlo.lzc.args=--runtime=swf8 --dir ${build.webapp.dir}/lzx
   openlaszlo.target.canvas=jbossprofiler.lzx
   
  +# 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
  +
   # This property is used to name .sar folder and .war file
   artifact.id=jboss-profiler
   
  
  
  
  1.37.2.8  +30 -8     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.7
  retrieving revision 1.37.2.8
  diff -u -b -r1.37.2.7 -r1.37.2.8
  --- build.xml	2 Mar 2007 05:39:04 -0000	1.37.2.7
  +++ build.xml	11 Apr 2007 11:23:39 -0000	1.37.2.8
  @@ -1,13 +1,17 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<project name="jboss-profiler-exp" default="build-all" basedir=".">
  +<project name="jboss-profiler" default="build-all" basedir=".">
     
     <property file="project.properties" />
     
  -  <path id="build.classpath">
  +  <path id="java.build.classpath">
       <pathelement location="${build.java.dir}"/>
       <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}"/>
  +  </path>
  +  
  +  <path id="geronimo.build.classpath">
  +    <pathelement location="${build.java.dir}"/>
  +    <fileset dir="${lib.dir}" includes="*.jar"/>
       <fileset dir="${geronimo.dir}/lib" includes="${geronimo.kernel.jar}"/>
     </path>
     
  @@ -19,8 +23,11 @@
     </path>
     
     <target name="build-all">
  +    <echo message="This script makes binary modules (JAR/WAR files) into the following directory."/>
  +    <echo message="${build.dir}"/>
  +    <antcall target="compile-java"/>
  +    <antcall target="compile-webapp"/>
       <antcall target="jar"/>
  -    <antcall target="jar-interceptor-only"/>
       <antcall target="war"/>
     </target>
     
  @@ -29,11 +36,26 @@
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.java.dir}"/>
       <javac srcdir="${src.java.dir}" destdir="${build.java.dir}"
  -           classpathref="build.classpath"
  +           classpathref="java.build.classpath"
  +           encoding="${compiler.encoding}"
  +           target="${compiler.target}" source="${compiler.source}" compiler="modern" fork="no" optimize="off"
  +           debug="on" nowarn="on" verbose="off">
  +      <compilerarg value="-Xlint:unchecked"/>
  +      <exclude name="**/geronimo/*.java"/>
  +    </javac>
  +  </target>
  +  
  +  <target name="compile-java-for-geronimo">
  +    <delete dir="${build.java.dir}"/>
  +    <mkdir dir="${build.dir}"/>
  +    <mkdir dir="${build.java.dir}"/>
  +    <javac srcdir="${src.java.dir}" destdir="${build.java.dir}"
  +           classpathref="geronimo.build.classpath"
              encoding="${compiler.encoding}"
              target="${compiler.target}" source="${compiler.source}" compiler="modern" fork="no" optimize="off"
              debug="on" nowarn="on" verbose="off">
         <compilerarg value="-Xlint:unchecked"/>
  +      <exclude name="**/jbossaop/*.java"/>
       </javac>
     </target>
     
  @@ -56,14 +78,14 @@
       </java>
     </target>
     
  -  <target name="jar" depends="compile-java">
  +  <target 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">
  +  <target name="jar-interceptor-only">
       <delete file="${build.dir}/${artifact.id}-interceptor.jar"/>
       <jar jarfile="${build.dir}/${artifact.id}-interceptor.jar">
         <fileset dir="${build.java.dir}">
  @@ -77,7 +99,7 @@
       </jar>
     </target>
     
  -  <target name="war" depends="compile-webapp">
  +  <target name="war">
       <delete file="${build.dir}/${artifact.id}.war"/>
       <copy todir="${build.webapp.dir}">
         <fileset dir="${src.webapp.dir}" includes="*.html"/>
  
  
  
  1.18.2.7  +1 -1      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.6
  retrieving revision 1.18.2.7
  diff -u -b -r1.18.2.6 -r1.18.2.7
  --- .classpath	2 Mar 2007 05:39:04 -0000	1.18.2.6
  +++ .classpath	11 Apr 2007 11:23:39 -0000	1.18.2.7
  @@ -4,11 +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_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="lib" path="java/libs/servlet-api-2.4.jar"/>
   	<classpathentry kind="output" path="build/bin"/>
   </classpath>
  
  
  
  1.10.2.5  +3 -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.4
  retrieving revision 1.10.2.5
  diff -u -b -r1.10.2.4 -r1.10.2.5
  --- readme.txt	5 Mar 2007 03:07:57 -0000	1.10.2.4
  +++ readme.txt	11 Apr 2007 11:23:39 -0000	1.10.2.5
  @@ -1,10 +1,11 @@
  -JBoss Profiler Expansion 1.5
  +JBoss Profiler Extensions
   
   
   REQUIREMENT
   
   - JDK 5.0
   - JBoss AOP 1.5
  +- JBoss Application Server 4.0
   - OpenLaszlo 3.3 (Development Kit)
   
   
  @@ -34,6 +35,6 @@
   
   COPYRIGHT
   
  -Copyright 2006-2007, JBoss Inc.
  +Copyright 2006, JBoss Inc.
   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