You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by jc...@apache.org on 2009/04/19 17:46:55 UTC
svn commit: r766477 - in /incubator/river/jtsk/trunk: ./ doc/
doc/specs/html/ qa/ qa/doc/
Author: jcosters
Date: Sun Apr 19 15:46:53 2009
New Revision: 766477
URL: http://svn.apache.org/viewvc?rev=766477&view=rev
Log:
RIVER-301: merged additional changes from skunk/jcosters branch
Modified:
incubator/river/jtsk/trunk/common.xml
incubator/river/jtsk/trunk/doc/spec-index.html
incubator/river/jtsk/trunk/doc/specs/html/serviceui-spec.html
incubator/river/jtsk/trunk/qa/README.txt (props changed)
incubator/river/jtsk/trunk/qa/build.xml
incubator/river/jtsk/trunk/qa/doc/HowToRunATest.html (props changed)
incubator/river/jtsk/trunk/qa/doc/HowToWriteATest.html (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverymanagement-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverymanagement-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverymanagement-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/discoverymanagement-test.html (props changed)
incubator/river/jtsk/trunk/qa/doc/discoveryservice-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/discoveryservice-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/discoveryservice-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/discoveryservice-test.html (props changed)
incubator/river/jtsk/trunk/qa/doc/eventmailbox-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/eventmailbox-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/eventmailbox-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/eventmailbox-test.html (props changed)
incubator/river/jtsk/trunk/qa/doc/index-requirements.html (props changed)
incubator/river/jtsk/trunk/qa/doc/index-testdescriptions.html (props changed)
incubator/river/jtsk/trunk/qa/doc/index.html (props changed)
incubator/river/jtsk/trunk/qa/doc/javaspace_req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/javaspace_test.html (props changed)
incubator/river/jtsk/trunk/qa/doc/joinmanager-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/joinmanager-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/joinmanager-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/locatordiscovery-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/locatordiscovery-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/locatordiscovery-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/qaMethodWorkArch.html (props changed)
incubator/river/jtsk/trunk/qa/doc/qaarch.sdw (props changed)
incubator/river/jtsk/trunk/qa/doc/renewalmanager-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/renewalmanager-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/renewalservice-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/renewalservice-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/renewalservice-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/renewalservice-test.html (props changed)
incubator/river/jtsk/trunk/qa/doc/servicediscovery-req.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/servicediscovery-req.html (props changed)
incubator/river/jtsk/trunk/qa/doc/servicediscovery-test.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/servicediscovery-test.html (props changed)
incubator/river/jtsk/trunk/qa/doc/testcategories.doc (props changed)
incubator/river/jtsk/trunk/qa/doc/testcategories.html (props changed)
Modified: incubator/river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=766477&r1=766476&r2=766477&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/common.xml (original)
+++ incubator/river/jtsk/trunk/common.xml Sun Apr 19 15:46:53 2009
@@ -18,8 +18,8 @@
!-->
<project name="common" default="" basedir=".">
- <!-- Root of the River source distribution, override this in subprojects -->
- <property name="root" value="${basedir}"/>
+ <!-- User specific settings -->
+ <property file="build.properties" />
<!-- Product version info -->
<property name="version" value="2.1.1"/>
@@ -107,8 +107,7 @@
<element name="plg-elements" implicit="true"/>
<sequential>
<java classname="com.sun.jini.tool.PreferredListGen"
- failonerror="true"
- fork="true">
+ failonerror="true" fork="true" >
<plg-elements/>
</java>
</sequential>
Modified: incubator/river/jtsk/trunk/doc/spec-index.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/doc/spec-index.html?rev=766477&r1=766476&r2=766477&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/doc/spec-index.html (original)
+++ incubator/river/jtsk/trunk/doc/spec-index.html Sun Apr 19 15:46:53 2009
@@ -70,6 +70,11 @@
JavaSpaces Service Specification</i></a>
</ul></ul>
<HR>
+ <ul><ul>
+ <li><a href="../doc/specs/html/serviceui-spec.html"><i>
+ ServiceUI Specification</i></a>
+ </ul></ul>
+<HR>
<UL><UL>
<LI><i><a href="../doc/specs/api/net/jini/activation/package-summary.html"> net.jini.activation</i></a>
Modified: incubator/river/jtsk/trunk/doc/specs/html/serviceui-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/doc/specs/html/serviceui-spec.html?rev=766477&r1=766476&r2=766477&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/doc/specs/html/serviceui-spec.html (original)
+++ incubator/river/jtsk/trunk/doc/specs/html/serviceui-spec.html Sun Apr 19 15:46:53 2009
@@ -3252,6 +3252,23 @@
UI factory interface implemented by the UI factory contained
in marshalled form in the same <code>UIDescriptor</code> in
which this <code>UIFactoryTypes</code> appears.
+</P>
+<hr>
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+<ul>
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+</ul>
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
</body>
</html>
Propchange: incubator/river/jtsk/trunk/qa/README.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/README.txt:766115-766476
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=766477&r1=766476&r2=766477&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Apr 19 15:46:53 2009
@@ -79,23 +79,23 @@
<property name="resources" value="**/resources/**, **/*.td, **/*.properties,
**/*.policy, **/*.config, **/*.logging, **/*.prop" />
- <target name="clean" depends="clean.build, clean.lib, clean.trust, clean.doc"
+ <target name="clean" depends="clean-build, clean-lib, clean-trust, clean-doc"
description="Clean up build" />
- <target name="clean.build">
+ <target name="clean-build">
<delete dir="${build.dir}" />
</target>
- <target name="clean.lib">
+ <target name="clean-lib">
<delete dir="${lib.dir}" />
<delete dir="${lib-ext.dir}" />
</target>
- <target name="clean.doc">
+ <target name="clean-doc">
<delete dir="${doc.api.dir}" />
</target>
- <target name="clean.trust">
+ <target name="clean-trust">
<delete>
<fileset dir="${trust.dir}">
<include name="*.cert" />
@@ -141,6 +141,7 @@
<jvmarg value="-Dcom.sun.jini.qa.harness.configs=${harness.configs}" />
<!-- VM args for each test run: include our JDK extension directories
$${com.sun.jini.qa.harness.globalvmargs},-Dcom.sun.jini.test.home=$${com.sun.jini.test.home},-Dcom.sun.jini.test.port=$${com.sun.jini.test.port},-Dcom.sun.jini.qa.harness.policies=<url: com/sun/jini/test/resources/jinitest.policy>-Djava.security.debug=access-->
+ <!--<jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs},-Djava.security.debug=access"/>-->
<jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs}"/>
<arg path="${src.dir}/com/sun/jini/test/resources/qaHarness.prop" />
<arg value="-testJar"/>
@@ -289,11 +290,11 @@
qa1-lookup-simulator.stubs,
qa1-share.stubs,
qa1-discoveryservice.stubs,
- iiop.stubs,
qa1-javaspace.stubs,
- jrmp.stubs,
qa1-lookupservice.stubs,
- qa1-renewalservice.stubs"
+ qa1-renewalservice.stubs,
+ jrmp.stubs,
+ iiop.stubs"
description="Compile stubs"/>
<target name="harness-killer.stubs" depends="compile">
@@ -1404,8 +1405,8 @@
</target>
<target name="jrmp.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
- <include name="com/sun/jini/test/spec/iiop/util/TestRemoteObject.class" />
+ <rmic base="${classes.dir}" iiop="true" classpathref="river.classpath">
+ <include name="com/sun/jini/test/spec/jrmp/util/TestRemoteObject.class" />
</rmic>
</target>
Propchange: incubator/river/jtsk/trunk/qa/doc/HowToRunATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToRunATest.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/HowToWriteATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToWriteATest.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverymanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverymanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverymanagement-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoverymanagement-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoveryservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoveryservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoveryservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/discoveryservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/eventmailbox-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/eventmailbox-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/eventmailbox-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/eventmailbox-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/index-requirements.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/index-requirements.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/index-testdescriptions.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/index-testdescriptions.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/index.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/javaspace_req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/javaspace_test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_test.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/joinmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/joinmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/joinmanager-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/locatordiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/locatordiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/locatordiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/qaMethodWorkArch.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/qaMethodWorkArch.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/qaarch.sdw
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/qaarch.sdw:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/renewalmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/renewalmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/renewalservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/renewalservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/renewalservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/renewalservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/servicediscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/servicediscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/servicediscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/servicediscovery-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.html:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/testcategories.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.doc:766115-766476
Propchange: incubator/river/jtsk/trunk/qa/doc/testcategories.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 19 15:46:53 2009
@@ -0,0 +1 @@
+/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.html:766115-766476