geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r559937 [2/2] - in /geronimo/sandbox/j2g/plugins: org.apache.geronimo.j2g.common/src/org/apache/geronimo/j2g/common/ org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/app/ org.apache.geronimo.j2g.descriptors/src/or...
Date Thu, 26 Jul 2007 18:51:39 GMT
Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java?view=diff&rev=559937&r1=559936&r2=559937
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
Thu Jul 26 11:51:34 2007
@@ -191,9 +191,9 @@
 				ejbJarDoc = xmlReader.read(ejbJar);
 			} catch (DocumentException ex) {
 				throw new NameSolvingException(
-						"Errors occurs while reading xml descriptor "
+						"Error occured while reading xml descriptor "
 								+ jbossXml.getAbsolutePath()
-								+ ". It is possible that the migrator cannot download an xml schema or xml file has
a wrong syntax. Nested exception:"
+								+ ". It is possible that the migrator cannot download the xml schema or the xml file
has incorrect syntax. Nested exception:"
 								+ ex.getMessage());
 			}
 
@@ -219,10 +219,10 @@
 								if (refName != null
 										&& absoluteName.equals(refName.trim())) {
 									out
-											.warn(
-													"Cannot add reference to the abolute name '"
+											.warn(AbsoluteNameSolver.class.getSimpleName(), 
+													"Cannot add reference to the absolute name '"
 															+ absoluteName
-															+ "' because the reference in ejb-jar.xml descriptor to current class already
defined.",
+															+ "' because the reference in ejb-jar.xml descriptor to current class is already
defined.",
 													unit
 															.getLineNumber(position),
 													unit
@@ -241,9 +241,9 @@
 					jbossXmlDoc = xmlReader.read(jbossXml);
 				} catch (DocumentException ex) {
 					throw new NameSolvingException(
-							"Errors occurs while reading xml descriptor "
+							"Error occured while reading xml descriptor "
 									+ jbossXml.getAbsolutePath()
-									+ ". It is possible that the migrator cannot download an xml schema or xml file
has a wrong syntax. Nested exception:"
+									+ ". It is possible that the migrator cannot download the xml schema or the xml
file has incorrect syntax. Nested exception:"
 									+ ex.getMessage());
 				}
 				Enumeration paths = beansTypes.keys();
@@ -325,8 +325,7 @@
 								serializetoXML(ejbJar, ejbJarDoc);
 								return refName;
 							} else {
-								out
-										.error("Cannot find EJB definition in ejb-jar.xml for create reference to it.");
+								out.error(AbsoluteNameSolver.class.getSimpleName(), "Cannot find the EJB definition
in ejb-jar.xml to create a reference for it.");
 							}
 						}
 					}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/BlockVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/BlockVisitor.java?view=diff&rev=559937&r1=559936&r2=559937
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/BlockVisitor.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/BlockVisitor.java
Thu Jul 26 11:51:34 2007
@@ -129,7 +129,7 @@
 			try {
 				analizeLookupJNDIName(jndiName, position);
 			} catch (FatalToolException ex) {
-				out.error("Cannot check correctness of lookup method using: " + ex.getMessage(), unit.getLineNumber(position),
unit.getColumnNumber(position));
+				out.error(BlockVisitor.class.getSimpleName(), "Cannot check correctness of lookup method
using: " + ex.getMessage(), unit.getLineNumber(position), unit.getColumnNumber(position));
 			}
 		}
 		return true;
@@ -381,12 +381,12 @@
 					String solvedName = solveAbsoluteName(name, position);
 					if (solvedName != null) {
 						String localJNDIName = LOCAL_CONTEXT + solvedName;
-						out.info("The reference to current EJB was added to " + EJB_JAR_FILE + " deployment
descriptor. Using of direct name '" + name + "' was replaced by '" + localJNDIName + "' local
name.", unit.getLineNumber(position), unit.getColumnNumber(position));
+						out.info(BlockVisitor.class.getSimpleName(), "A reference to the current EJB was added
to " + EJB_JAR_FILE + " deployment descriptor. Use of direct name '" + name + "' was replaced
by '" + localJNDIName + "' local name.", unit.getLineNumber(position), unit.getColumnNumber(position));
 						lastStrLiteral.setLiteralValue(localJNDIName);
 						return;
 					} 
 					else {
-						out.warn("Using of an absolute JNDI name might be incorrect.", unit.getLineNumber(position),
unit.getColumnNumber(position));
+						out.warn(BlockVisitor.class.getSimpleName(), "Use of an absolute JNDI name might be
incorrect.", unit.getLineNumber(position), unit.getColumnNumber(position));
 						return;
 					}
 				}
@@ -395,7 +395,7 @@
 			}
 			
 		} 
