Return-Path: Delivered-To: apmail-incubator-river-dev-archive@locus.apache.org Received: (qmail 36026 invoked from network); 12 Sep 2008 03:53:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Sep 2008 03:53:55 -0000 Received: (qmail 19673 invoked by uid 500); 12 Sep 2008 03:53:52 -0000 Delivered-To: apmail-incubator-river-dev-archive@incubator.apache.org Received: (qmail 19653 invoked by uid 500); 12 Sep 2008 03:53:51 -0000 Mailing-List: contact river-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: river-dev@incubator.apache.org Delivered-To: mailing list river-dev@incubator.apache.org Received: (qmail 19642 invoked by uid 99); 12 Sep 2008 03:53:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2008 20:53:51 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jim.hurley@mac.com designates 17.148.16.86 as permitted sender) Received: from [17.148.16.86] (HELO asmtpout011.mac.com) (17.148.16.86) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Sep 2008 03:52:51 +0000 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Received: from [192.168.1.102] ([24.62.101.113]) by asmtp011.mac.com (Sun Java(tm) System Messaging Server 6.3-7.03 (built Aug 7 2008; 32bit)) with ESMTPSA id <0K7200GKZDA87U20@asmtp011.mac.com> for river-dev@incubator.apache.org; Thu, 11 Sep 2008 20:49:38 -0700 (PDT) Message-id: From: Jim Hurley To: river-dev@incubator.apache.org Subject: Fwd: svn commit: r658927 - in /incubator/river: jtsk/trunk/ qatests/trunk/ qatests/trunk/source/vob/qa/src/ qatests/trunk/source/vob/qa/src/com/sun/jini/test/impl/reggie/ qatests/trunk/source/vob/qa/src/com/sun/jini/test/resources/ qatests/trunk/source/vob/... Date: Thu, 11 Sep 2008 23:49:20 -0400 References: <20080521231037.5D1652388A0A@eris.apache.org> X-Mailer: Apple Mail (2.915) X-Virus-Checked: Checked by ClamAV on apache.org Begin forwarded message: > From: btmurphy@apache.org > Date: May 21, 2008 7:10:36 PM EDT > To: river-commits@incubator.apache.org > Subject: svn commit: r658927 - in /incubator/river: jtsk/trunk/ > qatests/trunk/ qatests/trunk/source/vob/qa/src/ qatests/trunk/source/ > vob/qa/src/com/sun/jini/test/impl/reggie/ qatests/trunk/source/vob/ > qa/src/com/sun/jini/test/resources/ qatests/trunk/source/vob/... > Reply-To: river-dev@incubator.apache.org > > Author: btmurphy > Date: Wed May 21 16:10:35 2008 > New Revision: 658927 > > URL: http://svn.apache.org/viewvc?rev=658927&view=rev > Log: > RIVER-291: Cannot build QA tests using the supplied make files > > Added: > incubator/river/qatests/trunk/qatestsREADME.txt > incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/ > resources/qa1.logging > incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/ > resources/qa1.logging > Modified: > incubator/river/jtsk/trunk/build_common.xml > incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile > incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile.allinc > incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/ > impl/reggie/NameServiceImpl.java > incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/ > resources/qaHarness.prop > incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/ > spec/export/servercontext/GNUmakefile.jars > incubator/river/qatests/trunk/source/vob/tools/java/GNUmakefile > incubator/river/qatests/trunk/source/vob/tools/src/GNUmakefile > incubator/river/trunk/jtsk/build_common.xml > incubator/river/trunk/jtsk/src/com/sun/jini/jeri/internal/runtime/ > Util.java > incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile > incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile.allinc > incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/ > impl/reggie/NameServiceImpl.java > incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/ > resources/qaHarness.prop > incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/ > spec/export/servercontext/GNUmakefile.jars > incubator/river/trunk/qatests/source/vob/tools/java/GNUmakefile > incubator/river/trunk/qatests/source/vob/tools/src/GNUmakefile > > Modified: incubator/river/jtsk/trunk/build_common.xml > URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build_common.xml?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/jtsk/trunk/build_common.xml (original) > +++ incubator/river/jtsk/trunk/build_common.xml Wed May 21 16:10:35 > 2008 > @@ -1059,7 +1059,7 @@ > > > > - > + > > > > > Added: incubator/river/qatests/trunk/qatestsREADME.txt > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/qatestsREADME.txt?rev=658927&view=auto > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/qatestsREADME.txt (added) > +++ incubator/river/qatests/trunk/qatestsREADME.txt Wed May 21 > 16:10:35 2008 > @@ -0,0 +1,181 @@ > + > + > + > + > + > + > + > + > + > + This file describes the steps one can take to build and run > + the tests provided under the 'qatests' directory of the > + river distribution. Note that the steps outlined here assume > + a unix or linux based system with access to the GNU make > + utility. > + > + Wherever the tokens '' or '' appear > + in this document, one should take this to represent, > + respectively, the paths of the trunk in the 'jtsk' working > + directory and the 'qatests' working directory under which > + the river distribution has been checked out from subversion. > + > + For example, consider the directory paths used in the first > + section below, in which source checkout is discussed, > + > + 1. CHECKOUT > + > + Suppose your home directory is /home/myUsername, and suppose you > + checkout the river distribution (including the QA test source) > + from the Apache River Project as show below, > + > + > cd ~ > + > svn checkout https://svn.apache.org/repos/asf/incubator/ > river river > + > + then represents /home/myUsername/river/jtsk/trunk, > + and rerpresents /home/myUsername/river/qatests/ > trunk > + in all commands where the corresponding token appears. When > + using those commands in your own environment, each such token > + should be replaced with the analogous and appropriate path for > + your system. > + > + Note also that there are a number of example commands presented > + in this document that use '~' for the user's home directory. > + In those commands, '~' is allowable. In all other commands > + shown, the absolute path is required. > + > + 2. Set - JAVA_HOME > + > + > export JAVA_HOME=/usr/lib/j2se/jdk1.6.0 > + > + JAVA_HOME must be set as an environment variable. If it is > + not set, then neither the ant scripts used to compile the > + river source, nor the make file used to compile the QA tests, > + will work. In the example command line above, replace the > + value used for the location of the Java home directory > + with the appropriate value for your system. > + > + 3. BUILD - the source > + > + > cd ~/river/jtsk/trunk > + > ant clean (optional) > + > ant > + > ant jars > + > + NOTE: make sure you run the above command from the top-level > + directory, ~/river/jtsk/trunk, NOT one level lower > + (~/river/jtsk/trunk/src). > + > + 4. INSTALL - the policy provider > + > + > su [must be root to execute the install.policy target] > + > + # cd ~/river/jtsk/trunk > + # ant install.policy > + # ls -al /usr/lib/j2se/jdk1.6.0/jre/lib/ext > + > + -rw-r--r-- 1 root root 31106 2008-05-19 17:42 jsk-policy.jar > + > + # exit > + > + -- The Apache River Jini distribution should now be built -- > + > + 5. BUILD - the qa tests > + > + > cd ~/river/qatests/trunk/source/vob > + > make clean (optional) > + > make > + > make jars > + > + 6. INSTALL - the merged policy provider for the qa tests > + > + > su [must be root to install this provider] > + > + # cd ~/river/qatests/trunk/source/vob/qa/lib > + # cp mergedpolicyprovider.jar /usr/lib/j2se/jdk1.6.0/jre/lib/ext > + # exit > + > + In the example command line above, replace the value > + used for the location of the Java home directory with > + the appropriate value for your system. > + > + > + 7. RUNNING - the qa tests > + > + > cd ~/river/qatests/trunk/source/vob/qa/src > + > + NOTE: elements of the command line below are broken > + up below for readability > + > + Example 7a. Run individual test(s) in transient mode, named: > + > + com.sun.jini.test.spec.joinmanager.Register > + com.sun.jini.test.impl.joinmanager.LeaseRenewDurRFE > + > com > .sun.jini.test.impl.servicediscovery.event.LookupTaskServiceIdMapRace > + > + > java > + -cp /source/vob/qa/lib/jiniharness.jar > + :/lib/jsk-platform.jar > + :/lib/jsk-lib.jar > + -Djava.security.policy= > + /source/vob/qa/harness/policy/qa.policy > + -Djava.util.logging.config.file= > + /source/vob/qa/src/com/sun/jini/test/resources/ > qa1.logging > + com.sun.jini.qa.harness.QARunner > + /source/vob/qa/src/com/sun/jini/test/resources/ > qaHarness.prop > + -testJar /source/vob/qa/lib/jinitests.jar > + -tests com/sun/jini/test/spec/joinmanager/Register.td, > + com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td, > + com/sun/jini/test/impl/servicediscovery/event/ > LookupTaskServiceIdMapRace.td > + -com.sun.jini.qa.harness.serviceMode transient > + > + Example 7b. Run all tests in transient mode under the > + joinmanager categories: > + > + > java > + -cp /source/vob/qa/lib/jiniharness.jar > + :/lib/jsk-platform.jar > + :/lib/jsk-lib.jar > + -Djava.security.policy= > + /source/vob/qa/harness/policy/qa.policy > + -Djava.util.logging.config.file= > + /source/vob/qa/src > + /com/sun/jini/test/resources/ > qa1.logging > + com.sun.jini.qa.harness.QARunner > + /source/vob/qa/src > + /com/sun/jini/test/resources/ > qaHarness.prop > + -testJar /source/vob/qa/lib/jinitests.jar > + -categories joinmanager > + -com.sun.jini.qa.harness.serviceMode transient > + > + Examples of test categories that can be run: > + > + joinmanager > + lookupdiscoveryspec > + discoveryservice > + fiddler > + servicediscovery > + servicediscoveryevent > + etc. > + > + MODE: To run the services being tested in activatable > + mode, rather than transient mode as was shown > + above, simply exclude the argument > + '-com.sun.jini.qa.harness.serviceMode transient' > + from each command line in the examples. > + > + POLICY: The system property related to security policy > + is optional when not running the secure test > + configurations. > + > + LOGGING: The system property related to logging is also > + optional, but if it is excluded, then only minimal > + default logging output will be displayed. In the > + examples above, the logging file, > + /source/vob/qa/src/com/sun/jini/test/resources/ > qa1.logging > + is used to configure logging for both the test > + harness and the tests themselves. Most loggers > + referenced in the qa1.logging configuration file > + are initially configured at the INFO level. If > + you would like to see more verbose logging output, > + then edit qa1.logging and change the level of > + the desired logger to the appropriate level. > > Modified: incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile > (original) > +++ incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile Wed > May 21 16:10:35 2008 > @@ -28,21 +28,18 @@ > DOC := $(TOP)/doc > APIDOC := $(DOC)/api > APIDOCCHECK := $(DOC)/api-check > -ifdef PRODUCT > -ifndef VIEW_ROOT > VIEW_ROOT := $(shell (echo $(PWD)) | sed -e 's,/vob.*,,') > export VIEW_ROOT > -endif > ifndef JAVA.home > JAVA.home := $(shell type java | sed -e 's,[^/]*\(.*\)/bin/java$$, > \1,') > export JAVA.home > endif > -endif > > CLASSDIR := $(TOP)/classes > JARSDIR := $(VIEW_ROOT)/vob/jive/lib > DLJARSDIR := $(VIEW_ROOT)/vob/jive/lib-dl > EXTJARSDIR := $(VIEW_ROOT)/vob/jive/lib-ext > +QAJARSDIR := $(VIEW_ROOT)/vob/qa/lib > JIVE_DOC := $(VIEW_ROOT)/vob/jive/doc > MAKEFILE := GNUmakefile > > @@ -184,7 +181,7 @@ > > # The tools directory > # > -TOOLSDIR = $(VIEW_ROOT)/vob/tools > +TOOLSDIR = $(JTSK_ROOT) > TOOLS = $(TOOLSDIR)/src > JARTOOLSDIR = $(TOOLS)/com/sun/jini/tool > > @@ -192,6 +189,11 @@ > CLASSDEP_EXEC = $(JAVA) -cp $(TOOLSCLASSES):$(JAVA.tools) > com.sun.jini.tool.ClassDep -files > MANIFESTDIR = $(SRC)/manifest > > +# For soft link(s) that are necessary for compilation > +# > +JIVE_INC_PATH = $(VIEW_ROOT)/vob/qa/src/GNUmakefile.inc > +JIVE_INC_LINK = $(VIEW_ROOT)/vob/jive/src/GNUmakefile.inc > + > # Compilation flags > # > > @@ -266,7 +268,7 @@ > # Also, we put the target here so that just typing gmake > # will build the entire tree. > # > -all: tools dirs classes stubs > +all: soft_links tools dirs classes stubs > > > # Add the includes here. This way other people can add their > @@ -301,7 +303,7 @@ > > # Just the class files for this package and all subpackages > # > -classes: dirs init_java_list $(FILES.class) build_java_list > +classes: soft_links dirs init_java_list $(FILES.class) > build_java_list > > .PHONY: classes init_java_list build_java_list > > @@ -382,29 +384,31 @@ > > # Class files for this package > # > -this: dirs init_java_list $(THIS.class) build_java_list > +this: soft_links dirs init_java_list $(THIS.class) build_java_list > .PHONY: this > > +soft_links: $(JIVE_INC_LINK) > +.PHONY: soft_links > + > +$(JIVE_INC_LINK): > + @ln -s $(JIVE_INC_PATH) $(JIVE_INC_LINK) > + > dirs: $(CLASSDIR) > .PHONY: dirs > > -$(CLASSDIR) $(JARSDIR) $(DLJARSDIR) $(EXTJARSDIR) $(APIDOC): > +$(CLASSDIR) $(JARSDIR) $(DLJARSDIR) $(EXTJARSDIR) $(QAJARSDIR) $ > (APIDOC): > mkdir -p $@ > @test -d $@ || (echo no $@ ; exit 1) > > -jartools: > - @cd $(JARTOOLSDIR); $(MAKE) > +jartools:: > > # > # must defer building tool wrappers until platform jars exist > # > all.jars jars.all: > - @cd $(VIEW_ROOT)/vob/tools/src; $(MAKE) jars > - @cd $(VIEW_ROOT)/vob/jive/src; $(MAKE) jars > - @cd $(VIEW_ROOT)/vob/tools/src; $(MAKE) toolwrappers > @cd $(VIEW_ROOT)/vob/qa/src; $(MAKE) jars > > -include $(TOOLSDIR)/java/GNUmakefile > +include $(VIEW_ROOT)/vob/tools/java/GNUmakefile > > # javadoc files > # > > Modified: incubator/river/qatests/trunk/source/vob/qa/src/ > GNUmakefile.allinc > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/qa/src/GNUmakefile.allinc?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/qa/src/ > GNUmakefile.allinc (original) > +++ incubator/river/qatests/trunk/source/vob/qa/src/ > GNUmakefile.allinc Wed May 21 16:10:35 2008 > @@ -17,6 +17,10 @@ > # limitations under the License. > #*/ > > +VIEW_ROOT := $(shell (echo $(PWD)) | sed -e 's,/vob.*,,') > + > +SVN_BRANCH := $(shell (echo $(PWD)) | sed -e 's,/source.*,,'|sed -e > 's,.*qatests/,,') > +JTSK_ROOT := $(VIEW_ROOT)/../../../jtsk/$(SVN_BRANCH) > > # > # Include the makefile that contains settings common to all vobs. > @@ -39,32 +43,30 @@ > > # Location of the classes related to QA Testing > > -JINICLASSES = $(VIEW_ROOT)/vob/jive/classes > -TOOLSCLASSES = $(VIEW_ROOT)/vob/tools/classes > +JINICLASSES = $(JTSK_ROOT)/classes > +TOOLSCLASSES = $(JTSK_ROOT)/classes > QACLASSES = $(VIEW_ROOT)/vob/qa/classes > QAJARSDIR = $(VIEW_ROOT)/vob/qa/lib > > QA_CLASS_PATH = $(VIEW_ROOT)/vob/qa/classes/com/sun/jini/qa > TEST_CLASS_PATH = $(VIEW_ROOT)/vob/qa/classes/com/sun/jini/test > -TOOLS_CLASS_PATH = $(VIEW_ROOT)/vob/tools/classes/com/sun/jini/tool > +TOOLS_CLASS_PATH = $(JTSK_ROOT)/classes/com/sun/jini/tool > CORBA_CLASS_PATH = $(VIEW_ROOT)/vob/qa/classes/org > > -QA_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/com/sun/jini/qa > -TEST_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/com/sun/jini/test > -TOOLS_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/com/sun/jini/tool > -CORBA_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/org > +QA_CLASS_LINK = $(JTSK_ROOT)/classes/com/sun/jini/qa > +TEST_CLASS_LINK = $(JTSK_ROOT)/classes/com/sun/jini/test > +TOOLS_CLASS_LINK = $(JTSK_ROOT)/classes/com/sun/jini/tool > +CORBA_CLASS_LINK = $(JTSK_ROOT)/classes/org > > define qa.unlink > @rm -f $(QA_CLASS_LINK) > @rm -f $(TEST_CLASS_LINK) > - @[ -h $(TOOLS_CLASS_LINK) ] && rm -f $(TOOLS_CLASS_LINK) || : > @rm -f $(CORBA_CLASS_LINK) > endef > define qa.link > $(qa.unlink) > @ln -s $(QA_CLASS_PATH) $(QA_CLASS_LINK) > @ln -s $(TEST_CLASS_PATH) $(TEST_CLASS_LINK) > - @[ ! -d $(TOOLS_CLASS_LINK) ] && ln -s $(TOOLS_CLASS_PATH) $ > (TOOLS_CLASS_LINK) || : > @ln -s $(CORBA_CLASS_PATH) $(CORBA_CLASS_LINK) > endef > > @@ -85,7 +87,7 @@ > ## implementation-specific sections of this source tree: > ## > > -QAJARS = tools.jar jiniharness.jar jinitests.jar qa1- > mainwrapper.jar qaman.jar > +QAJARS = jiniharness.jar jinitests.jar qa1-mainwrapper.jar > > ## > ## Note that the "/dev/null" is necessary to prevent errors > @@ -104,7 +106,7 @@ > # Begin Targets > # ============================================================ > > -# ------------- resource property file tartets --------------- > +# ------------- resource property file targets --------------- > > all: > > @@ -142,8 +144,17 @@ > $(JAR) cf $(QAJARSDIR)/$@ \ > -C $(MANIFESTDIR)/qa1 META-INF/services \ > `$(QACLASSDEP) com/sun/jini/test/impl \ > - com/sun/jini/test/spec \ > - com/sun/jini/test/share \ > + $(JSKPRIVATE.INCLUDE) \ > + -in com.sun.jini.test \ > + -in com.sun.jini.fiddler` > + @cd $(JINICLASSES); \ > + $(QACLASSDEP) com/sun/jini/test/spec \ > + $(JSKPRIVATE.INCLUDE) \ > + -in com.sun.jini.test \ > + -in com.sun.jini.fiddler | xargs $(JAR) uf $ > (QAJARSDIR)/$@; > + @cd $(JINICLASSES); \ > + $(JAR) uf $(QAJARSDIR)/$@ \ > + `$(QACLASSDEP) com/sun/jini/test/share \ > com/sun/jini/test/support \ > com/sun/jini/test/services/lookupsimulator/ > LookupSimulatorProxyInterface.class \ > com/sun/jini/fiddler/FiddlerAdmin.class \ > @@ -151,14 +162,13 @@ > $(JSKPRIVATE.INCLUDE) \ > -in com.sun.jini.test \ > -in com.sun.jini.fiddler` \ > - org/omg/stub/com/sun/jini/test/spec \ > - com/sun/jini/start/resources > + `find com/sun/jini/start/resources ! -name .svn ! -type d | > grep -v /.svn` > @cd $(SRC); \ > $(JAR) uf $(QAJARSDIR)/$@ \ > interopExclusionList.txt \ > - com/sun/jini/test/spec/loader/util/resources \ > - com/sun/jini/test/spec/loader/util/resources_local \ > - `find com/sun/jini/test ! -name '*.java' ! -name > '*makefile*' ! -type d` > + `find com/sun/jini/test/spec/loader/util/resources ! - > name .svn ! -type d | grep -v /.svn` \ > + `find com/sun/jini/test/spec/loader/util/resources_local ! - > name .svn ! -type d | grep -v /.svn` \ > + `find com/sun/jini/test ! -name '*.java' ! -name '*makefile*' ! > -name .svn ! -type d | grep -v /.svn` > $(qa.unlink) > > qa1-mainwrapper.jar: jartools > @@ -180,9 +190,9 @@ > -in com.sun.jini.qa \ > -in com.sun.jini.tool \ > com.sun.jini.start.DestroySharedGroup` \ > - com/sun/jini/start/resources > - @cd $(VIEW_ROOT)/vob/qa; $(JAR) uf $(QAJARSDIR)/$@ harness > - @cd $(SRC); $(JAR) uf $(QAJARSDIR)/$@ com/sun/jini/qa/resources > + `find com/sun/jini/start/resources ! -name .svn ! -type d | > grep -v /.svn` > + @cd $(VIEW_ROOT)/vob/qa; $(JAR) uf $(QAJARSDIR)/$@ `find harness ! > -name .svn ! -type d | grep -v /.svn` > + @cd $(SRC); $(JAR) uf $(QAJARSDIR)/$@ `find com/sun/jini/qa/ > resources ! -name .svn ! -type d | grep -v /.svn` > $(qa.unlink) > > qaman.jar: jartools > @@ -365,7 +375,7 @@ > -import -noprompt -alias group -file $(TRUST)/group.cert > > checkconfigs: > - @find $(VIEW_ROOT)/vob/qa -name '*.config' -exec $(JAVA) -cp $ > (VIEW_ROOT)/vob/tools/classes:$(VIEW_ROOT)/vob/jive/classes:$ > (VIEW_ROOT)/vob/qa/classes com.sun.jini.tool.CheckConfigurationFile > {} \; > + @find $(VIEW_ROOT)/vob/qa -name '*.config' -exec $(JAVA) -cp $ > (TOOLSCLASSES):$(JINICLASSES):$(VIEW_ROOT)/vob/qa/classes > com.sun.jini.tool.CheckConfigurationFile {} \; > > ############################ > # > > Modified: incubator/river/qatests/trunk/source/vob/qa/src/com/sun/ > jini/test/impl/reggie/NameServiceImpl.java > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/impl/reggie/NameServiceImpl.java?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/impl/reggie/NameServiceImpl.java (original) > +++ incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/impl/reggie/NameServiceImpl.java Wed May 21 16:10:35 2008 > @@ -21,6 +21,8 @@ > import java.util.Arrays; > import sun.net.spi.nameservice.NameService; > > +import java.net.InetAddress; > + > /** > * Name service implementation > */ > @@ -37,13 +39,17 @@ > > } > > - public byte[][] lookupAllHostAddr(String host) > + public InetAddress[] lookupAllHostAddr(String host) > throws UnknownHostException > { > if (host.equalsIgnoreCase(testClient)) { > - return new byte[][] { addr1, addr2, localhostAddr }; > + return ( new InetAddress[] > + { InetAddress.getByAddress(addr1), > + InetAddress.getByAddress(addr2), > + InetAddress.getByAddress(localhostAddr) } ); > } else if (host.equalsIgnoreCase(localhost)) { > - return new byte[][]{localhostAddr}; > + return ( new InetAddress[] > + { InetAddress.getByAddress(localhostAddr) } ); > } else { > throw new UnknownHostException(host); > } > > Added: incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/resources/qa1.logging > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/resources/qa1.logging?rev=658927&view=auto > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/resources/qa1.logging (added) > +++ incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/resources/qa1.logging Wed May 21 16:10:35 2008 > @@ -0,0 +1,260 @@ > +############################################################ > +# Common Logging Configuration File that can be used > +# for logging in the ServiceStarter as well as any and > +# all services started by the ServiceStarter. > +# > +# To turn on logging, specify the name of this file as the > +# following system property of the associated VM: > +# > +# -Djava.util.logging.config.file=/example/common/ > jini.logging > +# -Djava.util.logging.config.file=Drive:\\\\example\\common > \\jini.logging > +# > +# In order to specify the symbolic names for the > +# custom-defined levels (FAILED and HANDLED), the > +# following system property should be set: > +# > +# -Djava.util.logging.manager=com.sun.jini.logging.LogManager > +# > +############################################################ > + > +############################################################ > +# Global properties > +############################################################ > + > +# "handlers" specifies a comma separated list of log Handler > +# classes. These handlers will be installed during VM > +# startup. Note that these classes must be on the system > +# classpath. By default we only configure a ConsoleHandler, > +# which will show messages at the given level as well as > +# higher levels. > + > +handlers = java.util.logging.ConsoleHandler > +#handlers = java.util.logging.FileHandler, > java.util.logging.ConsoleHandler > + > +# Default global logging level. > +# This specifies which kinds of events are logged across > +# ALL loggers. For any given facility, this global level > +# can be overriden by a facility-specific level. > +# Note that below, the ConsoleHandler also has a separate > +# level setting (set below) to limit messages printed to > +# the console. > + > +.level = INFO > + > +############################################################ > +# Handler specific properties: formatters and logger levels > +############################################################ > + > +# For messages printed to the console, use a standard > +# formatter, and limit the messages that are printed > +# to the given level and above. > + > +java.util.logging.ConsoleHandler.formatter = > java.util.logging.SimpleFormatter > +java.util.logging.ConsoleHandler.level = FINEST > + > +# For messages printed to a file, do the following: > +# - use either a standard or XML formatter > +# - limit the number of bytes to write to any one file to > +# the given number of bytes (limit) > +# - limit the number of files to cycle through to the > +# given number of files (count) > +# - generate the name of the file to write to using > +# the given pattern > +# - limit the messages that are written to the file > +# to the given level and above (if the level is not > +# specifically set for the file handler, it will > +# default to Level.ALL), > + > +java.util.logging.FileHandler.formatter = > java.util.logging.SimpleFormatter > +#java.util.logging.FileHandler.formatter = > java.util.logging.XMLFormatter > +java.util.logging.FileHandler.limit = 100000 > +java.util.logging.FileHandler.count = 1 > +#java.util.logging.FileHandler.pattern = %h/java%u.log > +java.util.logging.FileHandler.pattern = %t/jini-service%u.log.%g > +java.util.logging.FileHandler.level = INFO > + > +############################################################ > +# Facility specific properties: logger levels > +############################################################ > + > +# Default all loggers to a high level, and then > +# turn the individual loggers 'on/off' by setting their > +# levels to a lower (finer) value. For example, if a > +# logger's level is set to INFO, then only those log > +# records that are at the levels INFO, WARNING, or SEVERE > +# will be written. Whereas, if that logger's level is > +# set to FINE, then all log records that are at the levels > +# FINE, CONFIG, INFO, WARNING, or SEVERE will be written. > +# > +# Note that in order to use the custom-defined levels > +# FAILED (600) and HANDLED (550), do the following: > +# 1. import com.sun.jini.logging.levels in your application > +# 2. set the following system property on the VM of your > +# application: > +# -Djava.util.logging.manager=com.sun.jini.logging.LogManager > +# > +# SEVERE (highest value) > +# WARNING > +# INFO > +# CONFIG > +# 600 (= FAILED custom-defined) > +# 550 (= HANDLED custom-defined) > +# FINE > +# FINER > +# FINEST (lowest value) > + > +# For Everything > +sun.rmi.level = INFO > +net.jini.level = INFO > + > +# For the LogManager > +com.sun.jini.logging.LogManager.level = INFO > + > +# For Configuration > +net.jini.config.level = INFO > + > +# For activation > +net.jini.activation.ActivatableInvocationHandler.level = INFO > + > +# For JRMP > +net.jini.jrmp.JrmpExporter.level = INFO > + > +# For Jini ERI > +net.jini.jeri.level = INFO > +net.jini.jeri.BasicInvocationDispatcher.level = 600 > +net.jini.jeri.BasicInvocationHandler.level = 600 > +#net.jini.jeri.BasicJeriExporter.level = INFO > +#net.jini.jeri.BasicObjectEndpoint.level = INFO > + > +# For Jini ERI connection > +#net.jini.jeri.connection.level = INFO > +#net.jini.jeri.connection.ConnectionManager.level = INFO > +#net.jini.jeri.connection.ServerConnectionManager.level = INFO > +#net.jini.jeri.connection.mux.level = INFO > + > +# For HttpEndpoint and HttpServerEndpoint > +#net.jini.jeri.http.level = INFO > +#net.jini.jeri.http.client.level = INFO > +#net.jini.jeri.http.server.level = INFO > + > +# For TcpEndpoint and TcpServerEndpoint > +#net.jini.jeri.tcp.level = INFO > +#net.jini.jeri.tcp.client.level = INFO > +#net.jini.jeri.tcp.server.level = INFO > + > +# For SSL > +#net.jini.jeri.ssl.level = INFO > +#net.jini.jeri.ssl.client.level = INFO > +#net.jini.jeri.ssl.server.level = INFO > +#net.jini.jeri.ssl.init.level = INFO > + > +# For Kerberos > +#net.jini.jeri.kerberos.level = INFO > +#net.jini.jeri.kerberos.client.level = INFO > +#net.jini.jeri.kerberos.server.level = INFO > + > +# For IIOP > +net.jini.iiop.IiopExporter.level = INFO > + > +# For Preferred Classes > +net.jini.loader.level = INFO > +#net.jini.loader.pref.PreferredClassLoader.level = INFO > +#net.jini.loader.pref.PreferredClassLoader.preferred.level = INFO > +#net.jini.loader.pref.PreferredClassLoader.exception.level = INFO > +#net.jini.loader.pref.PreferredClassProvider.level = INFO > + > +# For Security: trust, integrity, policy and permission granting, > +# proxy trust verification > +net.jini.security.level = INFO > +#net.jini.security.trust.level = INFO > +#net.jini.security.integrity.level = INFO > +#net.jini.security.policy.level = INFO > + > +# For HTTPMD > +net.jini.url.httpmd.level = INFO > + > +# For Discovery > +com.sun.jini.discovery.level = INFO > +#com.sun.jini.discovery.DiscoveryV1.level = INFO > +#com.sun.jini.discovery.DiscoveryV2.level = INFO > +#com.sun.jini.discovery.x500.level = INFO > + > +# For the Helper Utilities > +net.jini.discovery.LookupDiscovery.level = INFO > +net.jini.discovery.LookupLocatorDiscovery.level = INFO > +net.jini.lookup.JoinManager.level = INFO > +net.jini.lookup.ServiceDiscoveryManager.level = INFO > +net.jini.lease.LeaseRenewalManager.level = INFO > + > +# For Thread Pool Utilities > +com.sun.jini.thread.RetryTask.level = INFO > +com.sun.jini.thread.WakeupManager.level = INFO > +com.sun.jini.thread.ThreadPool.level = INFO > + > +# For Starting the Services > +com.sun.jini.start.level = INFO > +#com.sun.jini.start.ClassLoaderUtil.level = INFO > +#com.sun.jini.start.proxy.level = INFO > +#com.sun.jini.start.resources.service.level = INFO > +#com.sun.jini.start.service.starter.level = INFO > +#com.sun.jini.start.sharedGroup.level = INFO > +#com.sun.jini.start.wrapper.level = INFO > + > +# For Reggie > +com.sun.jini.reggie.level = INFO > + > +# For Mahalo > +com.sun.jini.mahalo.destroy.level = INFO > +com.sun.jini.mahalo.init.level = INFO > +com.sun.jini.mahalo.operations.level = INFO > +com.sun.jini.mahalo.participant.level = INFO > +com.sun.jini.mahalo.persistence.level = INFO > +com.sun.jini.mahalo.startup.level = INFO > +com.sun.jini.mahalo.transactions.level = INFO > + > +# For Fiddler > +com.sun.jini.fiddler.discard.level = INFO > +com.sun.jini.fiddler.events.level = INFO > +com.sun.jini.fiddler.groups.level = INFO > +com.sun.jini.fiddler.lease.level = INFO > +com.sun.jini.fiddler.locators.level = INFO > +com.sun.jini.fiddler.persist.level = INFO > +com.sun.jini.fiddler.problem.level = INFO > +com.sun.jini.fiddler.registration.level = INFO > +com.sun.jini.fiddler.startup.level = INFO > +com.sun.jini.fiddler.tasks.level = INFO > + > +# For Mercury > +com.sun.jini.mercury.admin.level = INFO > +com.sun.jini.mercury.delivery.level = INFO > +com.sun.jini.mercury.expiration.level = INFO > +com.sun.jini.mercury.init.level = INFO > +com.sun.jini.mercury.lease.level = INFO > +com.sun.jini.mercury.operations.level = INFO > +com.sun.jini.mercury.persistence.level = INFO > +com.sun.jini.mercury.receive.level = INFO > +com.sun.jini.mercury.recovery.level = INFO > +com.sun.jini.mercury.startup.level = INFO > + > +# For Norm > +com.sun.jini.norm.level = INFO > + > +# For Outrigger > +com.sun.jini.outrigger.entryMatching.level = INFO > +com.sun.jini.outrigger.event.level = INFO > +com.sun.jini.outrigger.iterator.level = INFO > +com.sun.jini.outrigger.join.level = INFO > +com.sun.jini.outrigger.leases.level = INFO > +com.sun.jini.outrigger.lifecycle.level = INFO > +com.sun.jini.outrigger.operations.level = INFO > +com.sun.jini.outrigger.store.level = INFO > +com.sun.jini.outrigger.transactions.level = INFO > + > +# For the Browser Client > +com.sun.jini.example.browser.level = INFO > + > +# For the test harness, tests, and infrastructure. > +com.sun.jini.qa.harness.test.level = INFO > +com.sun.jini.qa.harness.service.level = INFO > +com.sun.jini.qa.harness.config.level = INFO > +com.sun.jini.test.spec.jeri.mux.level = INFO > > Modified: incubator/river/qatests/trunk/source/vob/qa/src/com/sun/ > jini/test/resources/qaHarness.prop > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/resources/qaHarness.prop?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/resources/qaHarness.prop (original) > +++ incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/resources/qaHarness.prop Wed May 21 16:10:35 2008 > @@ -26,13 +26,13 @@ > ###################################################### > > # location of the JSK installation > -com.sun.jini.jsk.home=/vob/jive > +com.sun.jini.jsk.home=${user.home}/river/jtsk/trunk > > # Location of the harness installation > -com.sun.jini.qa.home=/vob/qa > +com.sun.jini.qa.home=${user.home}/river/qatests/trunk/source/vob/qa > > # Location of the tests installation > -com.sun.jini.test.home=/vob/qa > +com.sun.jini.test.home=${user.home}/river/qatests/trunk/source/vob/qa > > ###################################################### > # > > Modified: incubator/river/qatests/trunk/source/vob/qa/src/com/sun/ > jini/test/spec/export/servercontext/GNUmakefile.jars > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/test/spec/export/servercontext/GNUmakefile.jars?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/spec/export/servercontext/GNUmakefile.jars (original) > +++ incubator/river/qatests/trunk/source/vob/qa/src/com/sun/jini/ > test/spec/export/servercontext/GNUmakefile.jars Wed May 21 16:10:35 > 2008 > @@ -29,14 +29,14 @@ > qa1-export-servercontext-tests-non-null.jar: jartools > rm -f $(QAJARSDIR)/$@ > @echo Creating $@ > - @cd $(MANIFESTDIR)/$(QA_NON_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . META-INF > + @cd $(MANIFESTDIR)/$(QA_NON_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . `find META-INF ! -name .svn ! -type d | grep - > v /.svn` > > qa1-export-servercontext-tests-null.jar: jartools > rm -f $(QAJARSDIR)/$@ > @echo Creating $@ > - @cd $(MANIFESTDIR)/$(QA_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . META-INF > + @cd $(MANIFESTDIR)/$(QA_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . `find META-INF ! -name .svn ! -type d | grep - > v /.svn` > > qa1-export-servercontext-tests-providers-parsing.jar: jartools > rm -f $(QAJARSDIR)/$@ > @echo Creating $@ > - @cd $(MANIFESTDIR)/$(QA_PROVIDERS_PARSING_SERVERCONTEXT); $(JAR) > cfv $(QAJARSDIR)/$@ -C . META-INF > + @cd $(MANIFESTDIR)/$(QA_PROVIDERS_PARSING_SERVERCONTEXT); $(JAR) > cfv $(QAJARSDIR)/$@ -C . `find META-INF ! -name .svn ! -type d | > grep -v /.svn` > > Modified: incubator/river/qatests/trunk/source/vob/tools/java/ > GNUmakefile > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/tools/java/GNUmakefile?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/tools/java/GNUmakefile > (original) > +++ incubator/river/qatests/trunk/source/vob/tools/java/GNUmakefile > Wed May 21 16:10:35 2008 > @@ -23,6 +23,8 @@ > # Assumption: only one tar file for this tool > # > > +JAVA.home := $(JAVA_HOME) > + > ifdef JAVA.home > JAVA.home.specified = yes > else > > Modified: incubator/river/qatests/trunk/source/vob/tools/src/ > GNUmakefile > URL: http://svn.apache.org/viewvc/incubator/river/qatests/trunk/source/vob/tools/src/GNUmakefile?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/qatests/trunk/source/vob/tools/src/GNUmakefile > (original) > +++ incubator/river/qatests/trunk/source/vob/tools/src/GNUmakefile > Wed May 21 16:10:35 2008 > @@ -24,7 +24,7 @@ > DIRS := $(CDIR) $(VIEW_ROOT)/vob/tools/bin > MAKE.tar := $(shell echo make-*.tar) > MAKE.dir := $(MAKE.tar:%.tar=%) > -JTOOLSDIR := com/sun/jini/tool > +JTOOLSDIR := $(VIEW_ROOT)/vob/tools/src/com/sun/jini/tool > > SCRIPTS = mergebranch copyright targets clearcmd vob.pl stampcode > frame.pl > > @@ -84,9 +84,9 @@ > mkdir -p $@ > @test -d $@ || (echo no $@ ; exit 1) > > -include GNUmakefile.allinc > +include $(VIEW_ROOT)/vob/tools/src/GNUmakefile.allinc > include $(VIEW_ROOT)/vob/tools/java/GNUmakefile > -include $(VIEW_ROOT)/vob/tools/odi/GNUmakefile > +#include $(VIEW_ROOT)/vob/tools/odi/GNUmakefile > > checkser: > @echo Classes missing serialVersionUID: > > Modified: incubator/river/trunk/jtsk/build_common.xml > URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/build_common.xml?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/jtsk/build_common.xml (original) > +++ incubator/river/trunk/jtsk/build_common.xml Wed May 21 16:10:35 > 2008 > @@ -1059,7 +1059,7 @@ > > > > - > + > > > > > Modified: incubator/river/trunk/jtsk/src/com/sun/jini/jeri/internal/ > runtime/Util.java > URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/jeri/internal/runtime/Util.java?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/jtsk/src/com/sun/jini/jeri/internal/ > runtime/Util.java (original) > +++ incubator/river/trunk/jtsk/src/com/sun/jini/jeri/internal/ > runtime/Util.java Wed May 21 16:10:35 2008 > @@ -553,9 +553,9 @@ > private static Collection getProhibitedProxyInterfaces() { > Collection names = new HashSet(); > names.add("javax.management.MBeanServerConnection"); > - Enumeration enum; > + Enumeration resources; > try { > - enum = ClassLoader.getSystemResources( > + resources = ClassLoader.getSystemResources( > prohibitedProxyInterfacesResource); > } catch (IOException e) { > throw new ExceptionInInitializerError( > @@ -563,8 +563,8 @@ > "problem getting resources: " + > prohibitedProxyInterfacesResource).initCause(e)); > } > - while (enum.hasMoreElements()) { > - URL url = (URL) enum.nextElement(); > + while (resources.hasMoreElements()) { > + URL url = (URL) resources.nextElement(); > try { > InputStream in = url.openStream(); > try { > > Modified: incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile > (original) > +++ incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile Wed > May 21 16:10:35 2008 > @@ -28,21 +28,18 @@ > DOC := $(TOP)/doc > APIDOC := $(DOC)/api > APIDOCCHECK := $(DOC)/api-check > -ifdef PRODUCT > -ifndef VIEW_ROOT > VIEW_ROOT := $(shell (echo $(PWD)) | sed -e 's,/vob.*,,') > export VIEW_ROOT > -endif > ifndef JAVA.home > JAVA.home := $(shell type java | sed -e 's,[^/]*\(.*\)/bin/java$$, > \1,') > export JAVA.home > endif > -endif > > CLASSDIR := $(TOP)/classes > JARSDIR := $(VIEW_ROOT)/vob/jive/lib > DLJARSDIR := $(VIEW_ROOT)/vob/jive/lib-dl > EXTJARSDIR := $(VIEW_ROOT)/vob/jive/lib-ext > +QAJARSDIR := $(VIEW_ROOT)/vob/qa/lib > JIVE_DOC := $(VIEW_ROOT)/vob/jive/doc > MAKEFILE := GNUmakefile > > @@ -184,7 +181,7 @@ > > # The tools directory > # > -TOOLSDIR = $(VIEW_ROOT)/vob/tools > +TOOLSDIR = $(VIEW_ROOT)/../../jtsk > TOOLS = $(TOOLSDIR)/src > JARTOOLSDIR = $(TOOLS)/com/sun/jini/tool > > @@ -192,6 +189,11 @@ > CLASSDEP_EXEC = $(JAVA) -cp $(TOOLSCLASSES):$(JAVA.tools) > com.sun.jini.tool.ClassDep -files > MANIFESTDIR = $(SRC)/manifest > > +# For soft link(s) that are necessary for compilation > +# > +JIVE_INC_PATH = $(VIEW_ROOT)/vob/qa/src/GNUmakefile.inc > +JIVE_INC_LINK = $(VIEW_ROOT)/vob/jive/src/GNUmakefile.inc > + > # Compilation flags > # > > @@ -266,7 +268,7 @@ > # Also, we put the target here so that just typing gmake > # will build the entire tree. > # > -all: tools dirs classes stubs > +all: soft_links tools dirs classes stubs > > > # Add the includes here. This way other people can add their > @@ -301,7 +303,7 @@ > > # Just the class files for this package and all subpackages > # > -classes: dirs init_java_list $(FILES.class) build_java_list > +classes: soft_links dirs init_java_list $(FILES.class) > build_java_list > > .PHONY: classes init_java_list build_java_list > > @@ -382,29 +384,31 @@ > > # Class files for this package > # > -this: dirs init_java_list $(THIS.class) build_java_list > +this: soft_links dirs init_java_list $(THIS.class) build_java_list > .PHONY: this > > +soft_links: $(JIVE_INC_LINK) > +.PHONY: soft_links > + > +$(JIVE_INC_LINK): > + @ln -s $(JIVE_INC_PATH) $(JIVE_INC_LINK) > + > dirs: $(CLASSDIR) > .PHONY: dirs > > -$(CLASSDIR) $(JARSDIR) $(DLJARSDIR) $(EXTJARSDIR) $(APIDOC): > +$(CLASSDIR) $(JARSDIR) $(DLJARSDIR) $(EXTJARSDIR) $(QAJARSDIR) $ > (APIDOC): > mkdir -p $@ > @test -d $@ || (echo no $@ ; exit 1) > > -jartools: > - @cd $(JARTOOLSDIR); $(MAKE) > +jartools:: > > # > # must defer building tool wrappers until platform jars exist > # > all.jars jars.all: > - @cd $(VIEW_ROOT)/vob/tools/src; $(MAKE) jars > - @cd $(VIEW_ROOT)/vob/jive/src; $(MAKE) jars > - @cd $(VIEW_ROOT)/vob/tools/src; $(MAKE) toolwrappers > @cd $(VIEW_ROOT)/vob/qa/src; $(MAKE) jars > > -include $(TOOLSDIR)/java/GNUmakefile > +include $(VIEW_ROOT)/vob/tools/java/GNUmakefile > > # javadoc files > # > > Modified: incubator/river/trunk/qatests/source/vob/qa/src/ > GNUmakefile.allinc > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/qa/src/GNUmakefile.allinc?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/qa/src/ > GNUmakefile.allinc (original) > +++ incubator/river/trunk/qatests/source/vob/qa/src/ > GNUmakefile.allinc Wed May 21 16:10:35 2008 > @@ -17,6 +17,7 @@ > # limitations under the License. > #*/ > > +VIEW_ROOT := $(shell (echo $(PWD)) | sed -e 's,/vob.*,,') > > # > # Include the makefile that contains settings common to all vobs. > @@ -39,32 +40,30 @@ > > # Location of the classes related to QA Testing > > -JINICLASSES = $(VIEW_ROOT)/vob/jive/classes > -TOOLSCLASSES = $(VIEW_ROOT)/vob/tools/classes > +JINICLASSES = $(VIEW_ROOT)/../../jtsk/classes > +TOOLSCLASSES = $(VIEW_ROOT)/../../jtsk/classes > QACLASSES = $(VIEW_ROOT)/vob/qa/classes > QAJARSDIR = $(VIEW_ROOT)/vob/qa/lib > > QA_CLASS_PATH = $(VIEW_ROOT)/vob/qa/classes/com/sun/jini/qa > TEST_CLASS_PATH = $(VIEW_ROOT)/vob/qa/classes/com/sun/jini/test > -TOOLS_CLASS_PATH = $(VIEW_ROOT)/vob/tools/classes/com/sun/jini/tool > +TOOLS_CLASS_PATH = $(VIEW_ROOT)/../../jtsk/classes/com/sun/jini/tool > CORBA_CLASS_PATH = $(VIEW_ROOT)/vob/qa/classes/org > > -QA_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/com/sun/jini/qa > -TEST_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/com/sun/jini/test > -TOOLS_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/com/sun/jini/tool > -CORBA_CLASS_LINK = $(VIEW_ROOT)/vob/jive/classes/org > +QA_CLASS_LINK = $(VIEW_ROOT)/../../jtsk/classes/com/sun/jini/qa > +TEST_CLASS_LINK = $(VIEW_ROOT)/../../jtsk/classes/com/sun/jini/test > +TOOLS_CLASS_LINK = $(VIEW_ROOT)/../../jtsk/classes/com/sun/jini/tool > +CORBA_CLASS_LINK = $(VIEW_ROOT)/../../jtsk/classes/org > > define qa.unlink > @rm -f $(QA_CLASS_LINK) > @rm -f $(TEST_CLASS_LINK) > - @[ -h $(TOOLS_CLASS_LINK) ] && rm -f $(TOOLS_CLASS_LINK) || : > @rm -f $(CORBA_CLASS_LINK) > endef > define qa.link > $(qa.unlink) > @ln -s $(QA_CLASS_PATH) $(QA_CLASS_LINK) > @ln -s $(TEST_CLASS_PATH) $(TEST_CLASS_LINK) > - @[ ! -d $(TOOLS_CLASS_LINK) ] && ln -s $(TOOLS_CLASS_PATH) $ > (TOOLS_CLASS_LINK) || : > @ln -s $(CORBA_CLASS_PATH) $(CORBA_CLASS_LINK) > endef > > @@ -85,7 +84,7 @@ > ## implementation-specific sections of this source tree: > ## > > -QAJARS = tools.jar jiniharness.jar jinitests.jar qa1- > mainwrapper.jar qaman.jar > +QAJARS = jiniharness.jar jinitests.jar qa1-mainwrapper.jar > > ## > ## Note that the "/dev/null" is necessary to prevent errors > @@ -142,8 +141,17 @@ > $(JAR) cf $(QAJARSDIR)/$@ \ > -C $(MANIFESTDIR)/qa1 META-INF/services \ > `$(QACLASSDEP) com/sun/jini/test/impl \ > - com/sun/jini/test/spec \ > - com/sun/jini/test/share \ > + $(JSKPRIVATE.INCLUDE) \ > + -in com.sun.jini.test \ > + -in com.sun.jini.fiddler` > + @cd $(JINICLASSES); \ > + $(QACLASSDEP) com/sun/jini/test/spec \ > + $(JSKPRIVATE.INCLUDE) \ > + -in com.sun.jini.test \ > + -in com.sun.jini.fiddler | xargs $(JAR) uf $ > (QAJARSDIR)/$@; > + @cd $(JINICLASSES); \ > + $(JAR) uf $(QAJARSDIR)/$@ \ > + `$(QACLASSDEP) com/sun/jini/test/share \ > com/sun/jini/test/support \ > com/sun/jini/test/services/lookupsimulator/ > LookupSimulatorProxyInterface.class \ > com/sun/jini/fiddler/FiddlerAdmin.class \ > @@ -151,14 +159,13 @@ > $(JSKPRIVATE.INCLUDE) \ > -in com.sun.jini.test \ > -in com.sun.jini.fiddler` \ > - org/omg/stub/com/sun/jini/test/spec \ > - com/sun/jini/start/resources > + `find com/sun/jini/start/resources ! -name .svn ! -type d | > grep -v /.svn` > @cd $(SRC); \ > $(JAR) uf $(QAJARSDIR)/$@ \ > interopExclusionList.txt \ > - com/sun/jini/test/spec/loader/util/resources \ > - com/sun/jini/test/spec/loader/util/resources_local \ > - `find com/sun/jini/test ! -name '*.java' ! -name > '*makefile*' ! -type d` > + `find com/sun/jini/test/spec/loader/util/resources ! - > name .svn ! -type d | grep -v /.svn` \ > + `find com/sun/jini/test/spec/loader/util/resources_local ! - > name .svn ! -type d | grep -v /.svn` \ > + `find com/sun/jini/test ! -name '*.java' ! -name '*makefile*' ! > -name .svn ! -type d | grep -v /.svn` > $(qa.unlink) > > qa1-mainwrapper.jar: jartools > @@ -180,9 +187,9 @@ > -in com.sun.jini.qa \ > -in com.sun.jini.tool \ > com.sun.jini.start.DestroySharedGroup` \ > - com/sun/jini/start/resources > - @cd $(VIEW_ROOT)/vob/qa; $(JAR) uf $(QAJARSDIR)/$@ harness > - @cd $(SRC); $(JAR) uf $(QAJARSDIR)/$@ com/sun/jini/qa/resources > + `find com/sun/jini/start/resources ! -name .svn ! -type d | > grep -v /.svn` > + @cd $(VIEW_ROOT)/vob/qa; $(JAR) uf $(QAJARSDIR)/$@ `find harness ! > -name .svn ! -type d | grep -v /.svn` > + @cd $(SRC); $(JAR) uf $(QAJARSDIR)/$@ `find com/sun/jini/qa/ > resources ! -name .svn ! -type d | grep -v /.svn` > $(qa.unlink) > > qaman.jar: jartools > @@ -365,7 +372,7 @@ > -import -noprompt -alias group -file $(TRUST)/group.cert > > checkconfigs: > - @find $(VIEW_ROOT)/vob/qa -name '*.config' -exec $(JAVA) -cp $ > (VIEW_ROOT)/vob/tools/classes:$(VIEW_ROOT)/vob/jive/classes:$ > (VIEW_ROOT)/vob/qa/classes com.sun.jini.tool.CheckConfigurationFile > {} \; > + @find $(VIEW_ROOT)/vob/qa -name '*.config' -exec $(JAVA) -cp $ > (TOOLSCLASSES):$(JINICLASSES):$(VIEW_ROOT)/vob/qa/classes > com.sun.jini.tool.CheckConfigurationFile {} \; > > ############################ > # > > Modified: incubator/river/trunk/qatests/source/vob/qa/src/com/sun/ > jini/test/impl/reggie/NameServiceImpl.java > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/impl/reggie/NameServiceImpl.java?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/impl/reggie/NameServiceImpl.java (original) > +++ incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/impl/reggie/NameServiceImpl.java Wed May 21 16:10:35 2008 > @@ -21,6 +21,8 @@ > import java.util.Arrays; > import sun.net.spi.nameservice.NameService; > > +import java.net.InetAddress; > + > /** > * Name service implementation > */ > @@ -37,13 +39,17 @@ > > } > > - public byte[][] lookupAllHostAddr(String host) > + public InetAddress[] lookupAllHostAddr(String host) > throws UnknownHostException > { > if (host.equalsIgnoreCase(testClient)) { > - return new byte[][] { addr1, addr2, localhostAddr }; > + return ( new InetAddress[] > + { InetAddress.getByAddress(addr1), > + InetAddress.getByAddress(addr2), > + InetAddress.getByAddress(localhostAddr) } ); > } else if (host.equalsIgnoreCase(localhost)) { > - return new byte[][]{localhostAddr}; > + return ( new InetAddress[] > + { InetAddress.getByAddress(localhostAddr) } ); > } else { > throw new UnknownHostException(host); > } > > Added: incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/resources/qa1.logging > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/resources/qa1.logging?rev=658927&view=auto > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/resources/qa1.logging (added) > +++ incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/resources/qa1.logging Wed May 21 16:10:35 2008 > @@ -0,0 +1,260 @@ > +############################################################ > +# Common Logging Configuration File that can be used > +# for logging in the ServiceStarter as well as any and > +# all services started by the ServiceStarter. > +# > +# To turn on logging, specify the name of this file as the > +# following system property of the associated VM: > +# > +# -Djava.util.logging.config.file=/example/common/ > jini.logging > +# -Djava.util.logging.config.file=Drive:\\\\example\\common > \\jini.logging > +# > +# In order to specify the symbolic names for the > +# custom-defined levels (FAILED and HANDLED), the > +# following system property should be set: > +# > +# -Djava.util.logging.manager=com.sun.jini.logging.LogManager > +# > +############################################################ > + > +############################################################ > +# Global properties > +############################################################ > + > +# "handlers" specifies a comma separated list of log Handler > +# classes. These handlers will be installed during VM > +# startup. Note that these classes must be on the system > +# classpath. By default we only configure a ConsoleHandler, > +# which will show messages at the given level as well as > +# higher levels. > + > +handlers = java.util.logging.ConsoleHandler > +#handlers = java.util.logging.FileHandler, > java.util.logging.ConsoleHandler > + > +# Default global logging level. > +# This specifies which kinds of events are logged across > +# ALL loggers. For any given facility, this global level > +# can be overriden by a facility-specific level. > +# Note that below, the ConsoleHandler also has a separate > +# level setting (set below) to limit messages printed to > +# the console. > + > +.level = INFO > + > +############################################################ > +# Handler specific properties: formatters and logger levels > +############################################################ > + > +# For messages printed to the console, use a standard > +# formatter, and limit the messages that are printed > +# to the given level and above. > + > +java.util.logging.ConsoleHandler.formatter = > java.util.logging.SimpleFormatter > +java.util.logging.ConsoleHandler.level = FINEST > + > +# For messages printed to a file, do the following: > +# - use either a standard or XML formatter > +# - limit the number of bytes to write to any one file to > +# the given number of bytes (limit) > +# - limit the number of files to cycle through to the > +# given number of files (count) > +# - generate the name of the file to write to using > +# the given pattern > +# - limit the messages that are written to the file > +# to the given level and above (if the level is not > +# specifically set for the file handler, it will > +# default to Level.ALL), > + > +java.util.logging.FileHandler.formatter = > java.util.logging.SimpleFormatter > +#java.util.logging.FileHandler.formatter = > java.util.logging.XMLFormatter > +java.util.logging.FileHandler.limit = 100000 > +java.util.logging.FileHandler.count = 1 > +#java.util.logging.FileHandler.pattern = %h/java%u.log > +java.util.logging.FileHandler.pattern = %t/jini-service%u.log.%g > +java.util.logging.FileHandler.level = INFO > + > +############################################################ > +# Facility specific properties: logger levels > +############################################################ > + > +# Default all loggers to a high level, and then > +# turn the individual loggers 'on/off' by setting their > +# levels to a lower (finer) value. For example, if a > +# logger's level is set to INFO, then only those log > +# records that are at the levels INFO, WARNING, or SEVERE > +# will be written. Whereas, if that logger's level is > +# set to FINE, then all log records that are at the levels > +# FINE, CONFIG, INFO, WARNING, or SEVERE will be written. > +# > +# Note that in order to use the custom-defined levels > +# FAILED (600) and HANDLED (550), do the following: > +# 1. import com.sun.jini.logging.levels in your application > +# 2. set the following system property on the VM of your > +# application: > +# -Djava.util.logging.manager=com.sun.jini.logging.LogManager > +# > +# SEVERE (highest value) > +# WARNING > +# INFO > +# CONFIG > +# 600 (= FAILED custom-defined) > +# 550 (= HANDLED custom-defined) > +# FINE > +# FINER > +# FINEST (lowest value) > + > +# For Everything > +sun.rmi.level = INFO > +net.jini.level = INFO > + > +# For the LogManager > +com.sun.jini.logging.LogManager.level = INFO > + > +# For Configuration > +net.jini.config.level = INFO > + > +# For activation > +net.jini.activation.ActivatableInvocationHandler.level = INFO > + > +# For JRMP > +net.jini.jrmp.JrmpExporter.level = INFO > + > +# For Jini ERI > +net.jini.jeri.level = INFO > +net.jini.jeri.BasicInvocationDispatcher.level = 600 > +net.jini.jeri.BasicInvocationHandler.level = 600 > +#net.jini.jeri.BasicJeriExporter.level = INFO > +#net.jini.jeri.BasicObjectEndpoint.level = INFO > + > +# For Jini ERI connection > +#net.jini.jeri.connection.level = INFO > +#net.jini.jeri.connection.ConnectionManager.level = INFO > +#net.jini.jeri.connection.ServerConnectionManager.level = INFO > +#net.jini.jeri.connection.mux.level = INFO > + > +# For HttpEndpoint and HttpServerEndpoint > +#net.jini.jeri.http.level = INFO > +#net.jini.jeri.http.client.level = INFO > +#net.jini.jeri.http.server.level = INFO > + > +# For TcpEndpoint and TcpServerEndpoint > +#net.jini.jeri.tcp.level = INFO > +#net.jini.jeri.tcp.client.level = INFO > +#net.jini.jeri.tcp.server.level = INFO > + > +# For SSL > +#net.jini.jeri.ssl.level = INFO > +#net.jini.jeri.ssl.client.level = INFO > +#net.jini.jeri.ssl.server.level = INFO > +#net.jini.jeri.ssl.init.level = INFO > + > +# For Kerberos > +#net.jini.jeri.kerberos.level = INFO > +#net.jini.jeri.kerberos.client.level = INFO > +#net.jini.jeri.kerberos.server.level = INFO > + > +# For IIOP > +net.jini.iiop.IiopExporter.level = INFO > + > +# For Preferred Classes > +net.jini.loader.level = INFO > +#net.jini.loader.pref.PreferredClassLoader.level = INFO > +#net.jini.loader.pref.PreferredClassLoader.preferred.level = INFO > +#net.jini.loader.pref.PreferredClassLoader.exception.level = INFO > +#net.jini.loader.pref.PreferredClassProvider.level = INFO > + > +# For Security: trust, integrity, policy and permission granting, > +# proxy trust verification > +net.jini.security.level = INFO > +#net.jini.security.trust.level = INFO > +#net.jini.security.integrity.level = INFO > +#net.jini.security.policy.level = INFO > + > +# For HTTPMD > +net.jini.url.httpmd.level = INFO > + > +# For Discovery > +com.sun.jini.discovery.level = INFO > +#com.sun.jini.discovery.DiscoveryV1.level = INFO > +#com.sun.jini.discovery.DiscoveryV2.level = INFO > +#com.sun.jini.discovery.x500.level = INFO > + > +# For the Helper Utilities > +net.jini.discovery.LookupDiscovery.level = INFO > +net.jini.discovery.LookupLocatorDiscovery.level = INFO > +net.jini.lookup.JoinManager.level = INFO > +net.jini.lookup.ServiceDiscoveryManager.level = INFO > +net.jini.lease.LeaseRenewalManager.level = INFO > + > +# For Thread Pool Utilities > +com.sun.jini.thread.RetryTask.level = INFO > +com.sun.jini.thread.WakeupManager.level = INFO > +com.sun.jini.thread.ThreadPool.level = INFO > + > +# For Starting the Services > +com.sun.jini.start.level = INFO > +#com.sun.jini.start.ClassLoaderUtil.level = INFO > +#com.sun.jini.start.proxy.level = INFO > +#com.sun.jini.start.resources.service.level = INFO > +#com.sun.jini.start.service.starter.level = INFO > +#com.sun.jini.start.sharedGroup.level = INFO > +#com.sun.jini.start.wrapper.level = INFO > + > +# For Reggie > +com.sun.jini.reggie.level = INFO > + > +# For Mahalo > +com.sun.jini.mahalo.destroy.level = INFO > +com.sun.jini.mahalo.init.level = INFO > +com.sun.jini.mahalo.operations.level = INFO > +com.sun.jini.mahalo.participant.level = INFO > +com.sun.jini.mahalo.persistence.level = INFO > +com.sun.jini.mahalo.startup.level = INFO > +com.sun.jini.mahalo.transactions.level = INFO > + > +# For Fiddler > +com.sun.jini.fiddler.discard.level = INFO > +com.sun.jini.fiddler.events.level = INFO > +com.sun.jini.fiddler.groups.level = INFO > +com.sun.jini.fiddler.lease.level = INFO > +com.sun.jini.fiddler.locators.level = INFO > +com.sun.jini.fiddler.persist.level = INFO > +com.sun.jini.fiddler.problem.level = INFO > +com.sun.jini.fiddler.registration.level = INFO > +com.sun.jini.fiddler.startup.level = INFO > +com.sun.jini.fiddler.tasks.level = INFO > + > +# For Mercury > +com.sun.jini.mercury.admin.level = INFO > +com.sun.jini.mercury.delivery.level = INFO > +com.sun.jini.mercury.expiration.level = INFO > +com.sun.jini.mercury.init.level = INFO > +com.sun.jini.mercury.lease.level = INFO > +com.sun.jini.mercury.operations.level = INFO > +com.sun.jini.mercury.persistence.level = INFO > +com.sun.jini.mercury.receive.level = INFO > +com.sun.jini.mercury.recovery.level = INFO > +com.sun.jini.mercury.startup.level = INFO > + > +# For Norm > +com.sun.jini.norm.level = INFO > + > +# For Outrigger > +com.sun.jini.outrigger.entryMatching.level = INFO > +com.sun.jini.outrigger.event.level = INFO > +com.sun.jini.outrigger.iterator.level = INFO > +com.sun.jini.outrigger.join.level = INFO > +com.sun.jini.outrigger.leases.level = INFO > +com.sun.jini.outrigger.lifecycle.level = INFO > +com.sun.jini.outrigger.operations.level = INFO > +com.sun.jini.outrigger.store.level = INFO > +com.sun.jini.outrigger.transactions.level = INFO > + > +# For the Browser Client > +com.sun.jini.example.browser.level = INFO > + > +# For the test harness, tests, and infrastructure. > +com.sun.jini.qa.harness.test.level = INFO > +com.sun.jini.qa.harness.service.level = INFO > +com.sun.jini.qa.harness.config.level = INFO > +com.sun.jini.test.spec.jeri.mux.level = INFO > > Modified: incubator/river/trunk/qatests/source/vob/qa/src/com/sun/ > jini/test/resources/qaHarness.prop > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/resources/qaHarness.prop?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/resources/qaHarness.prop (original) > +++ incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/resources/qaHarness.prop Wed May 21 16:10:35 2008 > @@ -26,13 +26,13 @@ > ###################################################### > > # location of the JSK installation > -com.sun.jini.jsk.home=/vob/jive > +com.sun.jini.jsk.home=${user.home}/river/trunk/jtsk > > # Location of the harness installation > -com.sun.jini.qa.home=/vob/qa > +com.sun.jini.qa.home=${user.home}/river/trunk/qatests/source/vob/qa > > # Location of the tests installation > -com.sun.jini.test.home=/vob/qa > +com.sun.jini.test.home=${user.home}/river/trunk/qatests/source/vob/qa > > ###################################################### > # > > Modified: incubator/river/trunk/qatests/source/vob/qa/src/com/sun/ > jini/test/spec/export/servercontext/GNUmakefile.jars > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/test/spec/export/servercontext/GNUmakefile.jars?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/spec/export/servercontext/GNUmakefile.jars (original) > +++ incubator/river/trunk/qatests/source/vob/qa/src/com/sun/jini/ > test/spec/export/servercontext/GNUmakefile.jars Wed May 21 16:10:35 > 2008 > @@ -29,14 +29,14 @@ > qa1-export-servercontext-tests-non-null.jar: jartools > rm -f $(QAJARSDIR)/$@ > @echo Creating $@ > - @cd $(MANIFESTDIR)/$(QA_NON_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . META-INF > + @cd $(MANIFESTDIR)/$(QA_NON_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . `find META-INF ! -name .svn ! -type d | grep - > v /.svn` > > qa1-export-servercontext-tests-null.jar: jartools > rm -f $(QAJARSDIR)/$@ > @echo Creating $@ > - @cd $(MANIFESTDIR)/$(QA_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . META-INF > + @cd $(MANIFESTDIR)/$(QA_NULL_SERVERCONTEXT); $(JAR) cfv $ > (QAJARSDIR)/$@ -C . `find META-INF ! -name .svn ! -type d | grep - > v /.svn` > > qa1-export-servercontext-tests-providers-parsing.jar: jartools > rm -f $(QAJARSDIR)/$@ > @echo Creating $@ > - @cd $(MANIFESTDIR)/$(QA_PROVIDERS_PARSING_SERVERCONTEXT); $(JAR) > cfv $(QAJARSDIR)/$@ -C . META-INF > + @cd $(MANIFESTDIR)/$(QA_PROVIDERS_PARSING_SERVERCONTEXT); $(JAR) > cfv $(QAJARSDIR)/$@ -C . `find META-INF ! -name .svn ! -type d | > grep -v /.svn` > > Modified: incubator/river/trunk/qatests/source/vob/tools/java/ > GNUmakefile > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/tools/java/GNUmakefile?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/tools/java/GNUmakefile > (original) > +++ incubator/river/trunk/qatests/source/vob/tools/java/GNUmakefile > Wed May 21 16:10:35 2008 > @@ -23,6 +23,8 @@ > # Assumption: only one tar file for this tool > # > > +JAVA.home := $(JAVA_HOME) > + > ifdef JAVA.home > JAVA.home.specified = yes > else > > Modified: incubator/river/trunk/qatests/source/vob/tools/src/ > GNUmakefile > URL: http://svn.apache.org/viewvc/incubator/river/trunk/qatests/source/vob/tools/src/GNUmakefile?rev=658927&r1=658926&r2=658927&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- incubator/river/trunk/qatests/source/vob/tools/src/GNUmakefile > (original) > +++ incubator/river/trunk/qatests/source/vob/tools/src/GNUmakefile > Wed May 21 16:10:35 2008 > @@ -24,7 +24,7 @@ > DIRS := $(CDIR) $(VIEW_ROOT)/vob/tools/bin > MAKE.tar := $(shell echo make-*.tar) > MAKE.dir := $(MAKE.tar:%.tar=%) > -JTOOLSDIR := com/sun/jini/tool > +JTOOLSDIR := $(VIEW_ROOT)/vob/tools/src/com/sun/jini/tool > > SCRIPTS = mergebranch copyright targets clearcmd vob.pl stampcode > frame.pl > > @@ -84,9 +84,9 @@ > mkdir -p $@ > @test -d $@ || (echo no $@ ; exit 1) > > -include GNUmakefile.allinc > +include $(VIEW_ROOT)/vob/tools/src/GNUmakefile.allinc > include $(VIEW_ROOT)/vob/tools/java/GNUmakefile > -include $(VIEW_ROOT)/vob/tools/odi/GNUmakefile > +#include $(VIEW_ROOT)/vob/tools/odi/GNUmakefile > > checkser: > @echo Classes missing serialVersionUID: > >