river-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jonathan Costers <jonathan.cost...@googlemail.com>
Subject Re: svn commit: r822497 - in /incubator/river/jtsk/trunk: build.xml common.xml lib/ lib/asm-3.2.jar lib/asm-commons-3.2.jar poms/tools/pom.xml qa/build.xml src/manifest/tools.mf
Date Wed, 07 Oct 2009 08:08:59 GMT
Hi

My reasoning was that the same logic was added to the jtreg target
before (move back jars before ending the jtreg target).
But you're right, when killing (Ctrl-C) the JTreg target nothing gets
moved.

I'll add it back later today.

Best
Jonathan

Op woensdag 07-10-2009 om 09:44 uur [tijdzone +1000], schreef Peter
Firmstone:
> Jonathan,
> 
> Can we keep the separate jtreg teardown target?  If the jtreg task is 
> cancelled before completion, the files need to be moved back manually.
> 
> Otherwise, we might check that the files have been moved back in the 
> jtreg task itself?
> 
> jcosters@apache.org wrote:
> > Author: jcosters
> > Date: Tue Oct  6 20:54:40 2009
> > New Revision: 822497
> >
> > URL: http://svn.apache.org/viewvc?rev=822497&view=rev
> > Log:
> > RIVER-272:
> > - moved ASM JARs to lib directory, removed tools directory
> > - updated build.xml and common.xml accordingly
> > - updated tools.jar manifest accordingly
> > - add ASM dependency to tools.jar POM
> > RIVER-304:
> > - removed unused jtreg-teardown target (copying back JARs is done inside jtreg target)
> > - add more QA test categories to run by qa.run target
> >
> > Added:
> >     incubator/river/jtsk/trunk/lib/   (with props)
> >     incubator/river/jtsk/trunk/lib/asm-3.2.jar   (props changed)
> >       - copied unchanged from r821547, incubator/river/jtsk/trunk/tools/asm-3.2.jar
> >     incubator/river/jtsk/trunk/lib/asm-commons-3.2.jar   (props changed)
> >       - copied unchanged from r821547, incubator/river/jtsk/trunk/tools/asm-commons-3.2.jar
> > Modified:
> >     incubator/river/jtsk/trunk/build.xml
> >     incubator/river/jtsk/trunk/common.xml
> >     incubator/river/jtsk/trunk/poms/tools/pom.xml
> >     incubator/river/jtsk/trunk/qa/build.xml
> >     incubator/river/jtsk/trunk/src/manifest/tools.mf
> >
> > Modified: incubator/river/jtsk/trunk/build.xml
> > URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=822497&r1=822496&r2=822497&view=diff
> > ==============================================================================
> > --- incubator/river/jtsk/trunk/build.xml (original)
> > +++ incubator/river/jtsk/trunk/build.xml Tue Oct  6 20:54:40 2009
> > @@ -78,7 +78,6 @@
> >          <include name="${lib-dl}/**"/>
> >          <include name="${lib-ext}/**"/>
> >          <include name="${configentry}/**"/>
> > -        <include name="tools/**"/>
> >      </fileset>
> >  
> >      <fileset id="examples.bin.files" dir="${basedir}/examples">
> > @@ -145,7 +144,7 @@
> >          <include name="${doc}/specs/html/**"/>
> >          <include name="${src}/**"/>
> >          <exclude name="${src}/**/*.sh"/>
> > -        <include name="tools/**"/>
> > +        <include name="${lib}/${asm.jars.pattern}"/>
> >          <include name="${poms}/**"/>
> >          <include name="${test.src}/**"/>
> >          <include name="${test.lib}/**"/>
> > @@ -203,7 +202,6 @@
> >          <mkdir dir="${configentry.dir}"/>
> >          <mkdir dir="${doc.api.dir}"/>
> >          <mkdir dir="${doc.spec.api.dir}"/>
> > -        <mkdir dir="${lib.dir}"/>
> >          <mkdir dir="${lib-dl.dir}"/>
> >          <mkdir dir="${lib-ext.dir}"/>
> >      </target>
> > @@ -424,7 +422,7 @@
> >  
> >      <target name="install-policy"
> >  		description="Installs jsk-policy.jar into the JRE extensions directory.">
> > -        <copy file="${lib-ext.dir}/jsk-policy.jar"	todir="${jre.ext.dir}"/>
> > +        <copy file="${lib-ext.dir}/jsk-policy.jar" todir="${jre.ext.dir}"/>
> >      </target>
> >      
> >      <target name="uninstall-policy"
> > @@ -453,7 +451,9 @@
> >  
> >      <target name="clean-jars"
> >  		description="Deletes the lib, lib-dl, and lib-ext directories.">
> > -        <delete dir="${lib.dir}" quiet="true"/>
> > +        <delete dir="${lib.dir}" quiet="true">
> > +            <exclude name="${asm.jars.pattern}"/>
> > +        </delete>
> >          <delete dir="${lib-dl.dir}"	quiet="true"/>
> >          <delete dir="${lib-ext.dir}" quiet="true"/>
> >      </target>
> > @@ -1934,11 +1934,12 @@
> >          <classdep output="${tools.deps}"
> >                  classpathref="classdep.classes.classpath">
> >              <arg value="-cp"/>
> > -            <arg pathref="river.classes"/>
> > +            <arg pathref="classdep.classes.classpath"/>
> >              <arg value="-files"	/>
> >              <arg line="${jskprivate.include}"/>
> >              <arg line="-in com.sun.jini.tool"/>
> >              <arg line="-in com.sun.jini.start"/>
> > +            <arg line="-out org.objectweb.asm"/>
> >              <arg value="com.sun.jini.tool.CheckConfigurationFile"/>
> >              <arg value="com.sun.jini.tool.CheckSer"/>
> >              <arg value="com.sun.jini.tool.ClassDep"/>
> > @@ -2001,11 +2002,8 @@
> >      <target name="qa.run" depends="" description="Run QA tests">
> >          <!-- Call qa subcomponent build -->
> >          <ant dir="qa" target="run-categories" inheritall="false">
> > -            <!-- these run OK -->
> > -            <property name="run.categories" value="id,loader,policyprovider,
> > -                locatordiscovery,activation,config,discoverymanager,
> > -                discoveryservice,joinmanager,url,iiop,jrmp,reliability,
> > -                thread"/>
> > +            <property name="run.categories"
> > +                value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread"/>
> >          </ant>
> >      </target>
> >  
> >
> > Modified: incubator/river/jtsk/trunk/common.xml
> > URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=822497&r1=822496&r2=822497&view=diff
> > ==============================================================================
> > --- incubator/river/jtsk/trunk/common.xml (original)
> > +++ incubator/river/jtsk/trunk/common.xml Tue Oct  6 20:54:40 2009
> > @@ -74,7 +74,6 @@
> >      <property name="jdk.packages" location="${root}/${doc}/j2se"/>
> >      <property name="api.copyright" value="Copyright 2007, multiple authors.&lt;br&gt;Licensed
under the &lt;a href=&quot;http://www.apache.org/licenses/LICENSE-2.0&quot; target=&quot;child&quot;
&gt;Apache License, Version 2.0&lt;/a&gt;, see the &lt;a href=&quot;{@docRoot}/doc-files/NOTICE&quot;
target=&quot;child&quot; &gt;NOTICE&lt;/a&gt; file for attributions."/>
> >  
> > -
> >      <!--## Private package inclusions for use with classdep; the
> >          ## classes in these packages are both not part of the JSK
> >          ## platform and not public (have generated javadoc).
> > @@ -91,29 +90,34 @@
> >      <!-- Common packages to exclude within ClassDep -->
> >      <property name="jskplatform.exclude" value="-out com.sun.jini.discovery
-out net.jini.activation -out net.jini.config -out net.jini.constraint -out net.jini.core
-out net.jini.export -out net.jini.id -out net.jini.iiop -out net.jini.io -out net.jini.jeri
-out net.jini.jrmp -out net.jini.loader -out net.jini.security -out net.jini.url -skip net.jini.discovery.ConstrainableLookupLocator
-skip net.jini.discovery.ConstrainableLookupLocatorTrustVerifier -skip com.sun.jini.config.ConfigUtil
-skip com.sun.jini.config.KeyStores -skip com.sun.jini.logging.LogManager"/>
> >  
> > -    <patternset id="java.source">
> > -        <include name="**/*.java"/>
> > -    </patternset>
> > -
> >      <property name="river.home" location="${root}"/>
> >      <property name="river.lib.dir" location="${river.home}/${lib}"/>
> >      <property name="river.lib-ext.dir" location="${river.home}/${lib-ext}"/>
> >      <property name="river.classes.dir" location="${river.home}/${build.classes}"/>
> >      <property name="river.src.dir" location="${river.home}/${src}"/>
> >  
> > +    <property name="asm.jars.pattern" value="asm*.jar" />
> > +
> > +    <patternset id="java.source">
> > +        <include name="**/*.java"/>
> > +    </patternset>
> > +
> >      <!-- classpath containing River distribution -->
> >      <!-- TODO: split into multiple paths -->
> >      <path id="river.jars">
> > -        <fileset dir="${river.lib.dir}" includes="**/*.jar" />
> > +        <fileset dir="${river.lib.dir}" includes="**/*.jar" excludes="${asm.jars.pattern}"
/>
> >      </path>
> >  
> >      <path id="river.classes">
> >          <pathelement path="${river.classes.dir}"/>
> >      </path>
> >  
> > +    <fileset id="asm.jars" dir="${river.lib.dir}">
> > +        <include name="${asm.jars.pattern}"/>
> > +    </fileset>
> > +
> >      <path id="asm.classpath">
> > -        <pathelement path="${river.home}/tools/asm-3.2.jar"/>
> > -        <pathelement path="${river.home}/tools/asm-commons-3.2.jar"/>
> > +        <fileset refid="asm.jars" />
> >      </path>
> >  
> >      <path id="classdep.classes.classpath">
> > @@ -123,7 +127,7 @@
> >  
> >      <path id="classdep.jar.classpath">
> >          <pathelement location="${river.lib.dir}/classdep.jar"/>
> > -        <path refid="asm.classpath" />
> > +        <!--<path refid="asm.classpath" />-->
> >      </path>
> >  
> >      <path id="classdep.classpath">
> >
> > Propchange: incubator/river/jtsk/trunk/lib/
> > ------------------------------------------------------------------------------
> > --- svn:ignore (added)
> > +++ svn:ignore Tue Oct  6 20:54:40 2009
> > @@ -0,0 +1,33 @@
> > +phoenix.jar
> > +fiddler.jar
> > +jini-ext.jar
> > +reggie.jar
> > +norm.jar
> > +destroy.jar
> > +start.jar
> > +tools.jar
> > +jsk-lib.jar
> > +envcheck.jar
> > +serviceui.jar
> > +phoenix-init.jar
> > +group.jar
> > +browser.jar
> > +mercury.jar
> > +preferredlistgen.jar
> > +outrigger.jar
> > +classserver.jar
> > +checkconfigurationfile.jar
> > +jsk-platform.jar
> > +checkser.jar
> > +outrigger-snaplogstore.jar
> > +sharedvm.jar
> > +mahalo.jar
> > +classdep.jar
> > +jsk-debug-policy.jar
> > +phoenix-group.jar
> > +sun-util.jar
> > +jarwrapper.jar
> > +jini-core.jar
> > +computehttpmdcodebase.jar
> > +jsk-resources.jar
> > +computedigest.jar
> >
> > Propchange: incubator/river/jtsk/trunk/lib/asm-3.2.jar
> > ------------------------------------------------------------------------------
> > --- svn:mergeinfo (added)
> > +++ svn:mergeinfo Tue Oct  6 20:54:40 2009
> > @@ -0,0 +1 @@
> > +/incubator/river/jtsk/skunk/jcosters/tools/asm-3.2.jar:765902-766476
> >
> > Propchange: incubator/river/jtsk/trunk/lib/asm-3.2.jar
> > ------------------------------------------------------------------------------
> >     svn:mime-type = application/octet-stream
> >
> > Propchange: incubator/river/jtsk/trunk/lib/asm-commons-3.2.jar
> > ------------------------------------------------------------------------------
> > --- svn:mergeinfo (added)
> > +++ svn:mergeinfo Tue Oct  6 20:54:40 2009
> > @@ -0,0 +1 @@
> > +/incubator/river/jtsk/skunk/jcosters/tools/asm-commons-3.2.jar:765902-766476
> >
> > Propchange: incubator/river/jtsk/trunk/lib/asm-commons-3.2.jar
> > ------------------------------------------------------------------------------
> >     svn:mime-type = application/octet-stream
> >
> > Modified: incubator/river/jtsk/trunk/poms/tools/pom.xml
> > URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/poms/tools/pom.xml?rev=822497&r1=822496&r2=822497&view=diff
> > ==============================================================================
> > --- incubator/river/jtsk/trunk/poms/tools/pom.xml (original)
> > +++ incubator/river/jtsk/trunk/poms/tools/pom.xml Tue Oct  6 20:54:40 2009
> > @@ -20,5 +20,15 @@
> >  			<artifactId>jsk-lib</artifactId>
> >  			<version>2.2-SNAPSHOT</version>
> >  		</dependency>
> > +        <dependency>
> > +			<groupId>asm</groupId>
> > +			<artifactId>asm</artifactId>
> > +			<version>3.2</version>
> > +		</dependency>
> > +        <dependency>
> > +			<groupId>asm</groupId>
> > +			<artifactId>asm-commons</artifactId>
> > +			<version>3.2</version>
> > +		</dependency>
> >  	</dependencies>
> >  </project>
> > \ No newline at end of file
> >
> > Modified: incubator/river/jtsk/trunk/qa/build.xml
> > URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=822497&r1=822496&r2=822497&view=diff
> > ==============================================================================
> > --- incubator/river/jtsk/trunk/qa/build.xml (original)
> > +++ incubator/river/jtsk/trunk/qa/build.xml Tue Oct  6 20:54:40 2009
> > @@ -91,7 +91,10 @@
> >          **/*.policy, **/*.config, **/*.logging, **/*.prop" />
> >  
> >      <target name="clean" depends="clean-build, clean-lib, clean-trust, clean-doc"
> > -        description="Clean up build" />
> > +            description="Clean up build">
> > +        <delete dir="${jtreg.dir}/JTwork"/>
> > +        <delete dir="${jtreg.dir}/JTreport"/>
> > +    </target>
> >  
> >      <target name="clean-build">
> >          <delete dir="${build.dir}" />
> > @@ -176,19 +179,6 @@
> >          <delete dir="${jtreg.dir}/JTlib-tmp"/>
> >          <fail if="jtreg.fail"/>
> >      </target>
> > -    
> > -    <target name="jtreg-teardown" depends="" description="Move libaries back">
> > -        <move todir="${river.home}/lib">
> > -            <filelist dir="${jtreg.dir}/JTlib-tmp">
> > -                <file name="jsk-lib.jar"/>
> > -                <file name="jsk-platform.jar"/>
> > -                <file name="jsk-resources.jar"/>
> > -                <file name="phoenix-init.jar"/>
> > -                </filelist>
> > -        </move>
> > -        <move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.home}/lib-ext"/>
> > -        <delete dir="${jtreg.dir}/JTlib-tmp"/>
> > -    </target>
> >  
> >      <macrodef name="testrun">
> >          <element name="tr-elements" optional="true" implicit="true"/>
> >
> > Modified: incubator/river/jtsk/trunk/src/manifest/tools.mf
> > URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/manifest/tools.mf?rev=822497&r1=822496&r2=822497&view=diff
> > ==============================================================================
> > --- incubator/river/jtsk/trunk/src/manifest/tools.mf (original)
> > +++ incubator/river/jtsk/trunk/src/manifest/tools.mf Tue Oct  6 20:54:40 2009
> > @@ -1,3 +1,3 @@
> >  Manifest-Version: 1.0
> >  Main-Class: com.sun.jini.tool.ClassServer
> > -Class-Path: jsk-platform.jar jsk-lib.jar ../tools/asm-3.2.jar ../tools/asm-commons-3.2.jar
> > +Class-Path: jsk-platform.jar jsk-lib.jar asm-3.2.jar asm-commons-3.2.jar
> >
> >
> >
> >   
> 


Mime
View raw message