[jboss-cvs] JBossAS SVN: r108098 - projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 9 22:34:02 EDT 2010
Author: jeff.zhang
Date: 2010-09-09 22:34:01 -0400 (Thu, 09 Sep 2010)
New Revision: 108098
Modified:
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
Log:
[JBJCA-417] Use j.u.l instead of jboss logging in the generated code to avoid import jars
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2010-09-09 22:32:51 UTC (rev 108097)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2010-09-10 02:34:01 UTC (rev 108098)
@@ -61,7 +61,7 @@
out.write("/** The logger */");
writeEol(out);
writeIndent(out, indent);
- out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
+ out.write("private static Logger log = Logger.getLogger(\"" + getClassName(def) + "\");");
writeEol(out);
writeEol(out);
@@ -115,7 +115,7 @@
out.write("import javax.resource.spi.ResourceAdapter;");
writeEol(out);
writeEol(out);
- out.write("import org.jboss.logging.Logger;");
+ out.write("import java.util.logging.Logger;");
writeEol(out);
writeEol(out);
}
@@ -174,7 +174,7 @@
out.write("public void validate() throws InvalidPropertyException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call validate\");");
+ out.write("log.info(\"call validate\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
@@ -209,7 +209,7 @@
out.write("public ResourceAdapter getResourceAdapter()");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getResourceAdapter\");");
+ out.write("log.info(\"call getResourceAdapter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return ra;");
@@ -236,7 +236,7 @@
out.write("public void setResourceAdapter(ResourceAdapter ra)");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call setResourceAdapter\");");
+ out.write("log.info(\"call setResourceAdapter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("this.ra = ra;");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java 2010-09-09 22:32:51 UTC (rev 108097)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java 2010-09-10 02:34:01 UTC (rev 108098)
@@ -54,7 +54,7 @@
out.write("/** The logger */");
writeEol(out);
writeIndent(out, indent);
- out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
+ out.write("private static Logger log = Logger.getLogger(\"" + getClassName(def) + "\");");
writeEol(out);
writeEol(out);
@@ -76,7 +76,7 @@
out.write("package " + def.getRaPackage() + ";");
writeEol(out);
writeEol(out);
- out.write("import org.jboss.logging.Logger;");
+ out.write("import java.util.logging.Logger;");
writeEol(out);
writeEol(out);
}
@@ -143,7 +143,7 @@
}
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call " + method.getMethodName() + "\");");
+ out.write("log.info(\"call " + method.getMethodName() + "\");");
writeEol(out);
if (!method.getReturnType().equals("void"))
{
@@ -172,7 +172,7 @@
out.write("public void callMe()");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call callMe\");");
+ out.write("log.info(\"call callMe\");");
writeRightCurlyBracket(out, indent);
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java 2010-09-09 22:32:51 UTC (rev 108097)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java 2010-09-10 02:34:01 UTC (rev 108098)
@@ -53,7 +53,7 @@
out.write("/** The logger */");
writeEol(out);
writeIndent(out, indent);
- out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
+ out.write("private static Logger log = Logger.getLogger(\"" + getClassName(def) + "\");");
writeEol(out);
writeEol(out);
@@ -102,7 +102,7 @@
out.write("import javax.transaction.xa.XAResource;");
writeEol(out);
writeEol(out);
- out.write("import org.jboss.logging.Logger;");
+ out.write("import java.util.logging.Logger;");
writeEol(out);
writeEol(out);
}
@@ -162,7 +162,7 @@
out.write("ConnectionRequestInfo cxRequestInfo) throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getConnection\");");
+ out.write("log.info(\"call getConnection\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -195,7 +195,7 @@
out.write("public void associateConnection(Object connection) throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call associateConnection\");");
+ out.write("log.info(\"call associateConnection\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
}
@@ -230,7 +230,7 @@
writeEol(out);
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call cleanup\");");
+ out.write("log.info(\"call cleanup\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
@@ -254,7 +254,7 @@
out.write("public void destroy() throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call destroy\");");
+ out.write("log.info(\"call destroy\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
}
@@ -288,7 +288,7 @@
out.write("public void addConnectionEventListener(ConnectionEventListener listener)");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call addConnectionEventListener\");");
+ out.write("log.info(\"call addConnectionEventListener\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
@@ -312,7 +312,7 @@
out.write("public void removeConnectionEventListener(ConnectionEventListener listener)");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call removeConnectionEventListener\");");
+ out.write("log.info(\"call removeConnectionEventListener\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
@@ -349,7 +349,7 @@
out.write("public PrintWriter getLogWriter() throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getLogWriter\");");
+ out.write("log.info(\"call getLogWriter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -379,7 +379,7 @@
out.write("public void setLogWriter(PrintWriter out) throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call setLogWriter\");");
+ out.write("log.info(\"call setLogWriter\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
}
@@ -416,7 +416,7 @@
out.write("public LocalTransaction getLocalTransaction() throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getLocalTransaction\");");
+ out.write("log.info(\"call getLocalTransaction\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -446,7 +446,7 @@
out.write("public XAResource getXAResource() throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getXAResource\");");
+ out.write("log.info(\"call getXAResource\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -486,7 +486,7 @@
out.write("public ManagedConnectionMetaData getMetaData() throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getMetaData\");");
+ out.write("log.info(\"call getMetaData\");");
writeEol(out);
writeIndent(out, indent + 1);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java 2010-09-09 22:32:51 UTC (rev 108097)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java 2010-09-10 02:34:01 UTC (rev 108098)
@@ -92,7 +92,7 @@
out.write("/** The logger */");
writeEol(out);
writeIndent(out, indent);
- out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
+ out.write("private static Logger log = Logger.getLogger(\"" + getClassName(def) + "\");");
writeEol(out);
writeEol(out);
if (def.isImplRaAssociation())
@@ -183,7 +183,7 @@
out.write("import javax.security.auth.Subject;");
writeEol(out);
writeEol(out);
- out.write("import org.jboss.logging.Logger;");
+ out.write("import java.util.logging.Logger;");
writeEol(out);
writeEol(out);
}
@@ -251,7 +251,7 @@
writeIfRaNull(out, indent);
}
writeIndent(out, indent + 1);
- out.write("log.debug(\"call createConnectionFactory\");");
+ out.write("log.info(\"call createConnectionFactory\");");
writeEol(out);
writeIndent(out, indent + 1);
if (def.isUseCciConnection())
@@ -363,7 +363,7 @@
writeIfRaNull(out, indent);
}
writeIndent(out, indent + 1);
- out.write("log.debug(\"call createManagedConnection\");");
+ out.write("log.info(\"call createManagedConnection\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -410,7 +410,7 @@
writeIfRaNull(out, indent);
}
writeIndent(out, indent + 1);
- out.write("log.debug(\"call matchManagedConnections\");");
+ out.write("log.info(\"call matchManagedConnections\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -449,7 +449,7 @@
out.write("public PrintWriter getLogWriter() throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getLogWriter\");");
+ out.write("log.info(\"call getLogWriter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return logwriter;");
@@ -479,7 +479,7 @@
out.write("public void setLogWriter(PrintWriter out) throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call setLogWriter\");");
+ out.write("log.info(\"call setLogWriter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("logwriter = out;");
@@ -516,7 +516,7 @@
out.write("public ResourceAdapter getResourceAdapter()");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getResourceAdapter\");");
+ out.write("log.info(\"call getResourceAdapter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return ra;");
@@ -543,7 +543,7 @@
out.write("public void setResourceAdapter(ResourceAdapter ra)");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call setResourceAdapter\");");
+ out.write("log.info(\"call setResourceAdapter\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("this.ra = ra;");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java 2010-09-09 22:32:51 UTC (rev 108097)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java 2010-09-10 02:34:01 UTC (rev 108098)
@@ -109,7 +109,7 @@
writeEol(out);
writeIndent(out, indent);
- out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
+ out.write("private static Logger log = Logger.getLogger(\"" + getClassName(def) + "\");");
writeEol(out);
writeEol(out);
@@ -246,7 +246,7 @@
out.write("import javax.transaction.xa.XAResource;");
writeEol(out);
writeEol(out);
- out.write("import org.jboss.logging.Logger;");
+ out.write("import java.util.logging.Logger;");
writeEol(out);
writeEol(out);
}
@@ -289,7 +289,7 @@
out.write("throws ResourceException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call getXAResources\");");
+ out.write("log.info(\"call getXAResources\");");
writeEol(out);
writeIndent(out, indent + 1);
out.write("return null;");
@@ -332,7 +332,7 @@
out.write("throws ResourceAdapterInternalException");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call start\");");
+ out.write("log.info(\"call start\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
@@ -353,7 +353,7 @@
out.write("public void stop()");
writeLeftCurlyBracket(out, indent);
writeIndent(out, indent + 1);
- out.write("log.debug(\"call stop\");");
+ out.write("log.info(\"call stop\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
}
@@ -412,7 +412,7 @@
}
writeIndent(out, indent + 1);
- out.write("log.debug(\"call endpointActivation\");");
+ out.write("log.info(\"call endpointActivation\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
@@ -457,7 +457,7 @@
writeEol(out);
}
writeIndent(out, indent + 1);
- out.write("log.debug(\"call endpointDeactivation\");");
+ out.write("log.info(\"call endpointDeactivation\");");
writeRightCurlyBracket(out, indent);
writeEol(out);
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2010-09-09 22:32:51 UTC (rev 108097)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2010-09-10 02:34:01 UTC (rev 108098)
@@ -53,7 +53,7 @@
out.write("public class " + getClassName(def));
writeLeftCurlyBracket(out, 0);
writeIndent(out, indent);
- out.write("private static Logger log = Logger.getLogger(" + getClassName(def) + ".class);");
+ out.write("private static Logger log = Logger.getLogger(\"" + getClassName(def) + "\");");
writeEol(out);
writeEol(out);
writeIndent(out, indent);
@@ -88,7 +88,9 @@
writeEol(out);
out.write("import java.util.UUID;");
writeEol(out);
+ out.write("import java.util.logging.Logger;");
writeEol(out);
+ writeEol(out);
out.write("import javax.annotation.Resource;");
writeEol(out);
writeEol(out);
@@ -96,9 +98,7 @@
writeEol(out);
out.write("import org.jboss.arquillian.junit.Arquillian;");
writeEol(out);
- out.write("import org.jboss.logging.Logger;");
writeEol(out);
- writeEol(out);
out.write("import org.jboss.shrinkwrap.api.ShrinkWrap;");
writeEol(out);
out.write("import org.jboss.shrinkwrap.api.spec.JavaArchive;");
More information about the jboss-cvs-commits
mailing list