You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by ma...@apache.org on 2008/04/14 20:40:46 UTC
svn commit: r647928 - in /incubator/river/jtsk/trunk/src/com/sun/jini/tool:
CheckConfigurationFile.java ClassServer.java ComputeDigest.java
ComputeHttpmdCodebase.java JarWrapper.java PreferredListGen.java
envcheck/EnvCheck.java
Author: marbro
Date: Mon Apr 14 11:40:45 2008
New Revision: 647928
URL: http://svn.apache.org/viewvc?rev=647928&view=rev
Log:
Fixed small javadoc error caused by implementing RIVER-161, fix for RIVER-227 and RIVER-232.
Modified:
incubator/river/jtsk/trunk/src/com/sun/jini/tool/CheckConfigurationFile.java
incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java
incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeDigest.java
incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java
incubator/river/jtsk/trunk/src/com/sun/jini/tool/JarWrapper.java
incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java
incubator/river/jtsk/trunk/src/com/sun/jini/tool/envcheck/EnvCheck.java
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/CheckConfigurationFile.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/CheckConfigurationFile.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/CheckConfigurationFile.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/CheckConfigurationFile.java Mon Apr 14 11:40:45 2008
@@ -48,7 +48,6 @@
import net.jini.config.ConfigurationException;
import net.jini.config.ConfigurationFile;
import net.jini.config.ConfigurationProvider;
-import net.jini.config.ConfigurationNotFoundException;
/**
* Checks the format of the source for a {@link ConfigurationFile}. The source
@@ -125,9 +124,9 @@
*
* <blockquote>
* <pre>
- * java -jar <var><b>install_dir</b></var>/lib/checkconfigurationfile.jar
- * -cp <var><b>install_dir</b></var>/lib/norm.jar:<var><b>install_dir</b></var>/lib/jsk-platform.jar
- * -entries <var><b>install_dir</b></var>/configentry/norm-transient
+ * java -jar <var><b>install_dir</b></var>/lib/checkconfigurationfile.jar \
+ * -cp <var><b>install_dir</b></var>/lib/norm.jar:<var><b>install_dir</b></var>/lib/jsk-platform.jar \
+ * -entries <var><b>install_dir</b></var>/configentry/norm-transient \
* <var><b>your-norm.config</b></var>
* </pre>
* </blockquote>
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java Mon Apr 14 11:40:45 2008
@@ -31,7 +31,6 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.URL;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -116,7 +115,7 @@
* <p>
* An example of running directly from the command line is:
* <blockquote><pre>
- * % java -jar <var><b>install_dir</b></var>/lib/classserver.jar
+ * % java -jar <var><b>install_dir</b></var>/lib/classserver.jar \
* -port 8081 -dir <var><b>install_dir</b></var>/lib-dl -verbose
* </pre></blockquote>
* where <var><b>install_dir</b></var>
@@ -128,8 +127,8 @@
* <p>
* An example of running under the Service Starter is:
* <blockquote><pre>
- * % java -Djava.security.policy=<var><b>start_policy</b></var>
- * -jar <var><b>install_dir</b></var>/lib/start.jar
+ * % java -Djava.security.policy=<var><b>start_policy</b></var> \
+ * -jar <var><b>install_dir</b></var>/lib/start.jar \
* <a href="#config">httpd.config</a>
* </pre></blockquote>
* <p>
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeDigest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeDigest.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeDigest.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeDigest.java Mon Apr 14 11:40:45 2008
@@ -34,8 +34,8 @@
*
* <blockquote>
* <pre>
- * java -jar <var><b>install_dir</b></var>/lib/computedigest.jar
- * <var><b>install_dir</b></var>/lib/reggie.jar
+ * java -jar <var><b>install_dir</b></var>/lib/computedigest.jar \
+ * <var><b>install_dir</b></var>/lib/reggie.jar \
* SHA-1
* </pre>
* </blockquote>
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java Mon Apr 14 11:40:45 2008
@@ -38,8 +38,8 @@
*
* <blockquote>
* <pre>
- * java -jar <var><b>install_dir</b></var>/lib/computehttpmdcodebase.jar
- * <var><b>install_dir</b></var>/lib-dl
+ * java -jar <var><b>install_dir</b></var>/lib/computehttpmdcodebase.jar \
+ * <var><b>install_dir</b></var>/lib-dl \
* "httpmd://<var><b>your_host</b></var>:<var><b>http_port</b></var>/sdm-dl.jar;md5=0"
* </pre>
* </blockquote>
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/JarWrapper.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/JarWrapper.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/JarWrapper.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/JarWrapper.java Mon Apr 14 11:40:45 2008
@@ -107,11 +107,11 @@
* <p>
* To run the tool on UNIX platforms:
* <blockquote><pre>
- * java -jar <var><b>jsk_install_dir</b></var>/lib/jarwrapper.jar <var><b>processing_options</b></var>
+ * java -jar <var><b>install_dir</b></var>/lib/jarwrapper.jar <var><b>processing_options</b></var>
* </pre></blockquote>
* To run the tool on Microsoft Windows platforms:
* <blockquote><pre>
- * java -jar <var><b>jsk_install_dir</b></var>\lib\jarwrapper.jar <var><b>processing_options</b></var>
+ * java -jar <var><b>install_dir</b></var>\lib\jarwrapper.jar <var><b>processing_options</b></var>
* </pre></blockquote>
* <p>
* A more specific example with options for running directly from a Unix command
@@ -120,7 +120,7 @@
* % java -jar <var><b>install_dir</b></var>/lib/jarwrapper.jar \
* -httpmd=SHA-1 wrapper.jar base_dir src1.jar src2.jar
* </pre></blockquote>
- * where <var><b>jsk_install_dir</b></var> is the directory where the Apache
+ * where <var><b>install_dir</b></var> is the directory where the Apache
* River release is installed. This command line would result in the creation
* of a wrapper JAR file, <code>wrapper.jar</code>, in the current working
* directory, whose contents would be based on the source JAR files
@@ -315,11 +315,11 @@
* the first top-level source JAR file listed on the command line which
* defines a <code>Main-Class</code> entry.
* <p>
- * Note that attribute values generated by this utility, such as those for the
- * <code>Class-Path</code> and <code>Main-Class</code> attributes described
- * above, do not take precedence over values for the same attributes contained
- * in a manifest file explicitly specified using the <code>-manifest</code>
- * option (described below).
+ * Note that attribute values generated by this utility, such as those for
+ * the <code>Class-Path</code> and <code>Main-Class</code> attributes
+ * described above, do not take precedence over values for the same
+ * attributes contained in a manifest file explicitly specified using the
+ * <code>-manifest</code> option (described below).
* <p>
* Supported options for this tool include:
* <p>
@@ -340,19 +340,20 @@
* source JAR files.
* <p>
* <dt> <code>-manifest=<I>file</I></code>
- * <dd> Specifies a manifest file containing attribute values to
- * include in the manifest file inside the generated wrapper JAR file.
+ * <dd> Specifies a manifest file containing attribute values to include
+ * in the manifest file inside the generated wrapper JAR file.
* This allows enables users to add additional metadata or
* override JarWrapper's generated values to customize the resulting
* manifest. The values contained in this optional file take
* precedence over the generated content. This flag is conceptually
- * similar to the jar utilities m flag. In the current
+ * similar to the jar utilities <code>m</code> flag. In the current
* version there are four possible attributes that can be overridden
- * in the target Manifest. These are Name.MANIFEST_VERSION,
- * Name("Created-By"), Name.CLASS_PATH and Name.MAIN_CLASS. Any additonal
- * attributes beyond these four will be appended to the manifest attribute
- * list and will appear in the resultant MANIFEST.MF file.
- *
+ * in the target Manifest. These are
+ * <code>Name.MANIFEST_VERSION</code>,
+ * <code>Name("Created-By")</code>, <code>Name.CLASS_PATH</code> and
+ * <code>Name.MAIN_CLASS</code>. Any additonal attributes beyond
+ * these four will be appended to the manifest attribute list and
+ * will appear in the resultant <code>MANIFEST.MF</code> file.
* </dl>
*/
public static void main(String[] args) {
@@ -428,7 +429,6 @@
* Invokes {@link #wrap(String, String, String[], String, boolean, Manifest)
* wrap} with the provided values and a <code>null</code> manifest.
*
- *
* @param destJar name of the wrapper JAR file to generate
* @param baseDir base directory from which to locate source JAR
* files to wrap
@@ -537,11 +537,11 @@
* Generates a wrapper JAR file based on the provided values in the same
* manner as described in the documentation for {@link #main}.
* <p>
- * The difference between this method and the 6-arg <code>wrap</code> method
- * is that the source JAR files must be specified by an absolute path and
- * that for processing the classpath will be flattened, i.e. each source JAR
- * file will be considered as relative to its parent directory (that will
- * serve as a virtual base directory) for the assembly of the
+ * The difference between this method and the 6 and 7-arg <code>wrap</code>
+ * method is that the source JAR files must be specified by an absolute path
+ * and that for processing the classpath will be flattened, i.e. each source
+ * JAR file will be considered as relative to its parent directory (that
+ * will serve as a virtual base directory) for the assembly of the
* <code>Class-Path</code> entry.
*
* @param destJar name of the wrapper JAR file to generate
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/PreferredListGen.java Mon Apr 14 11:40:45 2008
@@ -94,11 +94,11 @@
*
* To run the tool on UNIX platforms:
* <blockquote><pre>
- * java -jar <var><b>jsk_install_dir</b></var>/lib/preferredlistgen.jar <var><b>processing_options</b></var>
+ * java -jar <var><b>install_dir</b></var>/lib/preferredlistgen.jar <var><b>processing_options</b></var>
* </pre></blockquote>
* To run the tool on Microsoft Windows platforms:
* <blockquote><pre>
- * java -jar <var><b>jsk_install_dir</b></var>\lib\preferredlistgen.jar <var><b>processing_options</b></var>
+ * java -jar <var><b>install_dir</b></var>\lib\preferredlistgen.jar <var><b>processing_options</b></var>
* </pre></blockquote>
* <p>
* Note that the options for this tool can be specified in any order, and
@@ -292,11 +292,11 @@
* <code>com.sun.jini.reggie.ConstrainableAdminProxy</code>.
* <p>
* <blockquote><pre>
- * java -jar <var><b>jsk_install_dir</b></var>/lib/preferredlistgen.jar
- * -cp <var><b>jsk_install_dir</b></var>/lib/jsk-platform.jar
- * -jar <var><b>jsk_install_dir</b></var>/lib-dl/reggie-dl.jar
- * -jar <var><b>jsk_install_dir</b></var>/lib-dl/jsk-dl.jar
- * -proxy com.sun.jini.reggie.ConstrainableRegistrarProxy
+ * java -jar <var><b>install_dir</b></var>/lib/preferredlistgen.jar \
+ * -cp <var><b>install_dir</b></var>/lib/jsk-platform.jar \
+ * -jar <var><b>install_dir</b></var>/lib-dl/reggie-dl.jar \
+ * -jar <var><b>install_dir</b></var>/lib-dl/jsk-dl.jar \
+ * -proxy com.sun.jini.reggie.ConstrainableRegistrarProxy \
* -proxy com.sun.jini.reggie.ConstrainableAdminProxy
* </pre></blockquote>
* <p>
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/envcheck/EnvCheck.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/envcheck/EnvCheck.java?rev=647928&r1=647927&r2=647928&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/envcheck/EnvCheck.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/envcheck/EnvCheck.java Mon Apr 14 11:40:45 2008
@@ -19,14 +19,11 @@
import com.sun.jini.resource.Service;
-import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.IOException;
import java.io.ObjectInputStream;
-import java.io.OutputStream;
import java.io.PrintStream;
import java.lang.reflect.Modifier;
@@ -35,11 +32,8 @@
import java.net.URL;
import java.net.URLClassLoader;
-import java.rmi.RMISecurityManager;
-
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties;
import java.util.ResourceBundle;
@@ -47,8 +41,6 @@
import net.jini.config.Configuration;
import net.jini.config.ConfigurationException;
import net.jini.config.ConfigurationProvider;
-import net.jini.config.EmptyConfiguration;
-import net.jini.config.NoSuchEntryException;
import com.sun.jini.start.ServiceDescriptor;
import com.sun.jini.start.NonActivatableServiceDescriptor;
@@ -82,14 +74,14 @@
* arguments to the tool. Thus, for a service designed to be run by the
* service starter having the hypothetical original command line:
* <blockquote><pre>
- * java -Djava.security.policy=mypolicy
- * -jar /jini/lib/start.jar mystart.config
+ * java -Djava.security.policy=<var><b>my_policy</b></var> \
+ * -jar <var><b>install_dir</b></var>/lib/start.jar mystart.config
* </pre></blockquote>
* the simplest invocation of the tool would be:
* <blockquote><pre>
- * java -jar /jini/lib/envcheck.jar
- * java -Djava.security.policy=mypolicy
- * -jar /jini/lib/start.jar mystart.config
+ * java -jar <var><b>install_dir</b></var>/lib/envcheck.jar \
+ * java -Djava.security.policy=<var><b>my_policy</b></var> \
+ * -jar <var><b>install_dir</b></var>/lib/start.jar mystart.config
* </pre></blockquote>
* Note that the entire command line, including the <code>java</code> command,
* is supplied as arguments to the tool. The <code>java</code> command used to
@@ -172,11 +164,11 @@
* <p>
* <blockquote><pre>
- * java -jar /jini/lib/envcheck.jar -level info -explain -traces
- * /usr/bin/java -cp mylib/myservice.jar:/jini/lib/jsk-platform.jar
- * -Djava.security.policy=mypolicy
- * -Djava.server.rmi.codebase=http://myhost/myservice-dl.jar
- * myservice.MyServiceImpl
+ * java -jar <var><b>install_dir</b></var>/lib/envcheck.jar -level info -explain -traces \
+ * java -cp <var><b>mylib_dir</b></var>/myservice.jar:/jini/lib/jsk-platform.jar \
+ * -Djava.security.policy=<var><b>my_policy</b></var> \
+ * -Djava.server.rmi.codebase=http://myhost/myservice-dl.jar \
+ * myservice.MyServiceImpl
* </blockquote></pre>
* In this case, the tool is limited to performing validity checks on the
* classpath, policy, and codebase values identified by the system properties
@@ -189,9 +181,9 @@
* starter configuration located in the working directory:
* <p>
* <blockquote><pre>
- * java -jar /jini/lib/envcheck.jar -level error
- * /usr/bin/java -Djava.security.policy=mystarterpolicy
- * -jar /jini/lib/start.jar reggie.config
+ * java -jar <var><b>install_dir</b></var>/lib/envcheck.jar -level error \
+ * java -Djava.security.policy=<var><b>my_starterpolicy</b></var> \
+ * -jar <var><b>install_dir</b></var>/lib/start.jar reggie.config
* </blockquote></pre>
* The tool can perform many more checks in this case because the
* bundled plugins include built-in knowledge about the service starter
@@ -385,7 +377,7 @@
* Search the command line for user supplied plugin definitions
* and place them in the internal plugin list.
*
- * @param cmdline the original command line args
+ * @param cmdLine the original command line args
*/
private static void findPlugins(String[] cmdLine) {
int index = 0;