Author: peter_firmstone Date: Sat Jan 21 12:26:50 2012 New Revision: 1234313
URL: http://svn.apache.org/viewvc?rev=1234313&view=rev Log: River-32 Possible to build now, however the build targets haven't been set up correctly yet. Removed the example Admin Services for Jini 1.1 and the associated admin1 package. Added: river/tck/lib/destroy.jar (with props) Removed: river/tck/lib/start.jar river/tck/src/com/sun/jini/compat/reggie/CreateLookup.java river/tck/src/com/sun/jini/compat/reggie/TransientLookup.java river/tck/src/com/sun/jini/start/ServiceDestroyer.java river/tck/src/com/sun/jini/start/SharedGroup.java Modified: river/tck/ (props changed) river/tck/lib/ (props changed) river/tck/lib/CopyLibs/ (props changed) river/tck/nbproject/project.properties river/tck/src/com/sun/jini/compat/tool/ClassServer.java river/tck/src/com/sun/jini/debug/Debug.java river/tck/src/com/sun/jini/mahout/KillVMAdmin.java river/tck/src/com/sun/jini/start/SharedActivation.java Propchange: river/tck/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jan 21 12:26:50 2012 @@ -0,0 +1,2 @@ +build +dist Propchange: river/tck/lib/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jan 21 12:26:50 2012 @@ -0,0 +1,7 @@ +compat-dl.jar +compat-admin1.jar +compat-lus.jar +compat-lus-dl.jar +true +compat.jar +compat-admin2.jar Propchange: river/tck/lib/CopyLibs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jan 21 12:26:50 2012 @@ -0,0 +1 @@ +true Added: river/tck/lib/destroy.jar URL: http://svn.apache.org/viewvc/river/tck/lib/destroy.jar?rev=1234313&view=auto ============================================================================== Binary file - no diff available. Propchange: river/tck/lib/destroy.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: river/tck/nbproject/project.properties URL: http://svn.apache.org/viewvc/river/tck/nbproject/project.properties?rev=1234313&r1=1234312&r2=1234313&view=diff ============================================================================== --- river/tck/nbproject/project.properties (original) +++ river/tck/nbproject/project.properties Sat Jan 21 12:26:50 2012 @@ -26,10 +26,9 @@ dist.jar=${dist.dir}/River-JiniTCK.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.compat.jar=lib/compat.jar +file.reference.destroy.jar=lib/destroy.jar file.reference.jsk-lib.jar=lib/jsk-lib.jar file.reference.jsk-platform.jar=lib/jsk-platform.jar -file.reference.start.jar=lib/start.jar file.reference.sun-util.jar=lib/sun-util.jar file.reference.tck-src=src includes=** @@ -37,9 +36,8 @@ jar.compress=false javac.classpath=\ ${file.reference.jsk-platform.jar}:\ ${file.reference.jsk-lib.jar}:\ - ${file.reference.start.jar}:\ ${file.reference.sun-util.jar}:\ - ${file.reference.compat.jar} + ${file.reference.destroy.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false Modified: river/tck/src/com/sun/jini/compat/tool/ClassServer.java URL: http://svn.apache.org/viewvc/river/tck/src/com/sun/jini/compat/tool/ClassServer.java?rev=1234313&r1=1234312&r2=1234313&view=diff ============================================================================== --- river/tck/src/com/sun/jini/compat/tool/ClassServer.java (original) +++ river/tck/src/com/sun/jini/compat/tool/ClassServer.java Sat Jan 21 12:26:50 2012 @@ -90,7 +90,7 @@ public class ClassServer extends Thread String[] files = fdir.list(); if (files == null) return; - URL base = fdir.toURL(); + URL base = fdir.toURI().toURL(); for (int i = 0; i < files.length; i++) { String jar = files[i]; if (!jar.endsWith(".jar") && !jar.endsWith(".zip")) @@ -403,14 +403,14 @@ public class ClassServer extends Thread String fmt = getString(key); if (fmt == null) fmt = "no text found: \"" + key + "\" {0}"; - System.out.println(MessageFormat.format(fmt, new String[]{val})); + System.out.println(MessageFormat.format(fmt, (Object[]) new String[]{val})); } private static void print(String key, String[] vals) { String fmt = getString(key); if (fmt == null) fmt = "no text found: \"" + key + "\" {0} {1} {2}"; - System.out.println(MessageFormat.format(fmt, vals)); + System.out.println(MessageFormat.format(fmt, (Object[]) vals)); } /** Modified: river/tck/src/com/sun/jini/debug/Debug.java URL: http://svn.apache.org/viewvc/river/tck/src/com/sun/jini/debug/Debug.java?rev=1234313&r1=1234312&r2=1234313&view=diff ============================================================================== --- river/tck/src/com/sun/jini/debug/Debug.java (original) +++ river/tck/src/com/sun/jini/debug/Debug.java Sat Jan 21 12:26:50 2012 @@ -13,6 +13,9 @@ import java.security.PrivilegedAction; */ public class Debug { + private final PrintWriter writer; + private static Debug instance = new Debug(); + /** * This appears to be a static method that returns an PrivilegedAction that * returns a Debug instance. @@ -21,9 +24,19 @@ public class Debug { * @return */ public static PrivilegedAction<Debug> getDebugAction(String string){ - throw new UnsupportedOperationException("Not yet implemented"); + return new PrivilegedAction<Debug>(){ + + @Override + public Debug run() { + return instance; + } + + }; } + private Debug(){ + writer = new PrintWriter(System.out, true); + } /** * I've got no idea what this does. I imagine it gets the output stream * or error stream PrintWriter. @@ -32,7 +45,8 @@ public class Debug { * @return */ public PrintWriter getWriter(String string) { - throw new UnsupportedOperationException("Not yet implemented"); + writer.println(string); + return writer; } } Modified: river/tck/src/com/sun/jini/mahout/KillVMAdmin.java URL: http://svn.apache.org/viewvc/river/tck/src/com/sun/jini/mahout/KillVMAdmin.java?rev=1234313&r1=1234312&r2=1234313&view=diff ============================================================================== --- river/tck/src/com/sun/jini/mahout/KillVMAdmin.java (original) +++ river/tck/src/com/sun/jini/mahout/KillVMAdmin.java Sat Jan 21 12:26:50 2012 @@ -7,7 +7,9 @@ package com.sun.jini.mahout; import java.rmi.RemoteException; /** - * Missing dependency + * Missing dependency, note this is not included in any jar files, so + * is implemented but not necessary? + * * @author peter */ public interface KillVMAdmin { Modified: river/tck/src/com/sun/jini/start/SharedActivation.java URL: http://svn.apache.org/viewvc/river/tck/src/com/sun/jini/start/SharedActivation.java?rev=1234313&r1=1234312&r2=1234313&view=diff ============================================================================== --- river/tck/src/com/sun/jini/start/SharedActivation.java (original) +++ river/tck/src/com/sun/jini/start/SharedActivation.java Sat Jan 21 12:26:50 2012 @@ -11,10 +11,8 @@ import java.rmi.activation.ActivationID; * Missing class dependency * @author peter */ -public class SharedActivation { +public interface SharedActivation { - public void setInitializationData(ActivationID activationID, MarshalledObject data) { - throw new UnsupportedOperationException("Not yet implemented"); - } + public void setInitializationData(ActivationID activationID, MarshalledObject data); }