-		out.warn("Lookup using might be incorrect.", unit.getLineNumber(position), unit.getColumnNumber(position));
+		out.warn(BlockVisitor.class.getSimpleName(), "Lookup use might be incorrect.", unit.getLineNumber(position),
unit.getColumnNumber(position));
 	}
 
 	/**
@@ -422,23 +422,23 @@
 							return solvedName;
 						}
 						else {
-							out.error("Cannot add reference for absolute name '" + absoluteName + "' : cannot
find " + jbossXml.getAbsolutePath() + " file.", unit.getLineNumber(position), unit.getColumnNumber(position));
+							out.error(BlockVisitor.class.getSimpleName(), "Cannot add reference for absolute name
'" + absoluteName + "' : cannot find " + jbossXml.getAbsolutePath() + " file.", unit.getLineNumber(position),
unit.getColumnNumber(position));
 						}
 					}
 					else {
-						out.error("Cannot add reference for absolute name '" + absoluteName + "' : cannot find
" + ejbJar.getAbsolutePath() + " file.", unit.getLineNumber(position), unit.getColumnNumber(position));
+						out.error(BlockVisitor.class.getSimpleName(), "Cannot add reference for absolute name
'" + absoluteName + "' : cannot find " + ejbJar.getAbsolutePath() + " file.", unit.getLineNumber(position),
unit.getColumnNumber(position));
 					}
 
 				}
 				else {
-					out.error("Cannot add reference for absolute name '" + absoluteName + "' : cannot find
" + metaInfDir.getAbsolutePath() + " directory.", unit.getLineNumber(position), unit.getColumnNumber(position));
+					out.error(BlockVisitor.class.getSimpleName(), "Cannot add reference for absolute name
'" + absoluteName + "' : cannot find " + metaInfDir.getAbsolutePath() + " directory.", unit.getLineNumber(position),
unit.getColumnNumber(position));
 					return null;
 				}
 
 			} catch (JavaModelException ex) {
 				throw new FatalToolException("Cannot access to source file.", ex);
 			} catch (NameSolvingException ex) {
-				out.error("Cannot add reference for absolute name '" + absoluteName + "' :" + ex.getMessage());
+				out.error(BlockVisitor.class.getSimpleName(), "Cannot add reference for absolute name
'" + absoluteName + "' :" + ex.getMessage());
 			}
 		}
 		return null;

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/EjbEnvJavaMigration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/EjbEnvJavaMigration.java?view=diff&rev=559937&r1=559936&r2=559937
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/EjbEnvJavaMigration.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/EjbEnvJavaMigration.java
Thu Jul 26 11:51:34 2007
@@ -49,17 +49,17 @@
 		out = Tool.getCurrent().getOutput();
 		if (source instanceof CompilationUnit) {
 			CompilationUnit unit = (CompilationUnit) source;
-			out.info("[" + PLUGIN_NAME + "] " + "Migration started: " + unit.getJavaElement().getElementName());
+			out.info(EjbEnvJavaMigration.class.getSimpleName(), "[" + PLUGIN_NAME + "] " + "Migration
started: " + unit.getJavaElement().getElementName());
 			long initialChanges = unit.getAST().modificationCount();
 			MethodsVisitor methodsVisitor = new MethodsVisitor(unit);
 			unit.accept(methodsVisitor);
 			//methodsVisitor.visit(unit); 
 			long finalChanges = unit.getAST().modificationCount();
-			out.info("[" + PLUGIN_NAME + "] " + "Migration finished: " + unit.getJavaElement().getElementName());
+			out.info(EjbEnvJavaMigration.class.getSimpleName(), "[" + PLUGIN_NAME + "] " + "Migration
finished: " + unit.getJavaElement().getElementName());
 			return initialChanges != finalChanges;
 		}
 		else {
-			out.error("[" + PLUGIN_NAME + "] " + "Wrong type of source node.");
+			out.error(EjbEnvJavaMigration.class.getSimpleName(), "[" + PLUGIN_NAME + "] " + "Wrong
type of source node.");
 		}
 		return false;
 	}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/MethodsVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/MethodsVisitor.java?view=diff&rev=559937&r1=559936&r2=559937
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/MethodsVisitor.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/MethodsVisitor.java
Thu Jul 26 11:51:34 2007
@@ -62,7 +62,7 @@
 			solver = new AbsoluteNameSolver(qualifiedName, superInterfaces, unit);
 			return true;
 		} catch (NameSolvingException e) {
-			Tool.getCurrent().getOutput().fatal("Internal error occurs. " + e.getMessage());
+			Tool.getCurrent().getOutput().fatal(MethodsVisitor.class.getSimpleName(), "Internal error
occured. " + e.getMessage());
 		}
 		return false;
 	}



Mime
View raw message