Author: peterreilly
Date: Sun Nov 12 14:29:31 2006
New Revision: 474071
URL: http://svn.apache.org/viewvc?view=rev&rev=474071
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Sun Nov 12 14:29:31 2006
@@ -505,9 +505,9 @@
public void setProcessInputStream(OutputStream param1) throws IOException
{ }
/**
- *
- * @param is
- * @exception java.io.IOException
+ * Set the output stream of the process.
+ * @param is the input stream.
+ * @throws IOException if there is an error.
*/
public void setProcessOutputStream(InputStream is) throws IOException {
try {
@@ -516,7 +516,8 @@
while ((javafile = reader.readLine()) != null) {
if (javafile.endsWith(".java")) {
String classfile = toClassFile(javafile);
- String key =
classfile.substring(getConfig().srcDir.getAbsolutePath().length() + 1);
+ String key = classfile.substring(
+ getConfig().srcDir.getAbsolutePath().length() + 1);
genfiles.put(key, new File(classfile));
}
}
@@ -527,6 +528,11 @@
}
}
+ /**
+ * Set the error stream of the process.
+ * @param is the input stream.
+ * @throws IOException if there is an error.
+ */
public void setProcessErrorStream(InputStream is) throws IOException {
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
String s = reader.readLine();
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Sun Nov 12 14:29:31 2006
@@ -41,6 +41,7 @@
static final String JAVA_MODE = "java";
static final String FORK_MODE = "fork";
+ // CheckStyle:VisibilityModifier OFF - bc
/** debug the generateclient task */
boolean debug = false;
@@ -58,13 +59,19 @@
/** hold the version */
int version = BorlandDeploymentTool.BAS;
+ // CheckStyle:VisibilityModifier ON
+ /**
+ * Set the version attribute.
+ * @param version the value to use.
+ */
public void setVersion(int version) {
this.version = version;
}
/**
* Command launching mode: java or fork.
+ * @param s the mode to use.
*/
public void setMode(String s) {
mode = s;
@@ -72,6 +79,7 @@
/**
* If true, turn on the debug mode for each of the Borland tools launched.
+ * @param debug a <code>boolean</code> value.
*/
public void setDebug(boolean debug) {
this.debug = debug;
@@ -79,6 +87,7 @@
/**
* EJB JAR file.
+ * @param ejbfile the file to use.
*/
public void setEjbjar(File ejbfile) {
ejbjarfile = ejbfile;
@@ -86,6 +95,7 @@
/**
* Client JAR file name.
+ * @param clientjar the file to use.
*/
public void setClientjar(File clientjar) {
clientjarfile = clientjar;
@@ -93,6 +103,7 @@
/**
* Path to use for classpath.
+ * @param classpath the path to use.
*/
public void setClasspath(Path classpath) {
if (this.classpath == null) {
@@ -104,6 +115,7 @@
/**
* Adds path to the classpath.
+ * @return a path to be configured as a nested element.
*/
public Path createClasspath() {
if (this.classpath == null) {
@@ -114,6 +126,7 @@
/**
* Reference to existing path, to use as a classpath.
+ * @param r the reference to use.
*/
public void setClasspathRef(Reference r) {
createClasspath().setRefid(r);
@@ -161,7 +174,10 @@
} // end of else
}
- /** launch the generate client using java api */
+ /**
+ * launch the generate client using java api.
+ * @throws BuildException if there is an error.
+ */
protected void executeJava() throws BuildException {
try {
if (version == BorlandDeploymentTool.BES) {
@@ -206,7 +222,10 @@
}
}
- /** launch the generate client using system api */
+ /**
+ * launch the generate client using system api.
+ * @throws BuildException if there is an error.
+ */
protected void executeFork() throws BuildException {
if (version == BorlandDeploymentTool.BAS) {
executeForkV4();
@@ -216,7 +235,10 @@
}
}
- /** launch the generate client using system api */
+ /**
+ * launch the generate client using system api.
+ * @throws BuildException if there is an error.
+ */
protected void executeForkV4() throws BuildException {
try {
@@ -250,7 +272,11 @@
}
}
- /** launch the generate client using system api */
+
+ /**
+ * launch the generate client using system api.
+ * @throws BuildException if there is an error.
+ */
protected void executeForkV5() throws BuildException {
try {
log("mode : fork " + BorlandDeploymentTool.BES, Project.MSG_DEBUG);
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
Sun Nov 12 14:29:31 2006
@@ -20,7 +20,6 @@
import java.io.File;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Java;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.Commandline;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
Sun Nov 12 14:29:31 2006
@@ -40,10 +40,12 @@
*/
private File generatedFilesDirectory;
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* The descriptor text files for which a serialised descriptor is to be
created.
*/
String[] descriptors;
+ // CheckStyle:VisibilityModifier ON
/**
* The main method.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
Sun Nov 12 14:29:31 2006
@@ -75,6 +75,7 @@
*/
private int parseState = STATE_LOOKING_EJBJAR;
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* Instance variable used to store the name of the current element being
* processed by the SAX parser. Accessed by the SAX parser call-back
methods
@@ -106,6 +107,7 @@
private boolean inEJBRef = false;
private Hashtable urlDTDs = new Hashtable();
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* The directory containing the bean classes and interfaces. This is
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
Sun Nov 12 14:29:31 2006
@@ -32,23 +32,26 @@
*
* @param descriptorFilename the name of the deployment descriptor
* @param saxParser a SAX parser which can be used to parse the deployment
descriptor.
+ * @throws BuildException if there is an error.
*/
void processDescriptor(String descriptorFilename, SAXParser saxParser)
throws BuildException;
/**
* Called to validate that the tool parameters have been configured.
- *
+ * @throws BuildException if there is an error.
*/
void validateConfigured() throws BuildException;
/**
* Set the task which owns this tool
+ * @param task the task.
*/
void setTask(Task task);
/**
* Configure this tool for use in the ejbjar task.
+ * @param config contains configuration state.
*/
void configure(EjbJar.Config config);
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
Sun Nov 12 14:29:31 2006
@@ -68,6 +68,7 @@
* This state is passed to the deployment tools for configuration
*/
static class Config {
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* Stores a handle to the directory under which to search for class
* files
@@ -122,6 +123,7 @@
* The dependency analyzer to use to add additional classes to the jar
*/
public String analyzer;
+ // CheckStyle:VisibilityModifier ON
}
/**
@@ -169,8 +171,11 @@
* @since ant 1.6
*/
public static class CMPVersion extends EnumeratedAttribute {
+ /** 1.0 value */
public static final String CMP1_0 = "1.0";
+ /** 2.0 value */
public static final String CMP2_0 = "2.0";
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return new String[]{
CMP1_0,
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
Sun Nov 12 14:29:31 2006
@@ -20,7 +20,6 @@
import java.io.File;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Java;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.Commandline;
@@ -152,6 +151,7 @@
* If true, ejbc will keep the
* intermediate Java files used to build the class files.
* This can be useful when debugging.
+ * @param newKeepgenerated a boolean as a string.
*/
public void setKeepgenerated(String newKeepgenerated) {
keepgenerated =
Boolean.valueOf(newKeepgenerated.trim()).booleanValue();
@@ -172,6 +172,7 @@
/**
* Set the classpath to be used for this compilation.
+ * @param s the classpath (as a string) to use.
*/
public void setClasspath(String s) {
this.classpath = FileUtils.translatePath(s);
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
Sun Nov 12 14:29:31 2006
@@ -57,15 +57,19 @@
*/
private File sourceDirectory;
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* The names of the serialised deployment descriptors
*/
String[] descriptors;
+ // CheckStyle:VisibilityModifier ON
private boolean keepGenerated;
/**
* Command line interface for the ejbc helper task.
+ * @param args command line arguments.
+ * @throws Exception if there is a problem.
*/
public static void main(String[] args) throws Exception {
EjbcHelper helper = new EjbcHelper(args);
@@ -143,7 +147,7 @@
primaryKeyClassPath
= ((EntityDescriptor) dd).getPrimaryKeyClassName();
primaryKeyClassPath
- = primaryKeyClassPath.replace('.', '/') + ".java";;
+ = primaryKeyClassPath.replace('.', '/') + ".java";
}
File homeInterfaceSource = new File(sourceDirectory,
homeInterfacePath);
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
Sun Nov 12 14:29:31 2006
@@ -125,6 +125,7 @@
*/
private DependencyAnalyzer dependencyAnalyzer;
+ /** No arg constructor */
public GenericDeploymentTool() {
}
@@ -314,6 +315,7 @@
* @param logicalFilename A String representing the name, including
* all relevant path information, that should be stored for the
entry
* being added.
+ * @throws BuildException if there is a problem.
*/
protected void addFileToJar(JarOutputStream jStream,
File inputFile,
@@ -359,6 +361,7 @@
/**
* Get a descriptionHandler.
* @param srcDir the source directory.
+ * @return a handler.
*/
protected DescriptorHandler getDescriptorHandler(File srcDir) {
DescriptorHandler h = new DescriptorHandler(getTask(), srcDir);
@@ -378,6 +381,7 @@
*
* vendor-specific subclasses should override this method to define
* the vendor-specific locations of the EJB DTDs
+ * @param handler no used in this class.
*/
protected void registerKnownDTDs(DescriptorHandler handler) {
// none to register for generic
@@ -896,7 +900,7 @@
* Returns a Classloader object which parses the passed in generic EjbJar
classpath.
* The loader is used to dynamically load classes from javax.ejb.* and the
classes
* being added to the jar.
- *
+ * @return a classloader.
*/
protected ClassLoader getClassLoaderForBuild() {
if (classpathLoader != null) {
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
Sun Nov 12 14:29:31 2006
@@ -625,14 +625,18 @@
* descriptor DTD.
*/
public EjbcHandler() {
+ /** EJB 1.1 ID */
final String PUBLICID_EJB11 =
"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";
+ /** IPlanet ID */
final String PUBLICID_IPLANET_EJB_60 =
"-//Sun Microsystems, Inc.//DTD iAS Enterprise JavaBeans
1.0//EN";
+ /** EJB 1.1 location */
final String DEFAULT_IAS60_EJB11_DTD_LOCATION =
"ejb-jar_1_1.dtd";
+ /** IAS60 location */
final String DEFAULT_IAS60_DTD_LOCATION =
"IASEjb_jar_1_0.dtd";
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
Sun Nov 12 14:29:31 2006
@@ -142,6 +142,7 @@
/**
* Adds to the classpath used when compiling the EJB stubs and skeletons.
+ * @return the class path.
*/
public Path createClasspath() {
if (classpath == null) {
@@ -183,6 +184,7 @@
/**
* Does the work.
+ * @throws BuildException if there is a problem.
*/
public void execute() throws BuildException {
checkConfiguration();
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
Sun Nov 12 14:29:31 2006
@@ -31,7 +31,7 @@
baseClassName = baseclass.substring(0, extidx);
}
- public boolean accept (File Dir, String filename) {
+ public boolean accept(File Dir, String filename) {
if ((filename.lastIndexOf(".") != filename.lastIndexOf(".class"))
|| (filename.indexOf(baseClassName + "$") != 0)) {
return false;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Sun Nov 12 14:29:31 2006
@@ -233,12 +233,17 @@
* Sets the weblogic.StdoutSeverityLevel to use when running the JVM that
* executes ejbc; optional. Set to 16 to avoid the warnings about EJB Home
and
* Remotes being in the classpath
+ * @param jvmDebugLevel the value to use.
*/
public void setJvmDebugLevel(Integer jvmDebugLevel) {
this.jvmDebugLevel = jvmDebugLevel;
}
+ /**
+ * Get the debug level.
+ * @return the jvm debug level (may be null).
+ */
public Integer getJvmDebugLevel() {
return jvmDebugLevel;
}
@@ -303,13 +308,17 @@
* featured in weblogic 6 has, however, been deprecated in version 7. When
* using with version 7 this attribute should be set to
* "weblogic.ejbc" to avoid the deprecation warning.
+ * @param ejbcClass the name of the class to use.
*/
public void setEjbcClass(String ejbcClass) {
this.ejbcClass = ejbcClass;
}
- /** Get the ejbc compiler class */
+ /**
+ * Get the ejbc compiler class.
+ * @return the name of the ejbc compiler class.
+ */
public String getEjbcClass() {
return ejbcClass;
}
@@ -354,6 +363,7 @@
/**
* Set the value of the oldCMP scheme. This is an antonym for newCMP
* @ant.attribute ignore="true'
+ * @param oldCMP a <code>boolean</code> value.
*/
public void setOldCMP(boolean oldCMP) {
this.newCMP = !oldCMP;
@@ -370,6 +380,7 @@
* prefix. Under this scheme the name of the CMP descriptor does not match
* the name actually used in the main weblogic EJB descriptor. Also,
* descriptors which contain multiple CMP references could not be used.
+ * @param newCMP a <code>boolean</code> value.
*/
public void setNewCMP(boolean newCMP) {
this.newCMP = newCMP;
@@ -379,6 +390,7 @@
/**
* Do not EJBC the jar after it has been put together;
* optional, default false
+ * @param noEJBC a <code>boolean</code> value.
*/
public void setNoEJBC(boolean noEJBC) {
this.noEJBC = noEJBC;
@@ -646,6 +658,7 @@
/**
* Called to validate that the tool parameters have been configured.
+ * @throws BuildException if there is an error.
*/
public void validateConfigured() throws BuildException {
super.validateConfigured();
@@ -836,6 +849,7 @@
try {
genericJar.close();
} catch (IOException closeException) {
+ // empty
}
}
@@ -843,6 +857,7 @@
try {
wlJar.close();
} catch (IOException closeException) {
+ // empty
}
}
@@ -850,6 +865,7 @@
try {
newJarStream.close();
} catch (IOException closeException) {
+ // empty
}
try {
@@ -875,6 +891,8 @@
* Jar File passed to it.
*
* @param classjar java.io.File representing jar file to get classes from.
+ * @return the classloader for the jarfile.
+ * @throws IOException if there is a problem.
*/
protected ClassLoader getClassLoaderFromJar(File classjar) throws
IOException {
Path lookupPath = new Path(getTask().getProject());
@@ -890,4 +908,3 @@
return getTask().getProject().createClassLoader(lookupPath);
}
}
-
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
Sun Nov 12 14:29:31 2006
@@ -90,7 +90,7 @@
/**
* Called to validate that the tool parameters have been configured.
- *
+ * @throws BuildException if there is an error.
*/
public void validateConfigured() throws BuildException {
super.validateConfigured();
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java?view=diff&rev=474071&r1=474070&r2=474071
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Sun Nov 12 14:29:31 2006
@@ -309,7 +309,7 @@
* Decide, wether ejbdeploy should be called or not;
* optional, default true.
*
- * @param ejbdeploy
+ * @param ejbdeploy a <code>boolean</code> value.
*/
public void setEjbdeploy(boolean ejbdeploy) {
this.ejbdeploy = ejbdeploy;
@@ -361,7 +361,7 @@
}
- /* [EMAIL PROTECTED] */
+ /** [EMAIL PROTECTED] */
protected DescriptorHandler getDescriptorHandler(File srcDir) {
DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir);
// register all the DTDs, both the ones that are known and
@@ -381,6 +381,7 @@
/**
* Get a description handler.
* @param srcDir the source directory.
+ * @return the handler.
*/
protected DescriptorHandler getWebsphereDescriptorHandler(final File
srcDir) {
DescriptorHandler handler =
@@ -639,6 +640,7 @@
/**
* Called to validate that the tool parameters have been configured.
+ * @throws BuildException if there is an error.
*/
public void validateConfigured() throws BuildException {
super.validateConfigured();
@@ -676,6 +678,7 @@
* @param genericJarFile java.io.File The generic jar file.
* @param websphereJarFile java.io.File The websphere jar file to check to
* see if it needs to be rebuilt.
+ * @return true if a rebuild is required.
*/
protected boolean isRebuildRequired(File genericJarFile, File
websphereJarFile) {
boolean rebuild = false;
@@ -835,6 +838,7 @@
try {
genericJar.close();
} catch (IOException closeException) {
+ // Ignore
}
}
@@ -842,6 +846,7 @@
try {
wasJar.close();
} catch (IOException closeException) {
+ // Ignore
}
}
@@ -849,6 +854,7 @@
try {
newJarStream.close();
} catch (IOException closeException) {
+ // Ignore
}
try {
@@ -869,6 +875,8 @@
* Jar File passed to it.
*
* @param classjar java.io.File representing jar file to get classes from.
+ * @return a classloader for the jar file.
+ * @throws IOException if there is an error.
*/
protected ClassLoader getClassLoaderFromJar(File classjar) throws
IOException {
Path lookupPath = new Path(getTask().getProject());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
