[JBoss-dev] RE: [ jboss-Patches-475080 ] Remove dead imports from jboss-all
I tried to do this around noon on Sunday and cvs head was not compiling... I didn't have too much time to look into it, so I'll give this another shot later on this week. -- Guillaume -Original Message- From: Guillaume Boissiere [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 07, 2002 11:39 AM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: RE: [ jboss-Patches-475080 ] Remove dead imports from jboss-all Hi Jason, Sounds good to me, it's one of those things, it never feels like it's a good time to do because it touches so much code. So let me do this: I'll run my script, test that it works well and does not break things and commit the changes to CVS HEAD this week-end unless someone complains. So if this is a bad time for anyone, time to speak up!! -- Guillaume -Original Message- From: nobody [mailto:[EMAIL PROTECTED]]On Behalf Of [EMAIL PROTECTED] Sent: Wednesday, February 06, 2002 7:56 PM To: [EMAIL PROTECTED] Subject: [ jboss-Patches-475080 ] Remove dead imports from jboss-all Patches item #475080, was opened at 2001-10-25 15:05 You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=376687aid=475080 group_id=22866 Category: JBossServer Group: v3.0 Rabbit Hole (unstable) Status: Open Resolution: None Priority: 5 Submitted By: Guillaume Boissiere (boissier) Assigned to: Nobody/Anonymous (nobody) Summary: Remove dead imports from jboss-all Initial Comment: Would you believe that there are 2065 lines of import x.y.z; where the class is imported but not used? I put together a script that parses through the source code (in jboss-all) and removes all those unnecessary import lines. The result: a performance improvement of almost 10% in the time it takes to compile the whole project... Here is the long patch attached that removes all these extra lines. Patch is lightly tested and after applying it, the project compiles just fine. Enjoy! -- Guillaume PS: I noticed a couple files have CR+CR+LF at the end of each line instead of the more standard CR+LF, CR or LF... I had trouble with those (ex: EJBAdaptorBean) so they are not included here. -- Comment By: Jason Dillon (user57) Date: 2002-02-06 16:55 Message: Logged In: YES user_id=15045 How about submitting the script which does this. Things have changed a bit since this was posted. I think it might be more work to apply the patch (and deal with the conflicts) than to just run the script again. If this is not an issue any more let me know so I can close this. ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] RE: [ jboss-Patches-475080 ] Remove dead imports from jboss-all
Hi Jason, Sounds good to me, it's one of those things, it never feels like it's a good time to do because it touches so much code. So let me do this: I'll run my script, test that it works well and does not break things and commit the changes to CVS HEAD this week-end unless someone complains. So if this is a bad time for anyone, time to speak up!! -- Guillaume -Original Message- From: nobody [mailto:[EMAIL PROTECTED]]On Behalf Of [EMAIL PROTECTED] Sent: Wednesday, February 06, 2002 7:56 PM To: [EMAIL PROTECTED] Subject: [ jboss-Patches-475080 ] Remove dead imports from jboss-all Patches item #475080, was opened at 2001-10-25 15:05 You can respond by visiting: http://sourceforge.net/tracker/?func=detailatid=376687aid=475080 group_id=22866 Category: JBossServer Group: v3.0 Rabbit Hole (unstable) Status: Open Resolution: None Priority: 5 Submitted By: Guillaume Boissiere (boissier) Assigned to: Nobody/Anonymous (nobody) Summary: Remove dead imports from jboss-all Initial Comment: Would you believe that there are 2065 lines of import x.y.z; where the class is imported but not used? I put together a script that parses through the source code (in jboss-all) and removes all those unnecessary import lines. The result: a performance improvement of almost 10% in the time it takes to compile the whole project... Here is the long patch attached that removes all these extra lines. Patch is lightly tested and after applying it, the project compiles just fine. Enjoy! -- Guillaume PS: I noticed a couple files have CR+CR+LF at the end of each line instead of the more standard CR+LF, CR or LF... I had trouble with those (ex: EJBAdaptorBean) so they are not included here. -- Comment By: Jason Dillon (user57) Date: 2002-02-06 16:55 Message: Logged In: YES user_id=15045 How about submitting the script which does this. Things have changed a bit since this was posted. I think it might be more work to apply the patch (and deal with the conflicts) than to just run the script again. If this is not an issue any more let me know so I can close this. ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] RE: [ jboss-Patches-475080 ] Remove dead imports from jboss-all
Yes, it does improve significantly the build time. When I put together the patch back in November, the speedup was close to 10% if I remember correctly. Cool. I will rerun the script this week-end and commit it. Cheers, -- Guillaume -Original Message- From: Adam Heath [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 07, 2002 5:20 PM To: Jason Dillon Cc: [EMAIL PROTECTED]; JBoss Development Subject: Re: [JBoss-dev] RE: [ jboss-Patches-475080 ] Remove dead imports from jboss-all On Thu, 7 Feb 2002, Jason Dillon wrote: If it makes the build faster then do it. Removing imports won't change any logic. Ooh. I never even considered it'd make the build faster. This probably also speeds up javadoc as well. ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] JBoss build faied
Yes, I added those lines and kept them commented because there are some new classes in 1.4, like java.sql.SavePoint, so it would break uncommented for 1.3. The only way to get around it would be to use import java.sql.*; instead but it's not usually recommended, so I left it that way. -- Guillaume -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Andreas Schaefer Sent: Friday, December 07, 2001 9:05 PM To: Jason Dillon; marc fleury Cc: [EMAIL PROTECTED] Subject: Re: [JBoss-dev] JBoss build faied I hate W2K, really. Or at least the implementation of JDK on W2K. I am not able to run two different JDKs on the same W2K box, long live Unix. I removed JDK1.4 and not compilation worked fine. The reason why I installed JDK1.4 is that someone reported strange runtime errors with JMX on JSR-77. Andy - Original Message - From: Jason Dillon [EMAIL PROTECTED] To: Andreas Schaefer [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Friday, December 07, 2001 5:45 PM Subject: Re: [JBoss-dev] JBoss build faied ConnectionInPool.java and StatementInPool.java has some commented lines which metion to uncomment them for 1.4. What is 1.4 requires these? Any reason why they need to be commented? Will this break uncommented for 1.3? --jason ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/deployment/scope Scope.java
User: boissier Date: 01/12/05 14:29:59 Modified:src/main/org/jboss/deployment/scope Scope.java Log: Added some Javadoc Revision ChangesPath 1.6 +79 -33jboss/src/main/org/jboss/deployment/scope/Scope.java Index: Scope.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/scope/Scope.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Scope.java2001/09/11 18:34:59 1.5 +++ Scope.java2001/12/05 22:29:59 1.6 @@ -7,10 +7,12 @@ package org.jboss.deployment.scope; -import java.util.Set; -import java.util.Map; -import java.util.Iterator; import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; import org.jboss.logging.Logger; @@ -18,36 +20,46 @@ * Scope is a manager/mediator that connects several ScopedURLClassLoaders * with each other and computes their dependencies. The locks used in the scope * implementation are quite coarse-grained, maybe thread-unfriendly, but the - * rationale is that classloading a) happens not too often (hopefully) in the - * lifecycle of an application b) will dispatch only in special cases (where applications depliberately - * share classes) to this scope class and c) is optimized by caching the locations. + * rationale is that classloading: + * a) happens not too often (hopefully) in the lifecycle of an application + * b) will dispatch only in special cases (where applications depliberately + * share classes) to this scope class + * c) is optimized by caching the locations. * @author cgjung - * @version 0.8 + * @version $Revision: 1.6 $ */ public class Scope { /** keeps a map of class loaders that participate in this scope */ -final protected Map classLoaders=new java.util.HashMap(); +final protected Map classLoaders=new HashMap(); /** keeps a hashtable of dependencies between the classLoaders */ -final protected Map dependencies=new java.util.HashMap(); +final protected Map dependencies=new HashMap(); /** keeps a hashtable of class appearances */ -final protected Map classLocations=new java.util.HashMap(); +final protected Map classLocations=new HashMap(); /** keeps a hashtable of resource appearances */ -final protected Map resourceLocations=new java.util.HashMap(); +final protected Map resourceLocations=new HashMap(); /** keeps a reference to a logger which which to interact */ final protected Logger log; -/** Creates new Scope */ +/** + * Creates new Scope + * @param log - The logger this new scope will interact with. + */ public Scope(Logger log) { this.log=log; } -/** registers a classloader in this scope */ +/** + * Registers a classloader in this scope. + * + * @param loader - The classloader to register. + * @return The newly registered classloader. + */ public ScopedURLClassLoader registerClassLoader(ScopedURLClassLoader loader) { // must synchronize not to collide with deregistrations and // dependency logging @@ -55,11 +67,14 @@ return (ScopedURLClassLoader) classLoaders.put(loader.deployment.getLocalUrl(),loader); } } - -/** deRegisters a classloader in this scope - * removes all cached data related to this classloader - */ +/** + * Deregisters a classloader in this scope. + * Removes all cached data related to this classloader. + * + * @param loader - The classloader to deregister. + * @return The newly deregistered classloader. + */ public ScopedURLClassLoader deRegisterClassLoader(ScopedURLClassLoader loader) { // synchronized not to collide with registrations // and dependency logging @@ -75,9 +90,13 @@ } } -/** helper method that will clear all entries from a map - * with a dedicated target value. - */ +/** + * Helper method that will clear all entries from a map + * with a dedicated target value. + * + * @param map - The map we want to clear entries from. + * @param value - The object we want to remove from that map. + */ protected void clearByValue(Map map, Object value) { Iterator values=map.values().iterator(); while(values.hasNext()) { @@ -87,20 +106,29 @@ } } -/** returns the classLoaders that a particular classLoader is - * dependent on. Should be called after locking classLoaders - */ +
[JBoss-dev] CVS update: jboss/src/main/org/jboss Shutdown.java Version.java
User: boissier Date: 01/12/05 15:45:09 Modified:src/main/org/jboss Shutdown.java Version.java Log: Added some Javadoc Revision ChangesPath 1.6 +7 -4 jboss/src/main/org/jboss/Shutdown.java Index: Shutdown.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Shutdown.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Shutdown.java 2001/10/31 13:20:35 1.5 +++ Shutdown.java 2001/12/05 23:45:09 1.6 @@ -23,7 +23,7 @@ * * @author a href=mailto:[EMAIL PROTECTED];Dewayne McNair/a * @author a href=mailto:[EMAIL PROTECTED];Jason Dillon/a - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class Shutdown { @@ -33,9 +33,8 @@ /** * Parse the command line and shutdown the remote server. * -* @param argv Comamne line arguments. -* -* @throws Exception Invalid port number. +* @param argv Command line arguments. +* @throws Exception Invalid port number. */ public static void main(final String argv[]) throws Exception { @@ -56,6 +55,10 @@ /** * Connect to the JBoss servers HTML JMX adapter and invoke the * shutdown service. +* +* @param host The hostname of the JMX server. +* @param port The port of the JMX server. +* */ public static void shutdown(final String host, final int port) { try { 1.4 +4 -3 jboss/src/main/org/jboss/Version.java Index: Version.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Version.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Version.java 2001/09/03 20:02:03 1.3 +++ Version.java 2001/12/05 23:45:09 1.4 @@ -17,7 +17,7 @@ * Provides access to JBoss version (and build) properties. * * @author a href=mailto:[EMAIL PROTECTED];Jason Dillon/a - * @version$Revision: 1.3 $ + * @version$Revision: 1.4 $ */ public final class Version { @@ -74,8 +74,8 @@ /** * Returns the value for the given property name. * -* @param name The name of the property. -* @return The property value or null if the property is not set. +* @param name - The name of the property. +* @returnThe property value or null if the property is not set. */ public String getProperty(final String name) { @@ -172,6 +172,7 @@ /** * Returns a property value as an int. * +* @paramname - The name of the property. * @return The property value, or -1 if there was a problem converting * it to an int. */ ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/util/timeout TimeoutFactory.java
User: boissier Date: 01/12/04 10:05:25 Modified:src/main/org/jboss/util/timeout TimeoutFactory.java Log: * Replace the method private assert(boolean expr) by private assertExpr(boolean expr) to avoid conflicts with the new assert keyword in JDK 1.4. Revision ChangesPath 1.10 +39 -39jboss/src/main/org/jboss/util/timeout/TimeoutFactory.java Index: TimeoutFactory.java === RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/util/timeout/TimeoutFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TimeoutFactory.java 2001/11/26 03:19:46 1.9 +++ TimeoutFactory.java 2001/12/04 18:05:25 1.10 @@ -22,7 +22,7 @@ * allocating anything on the heap. * * @author a href=[EMAIL PROTECTED]Ole Husgaard/a - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public class TimeoutFactory { @@ -246,7 +246,7 @@ /** * Debugging helper. */ - private void assert(boolean expr) + private void assertExpr(boolean expr) { if (!expr) { @@ -262,20 +262,20 @@ * Check invariants of the queue. */ private void checkTree() { -assert(size = 0); -assert(size q.length); -assert(q[0] == null); +assertExpr(size = 0); +assertExpr(size q.length); +assertExpr(q[0] == null); if (size 0) { - assert(q[1] != null); - assert(q[1].index == 1); + assertExpr(q[1] != null); + assertExpr(q[1].index == 1); for (int i = 2; i = size; ++i) { -assert(q[i] != null); -assert(q[i].index == i); -assert(q[i 1].time = q[i].time); // parent fires first +assertExpr(q[i] != null); +assertExpr(q[i].index == i); +assertExpr(q[i 1].time = q[i].time); // parent fires first } for (int i = size+1; i q.length; ++i) -assert(q[i] == null); +assertExpr(q[i] == null); } } @@ -286,7 +286,7 @@ TimeoutImpl to = freeList; while (to != null) { - assert(to.index == TimeoutImpl.DONE); + assertExpr(to.index == TimeoutImpl.DONE); to = to.nextFree; } } @@ -295,14 +295,14 @@ * Swap two nodes in the tree. */ private void swap(int a, int b) { - // INV: assert(a 0); - // INV: assert(a = size); - // INV: assert(b 0); - // INV: assert(b = size); - // INV: assert(q[a] != null); - // INV: assert(q[b] != null); - // INV: assert(q[a].index == a); - // INV: assert(q[b].index == b); + // INV: assertExpr(a 0); + // INV: assertExpr(a = size); + // INV: assertExpr(b 0); + // INV: assertExpr(b = size); + // INV: assertExpr(q[a] != null); + // INV: assertExpr(q[b] != null); + // INV: assertExpr(q[a].index == a); + // INV: assertExpr(q[b].index == b); TimeoutImpl temp = q[a]; q[a] = q[b]; q[a].index = a; @@ -317,9 +317,9 @@ * @return True iff the tree was modified. */ private boolean normalizeUp(int index) { -// INV: assert(index 0); -// INV: assert(index = size); -// INV: assert(q[index] != null); +// INV: assertExpr(index 0); +// INV: assertExpr(index = size); +// INV: assertExpr(q[index] != null); if (index == 1) return false; // at root @@ -329,7 +329,7 @@ int p = index 1; while (q[p].time t) { - // INV: assert(q[index].time == t); + // INV: assertExpr(q[index].time == t); swap(p, index); ret = true; @@ -348,11 +348,11 @@ * @return The removed node. */ private TimeoutImpl removeNode(int index) { -// INV: assert(index 0); -// INV: assert(index = size); +// INV: assertExpr(index 0); +// INV: assertExpr(index = size); TimeoutImpl res = q[index]; -// INV: assert(res != null); -// INV: assert(res.index == index); +// INV: assertExpr(res != null); +// INV: assertExpr(res.index == index); if (index == size) { --size; @@ -363,7 +363,7 @@ swap(index, size); // Exchange removed node with last leaf node --size; -// INV: assert(res.index == size + 1); +// INV: assertExpr(res.index == size + 1); q[res.index] = null; if (normalizeUp(index)) @@ -373,17 +373,17 @@ int c = index 1; while (c = size) { - // INV: assert(q[index].time == t); + // INV: assertExpr(q[index].time == t); TimeoutImpl l = q[c]; - // INV: assert(l != null); - // INV: assert(l.index == c); + // INV: assertExpr(l != null); + // INV: assertExpr(l.index == c); if (c+1 = size) { // two
[JBoss-dev] CVS update: jbosstest/src/main/org/jboss/test/bank/interfaces BankException.java
User: boissier Date: 01/12/04 10:36:47 Modified:src/main/org/jboss/test/bank/interfaces BankException.java Log: * In JDK 1.4, the Throwable interface has a new method: public Throwable getCause() This causes a conflict with the file BankException.java. This patch fixes that. Revision ChangesPath 1.3 +7 -4 jbosstest/src/main/org/jboss/test/bank/interfaces/BankException.java Index: BankException.java === RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/bank/interfaces/BankException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BankException.java2001/01/07 23:14:35 1.2 +++ BankException.java2001/12/04 18:36:47 1.3 @@ -10,8 +10,8 @@ /** * * @see related - * @author $Author: peter $ - * @version $Revision: 1.2 $ + * @author $Author: boissier $ + * @version $Revision: 1.3 $ */ public class BankException extends Exception @@ -37,16 +37,22 @@ } // Public - public Exception getCause() { return cause; } + public Throwable getCause() { return cause; } public String toString() { return super.toString()+, Cause:+cause; } } /* - * $Id: BankException.java,v 1.2 2001/01/07 23:14:35 peter Exp $ + * $Id: BankException.java,v 1.3 2001/12/04 18:36:47 boissier Exp $ * Currently locked by:$Locker: $ * Revision: * $Log: BankException.java,v $ + * Revision 1.3 2001/12/04 18:36:47 boissier + * * In JDK 1.4, the Throwable interface has a new method: + * public Throwable getCause() + * This causes a conflict with the file BankException.java. + * This patch fixes that. + * * Revision 1.2 2001/01/07 23:14:35 peter * Trying to get JAAS to work within test suite. * ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbosscx/src/main/org/jboss/resource/adapter/jdbc/local ConnectionInPool.java PreparedStatementInPool.java ResultSetInPool.java StatementInPool.java
User: boissier Date: 01/12/04 11:01:14 Modified:src/main/org/jboss/resource/adapter/jdbc/local ConnectionInPool.java PreparedStatementInPool.java ResultSetInPool.java StatementInPool.java Log: * In JDK 1.4, the interfaces java.sql.Statement, java.sql.PreparedStatement, java.sql.Connection and java.sql.ResultSet have new methods. The patch below adds code to classes implementing those interfaces to make the project compile. The code is kept commented out so that: 1. it works with JDK 1.3.* 2. users using JDK 1.4 can easily figure out what to uncomment to make it work without having to go through the whole debugging process. Revision ChangesPath 1.4 +51 -0 jbosscx/src/main/org/jboss/resource/adapter/jdbc/local/ConnectionInPool.java Index: ConnectionInPool.java === RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/adapter/jdbc/local/ConnectionInPool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ConnectionInPool.java 2001/11/23 05:54:55 1.3 +++ ConnectionInPool.java 2001/12/04 19:01:13 1.4 @@ -3,11 +3,18 @@ */ package org.jboss.resource.adapter.jdbc.local; +// Uncomment this one line to compile JBoss with JDK 1.4 +//import java.lang.UnsupportedOperationException; + import java.sql.CallableStatement; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; + +// Uncomment this one line to compile JBoss with JDK 1.4 +//import java.sql.Savepoint; + import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.Statement; @@ -898,4 +905,48 @@ } } } + + + // Note: The following methods have been added to make JBoss compile with JDK 1.4. + // These methods will need to be implemented later on. + // Uncomment those 12 methods to compile JBoss with JDK 1.4. + /* + public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { + throw new UnsupportedOperationException(Method createStatement() not yet implemented.); + } + public int getHoldability() throws SQLException { + throw new UnsupportedOperationException(Method getHoldability() not yet implemented.); + } + public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { + throw new UnsupportedOperationException(Method prepareCall() not yet implemented.); + } + public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException { + throw new UnsupportedOperationException(Method prepareStatement() not yet implemented.); + } + public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { + throw new UnsupportedOperationException(Method prepareStatement() not yet implemented.); + } + public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException { + throw new UnsupportedOperationException(Method prepareStatement() not yet implemented.); + } + public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException { + throw new UnsupportedOperationException(Method prepareStatement() not yet implemented.); + } + public void releaseSavepoint(Savepoint savepoint) throws SQLException { + throw new UnsupportedOperationException(Method releaseSavepoint() not yet implemented.); + } + public void rollback(Savepoint savepoint) throws SQLException { + throw new UnsupportedOperationException(Method rollback() not yet implemented.); + } + public void setHoldability(int holdability) throws SQLException { + throw new UnsupportedOperationException(Method setHoldability() not yet implemented.); + } + public Savepoint setSavepoint() throws SQLException { + throw new UnsupportedOperationException(Method setSavepoint() not yet implemented.); + } + public Savepoint setSavepoint(String name) throws SQLException { + throw new UnsupportedOperationException(Method setSavepoint() not yet implemented.); + } + */ + } 1.2 +19 -0 jbosscx/src/main/org/jboss/resource/adapter/jdbc/local/PreparedStatementInPool.java Index: PreparedStatementInPool.java === RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/adapter/jdbc/local/PreparedStatementInPool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2
[JBoss-dev] CVS update: jbosstest/src/main/org/jboss/test/util TestConnection.java
User: boissier Date: 01/12/04 11:08:59 Modified:src/main/org/jboss/test/util TestConnection.java Log: * In JDK 1.4, the interface java.sql.Connection has new 12 methods. The patch below adds those methods to TestConnection.java to make the project compile, but keep them commented out by default to not break anything with JDK 1.3. Revision ChangesPath 1.2 +46 -1 jbosstest/src/main/org/jboss/test/util/TestConnection.java Index: TestConnection.java === RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/util/TestConnection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestConnection.java 2001/10/21 22:03:48 1.1 +++ TestConnection.java 2001/12/04 19:08:59 1.2 @@ -13,7 +13,7 @@ * Database connection for unit tests. Currently nothing is implemented except * close, isClosed, isAutoCommit, setAutoCommit(true), and rollback. Everything * else throws a SQLException. - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @author a href=mailto:[EMAIL PROTECTED];Aaron Mulder/a */ public class TestConnection implements Connection { @@ -118,4 +118,49 @@ public void setTypeMap(Map parm1) throws java.sql.SQLException { throw new SQLException(TEST_DB); } + + + // Note: The following methods have been added to make the testsuite compile + // with JDK 1.4. + // These methods will need to be implemented later on. + // Uncomment those 12 methods to compile JBoss with JDK 1.4. + /* + public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { +throw new SQLException(TEST_DB); + } + public int getHoldability() throws SQLException { +throw new SQLException(TEST_DB); + } + public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { +throw new SQLException(TEST_DB); + } + public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException { +throw new SQLException(TEST_DB); + } + public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { +throw new SQLException(TEST_DB); + } + public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException { +throw new SQLException(TEST_DB); + } + public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException { +throw new SQLException(TEST_DB); + } + public void releaseSavepoint(Savepoint savepoint) throws SQLException { +throw new SQLException(TEST_DB); + } + public void rollback(Savepoint savepoint) throws SQLException { +throw new SQLException(TEST_DB); + } + public void setHoldability(int holdability) throws SQLException { +throw new SQLException(TEST_DB); + } + public Savepoint setSavepoint() throws SQLException { +throw new SQLException(TEST_DB); + } + public Savepoint setSavepoint(String name) throws SQLException { +throw new SQLException(TEST_DB); + } + */ + } ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbossmx/src/main/org/jbossmx/cluster/watchdog/util MirroringService.java
User: boissier Date: 01/12/04 14:34:02 Modified:src/main/org/jbossmx/cluster/watchdog/util MirroringService.java Log: * Remove some unnecessary String creations, because String objects are immutable, so using new String(x) always results in extra overhead. Revision ChangesPath 1.5 +1 -2 jbossmx/src/main/org/jbossmx/cluster/watchdog/util/MirroringService.java Index: MirroringService.java === RCS file: /cvsroot/jboss/jbossmx/src/main/org/jbossmx/cluster/watchdog/util/MirroringService.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- MirroringService.java 2001/11/26 03:24:52 1.4 +++ MirroringService.java 2001/12/04 22:34:02 1.5 @@ -102,8 +102,7 @@ m_remoteMBeanServer.addNotificationListener(m_sDelegateObjectName, m_RMINotificationListener, null, null); -m_mbeanServer.addNotificationListener(m_sDelegateObjectName, this, null, - new String(local)); +m_mbeanServer.addNotificationListener(m_sDelegateObjectName, this, null, local); loadMirroredMBeans(); ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbossmx/src/main/org/jbossmx/cluster/watchdog/mbean Watchdog.java
User: boissier Date: 01/12/04 14:34:02 Modified:src/main/org/jbossmx/cluster/watchdog/mbean Watchdog.java Log: * Remove some unnecessary String creations, because String objects are immutable, so using new String(x) always results in extra overhead. Revision ChangesPath 1.5 +1 -1 jbossmx/src/main/org/jbossmx/cluster/watchdog/mbean/Watchdog.java Index: Watchdog.java === RCS file: /cvsroot/jboss/jbossmx/src/main/org/jbossmx/cluster/watchdog/mbean/Watchdog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Watchdog.java 2001/11/26 03:24:52 1.4 +++ Watchdog.java 2001/12/04 22:34:01 1.5 @@ -522,7 +522,7 @@ try { m_server.addNotificationListener(new ObjectName(com.sun.management.jmx.ServiceName.DELEGATE), -this, null, new String(local)); +this, null, local); } catch (InstanceNotFoundException infe) {} catch (MalformedObjectNameException mone) {} ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] Question about the java.security.Identity warnings
This patch removes all the annoying compile warnings about java.security.Identity being deprecated since EJB 1.1 but the patch is so simple that it probably breaks something otherwise someone would have done this a long time ago... ... or not? Is Rabbit-Hole supposed to support EJB 1.0? Can someone shade some light on this? Thanks, -- Guillaume diff -urN jboss-all/j2ee/src/main/javax/ejb/EJBContext.java jboss-all-new/j2ee/src/main/javax/ejb/EJBContext.java --- jboss-all/j2ee/src/main/javax/ejb/EJBContext.java Tue Jun 12 16:47:48 2001 +++ jboss-all-new/j2ee/src/main/javax/ejb/EJBContext.java Wed Dec 5 00:40:43 2001 @@ -28,7 +28,7 @@ * * @return The Identity object that identifies the caller. */ - public Identity getCallerIdentity(); + //public Identity getCallerIdentity(); /** * Obtains the java.security.Principal of the caller. @@ -63,7 +63,7 @@ * * @return The environment properties for the enterprise bean. */ - public Properties getEnvironment(); + //public Properties getEnvironment(); /** * Test if the transaction has been marked for rollback only. An enterprise bean instance can use @@ -109,7 +109,7 @@ * @param role - The java.security.Identity of the role to be tested. * @return True if the caller has the specified role. */ - public boolean isCallerInRole(Identity role); + //public boolean isCallerInRole(Identity role); /** * Mark the current transaction for rollback. The transaction will become permanently marked for rollback. diff -urN jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java jboss-all-new/server/src/main/org/jboss/ejb/EnterpriseContext.java --- jboss-all/server/src/main/org/jboss/ejb/EnterpriseContext.java Sun Nov 25 22:12:24 2001 +++ jboss-all-new/server/src/main/org/jboss/ejb/EnterpriseContext.java Wed Dec 5 00:39:03 2001 @@ -7,7 +7,7 @@ package org.jboss.ejb; import java.rmi.RemoteException; -import java.security.Identity; +//import java.security.Identity; import java.security.Principal; import java.util.Properties; import java.util.HashSet; @@ -211,10 +211,10 @@ /** * @deprecated */ - public Identity getCallerIdentity() - - throw new EJBException(Deprecated); - } + //public Identity getCallerIdentity() + + // throw new EJBException(Deprecated); + //} /** Get the Principal for the current caller. This method cannot return null according to the ejb-spec. @@ -301,10 +301,10 @@ /** * @deprecated */ - public Properties getEnvironment() - - throw new EJBException(Deprecated); - } + //public Properties getEnvironment() + + // throw new EJBException(Deprecated); + //} public boolean getRollbackOnly() @@ -337,10 +337,10 @@ /** * @deprecated */ - public boolean isCallerInRole(Identity id) - - throw new EJBException(Deprecated); - } + //public boolean isCallerInRole(Identity id) + + // throw new EJBException(Deprecated); + //} // TODO - how to handle this best? public boolean isCallerInRole(String id) ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] Fresh Checkout - Build Failing
As a reference point, a build on the latest checkout worked for me. But 'build clobber' fails as it tries to delete build.log (this is JDK 1.3.1_01 on Win2k). -- Guillaume ... _configure-tasks: _init-show-environment: clean: clobber: [execmodules] == == Finished with 'clobber' in module 'plugins/jetty'. == clobber: [delete] Deleting: C:\cvs\jboss-all\build\local.properties [delete] Deleting: C:\cvs\jboss-all\build\build.log BUILD FAILED C:\cvs\jboss-all\build\build.xml:1403: Unable to delete file C:\cvs\jboss-all\build\build.log -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Jason Dillon Sent: Monday, December 03, 2001 6:04 PM To: Peter Fagerlund Cc: Scott M Stark; [EMAIL PROTECTED] Subject: Re: [JBoss-dev] Fresh Checkout - Build Failing If you have problems with the build system please provide a more verbose description of the problem. Simply stating that the build halts does not help determine what the problem might be. Thanks, --jason On Mon, 3 Dec 2001, Peter Fagerlund wrote: FYI: I just did a fresh checkout and it halts at j2ee I do some clean up in the lab instead ... /peter_f ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] [RESEND][PATCH] Cleanup dead imports
I sent a big patch about a month ago [#475080] that was removing all the unused import lines from the code. I did not get any feedback on it so I am resending it, this time on a subset of the code (only the /server directory from jboss-all). The patch is at http://www.boissiere.com/diff.txt List of removed items is at http://www.boissiere.com/checker.txt Patch is fully tested. Besides making the code more compact and readable by removing some cruft, it also reduces the compile time by about 10%. Please apply. -- Guillaume ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] [RESEND][PATCH] Cleanup dead imports
I created a small program in Java to do this. I'd be happy to make this into an ant task. How would you like this to be structured? -- Guillaume How did you create this? What would be even better is an ant task to use in a build target. Anyone mind if I commit this? david jencks ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] OBJECT_NAME rules
Perusing through the code, I saw the following variations for the service names of MBeans in JBoss: - no prefix, i.e :service=Mail - EJB prefix, i.e EJB:service= - JBOSS-SYSTEM prefix i.e JBOSS-SYSTEM:service=Info - J2EE prefix i.e J2EE:service=J2eeDeployer Are there any specific rules for the naming? If so, what are they? Also I noticed that a couple of the MBeans had the OBJECT_NAME variable not declared as public static final. Simple patch below. -- Guillaume diff -urN jboss/src/main/org/jboss/deployment/AutoDeployerMBean.java gb-jboss/src/main/org/jboss/deployment/AutoDeployerMBean.java --- jboss/src/main/org/jboss/deployment/AutoDeployerMBean.java Wed Aug 29 18:52:05 2001 +++ gb-jboss/src/main/org/jboss/deployment/AutoDeployerMBean.java Fri Nov 2 21:39:32 2001 @@ -22,7 +22,7 @@ extends ServiceMBean { /** The default object name. */ - String OBJECT_NAME = EJB:service=AutoDeployer; + public static final String OBJECT_NAME = EJB:service=AutoDeployer; /** * Set the list of urls to watch. diff -urN jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java gb-jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java --- jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java Wed Aug 29 23:10:02 2001 +++ gb-jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java Fri Nov 2 21:43:49 2001 @@ -25,7 +25,7 @@ extends ServiceMBean { /** The default object name. */ - String OBJECT_NAME = :service=ContainerFactory; + public static final String OBJECT_NAME = :service=ContainerFactory; /** * Returns the applications deployed by the container factory diff -urN jboss/src/main/org/jboss/jms/asf/ServerSessionPoolLoaderMBean.java gb-jboss/src/main/org/jboss/jms/asf/ServerSessionPoolLoaderMBean.java --- jboss/src/main/org/jboss/jms/asf/ServerSessionPoolLoaderMBean.java Wed Aug 29 23:10:54 2001 +++ gb-jboss/src/main/org/jboss/jms/asf/ServerSessionPoolLoaderMBean.java Fri Nov 2 21:45:48 2001 @@ -31,7 +31,7 @@ extends ServiceMBean { /** The default MBean object name. */ - String OBJECT_NAME = :service=ServerSessionPoolMBean; + public static final String OBJECT_NAME = :service=ServerSessionPoolLoader; /** * Set the pool name. diff -urN jboss/src/main/org/jboss/system/FarmAutoDeployerMBean.java gb-jboss/src/main/org/jboss/system/FarmAutoDeployerMBean.java --- jboss/src/main/org/jboss/system/FarmAutoDeployerMBean.java Sat Oct 20 00:24:23 2001 +++ gb-jboss/src/main/org/jboss/system/FarmAutoDeployerMBean.java Fri Nov 2 21:47:42 2001 @@ -22,7 +22,7 @@ extends ServiceMBean { /** The default object name. */ - String OBJECT_NAME = EJB:service=AutoDeployer; + public static final String OBJECT_NAME = EJB:service=AutoDeployer; /** * Set the list of urls to watch. diff -urN jboss/src/main/org/jboss/system/InfoMBean.java gb-jboss/src/main/org/jboss/system/InfoMBean.java --- jboss/src/main/org/jboss/system/InfoMBean.java Fri Sep 7 20:53:56 2001 +++ gb-jboss/src/main/org/jboss/system/InfoMBean.java Fri Nov 2 21:49:25 2001 @@ -17,7 +17,7 @@ */ public interface InfoMBean { - String OBJECT_NAME = JBOSS-SYSTEM:service=Info; + public static final String OBJECT_NAME = JBOSS-SYSTEM:service=Info; String listMemoryUsage(); String listSystemInfo(); diff -urN jboss/src/main/org/jboss/system/ServiceLibrariesMBean.java gb-jboss/src/main/org/jboss/system/ServiceLibrariesMBean.java --- jboss/src/main/org/jboss/system/ServiceLibrariesMBean.java Fri Sep 7 20:53:57 2001 +++ gb-jboss/src/main/org/jboss/system/ServiceLibrariesMBean.java Fri Nov 2 21:49:26 2001 @@ -22,7 +22,7 @@ */ public interface ServiceLibrariesMBean { - String OBJECT_NAME = JBOSS-SYSTEM:service=Libraries; + public static final String OBJECT_NAME = JBOSS-SYSTEM:service=Libraries; // The ServicesLibraries MBean should expose soft information like // the dependencies graph ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] OBJECT_NAME rules
log= Category.getInstance(FileURLPatch.class); private CustomURLStreamHandlerFactory customURLStreamHandlerFactory= new CustomURLStreamHandlerFactory(); private boolean enabled= false; diff -urN jboss/src/main/org/jboss/util/Info.java gb-jboss/src/main/org/jboss/util/Info.java --- jboss/src/main/org/jboss/util/Info.java Fri Aug 3 13:15:57 2001 +++ gb-jboss/src/main/org/jboss/util/Info.java Fri Nov 2 23:18:42 2001 @@ -28,7 +28,7 @@ { // Constants - - public static final String OBJECT_NAME= :service=Info; + public static final String OBJECT_NAME= JBOSS-SYSTEM:service=Info; // Attributes diff -urN jboss/src/main/org/jboss/web/WebServiceMBean.java gb-jboss/src/main/org/jboss/web/WebServiceMBean.java --- jboss/src/main/org/jboss/web/WebServiceMBean.java Thu Aug 30 00:13:42 2001 +++ gb-jboss/src/main/org/jboss/web/WebServiceMBean.javaFri Nov 2 23:19:07 2001 @@ -19,7 +19,7 @@ extends org.jboss.system.ServiceMBean { // Constants - - public static final String OBJECT_NAME = :service=Webserver; + public static final String OBJECT_NAME = JBOSS-SYSTEM:service=Webserver; // Public public URL addClassLoader(ClassLoader cl); -Original Message- From: Andreas Schaefer [mailto:[EMAIL PROTECTED]] Sent: Friday, November 02, 2001 10:36 PM To: Guillaume Boissiere; [EMAIL PROTECTED] Subject: Re: [JBoss-dev] OBJECT_NAME rules Hi Your are right but Object Names rules are: Domain Name:[key=value],... Right now JBoss does not use the Object Name capabilities fully one part you can see this is in the J2eeDeployer and WebDeployer. There we could create the WebDeployer service like this: JBOSS-SYSTEM:service=deployer,type=web,vendor=jetty This would enable use to skip to specify the WebDeployer name in the J2eeDeployer but instead the J2eeDeployer could search for a service with: JBOSS-SYSTEM:service=deployer,typ=web and whatever vendor the web deployer service provides does not matter. The Object names with no Domain Name is the worst because in JMX-RI is a big bug not able to find this MBean even it does allow the MBean to be registered with its name. Have fun - Andy ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
RE: [JBoss-dev] Fwd: ests on different OS'es
Title: RE: [JBoss-dev] Fwd: ests on different OS'es I agree. Without going overboard, it'd be great to set some specific milestones regarding the quality of the code and documentation that need to be met for 3.0 final release (i.e. has to pass the test suite with no errors, all public methods have to be documented with Javadoc, etc.) Automated tests on multiple platforms will go a long way towards achieving this goal. A couple days ago, I put together a simple Java program that locates and eliminates dead import lines from the tree [patch #475080]. I'd be happy to help create other similar source code tests and integrate that into the test suite if there is some interest. Comments? Ideas for new source code or documentation tests? -- Guillaume FROM: marc fleury DATE: 10/30/2001 06:28:08 SUBJECT: RE: [JBoss-dev] Fwd: ests on different OS'es Sounds great actually, having the automated tests is an important thing for the next fase of dev. In fact even just the compile farm with Linux but triggered when there are tag updates would be an important thing for us not to miss obvious problems in the tests. marcf |-Original Message- |From: EMAIL: PROTECTED /contact.php3?[EMAIL PROTECTED] |[mailto:EMAIL: PROTECTED /contact.php3?[EMAIL PROTECTED]]On Behalf Of Chris |Kimpton |Sent: Tuesday, October 30, 2001 5:01 AM |To: EMAIL: PROTECTED /contact.php3?[EMAIL PROTECTED] |Subject: [JBoss-dev] Fwd: ests on different OS'es | | |Hi Peter | |[I sent this to the list - hope you don't mind - just to mix in any |other ideas] | |There was some talk about the compile farm a few months back... and I |tihnk it could be a way to go... We'd just need to see if we can |automate all the work - eg cronjobs/at-jobs to automate and getting |the stuff off the box, scp all the way to a public server. | |Although the biggest problem I see is that they have no Windoze |servers - which I think is where we need regular testing. | |I think the tinderbox ( http://mozilla.org/projects/tinderbox/ ) (or |similar) route seems the way to go - that is, a central server for |results and then various servers for generating/submitting results. |It provides lots of info on when builds break and can highlight the |code that causes the break - from what I've read ;-) | |This should allow practically anyone to use their dev pc as a test |machine - after you run the tests, you can submit the results to the |central server (although I maybe asking too much from tinderbox |here...) | |This is what I want to look at next. | |Chris | |--- Peter Fagerlund EMAIL: PROTECTED /contact.php3?[EMAIL PROTECTED] wrote: | Date: Mon, 29 Oct 2001 18:37:01 +0100 | Subject: ests on different OS'es | From: Peter Fagerlund EMAIL: PROTECTED /contact.php3?[EMAIL PROTECTED] | To: Chris Kimpton EMAIL: PROTECTED /contact.php3?[EMAIL PROTECTED] | | Chris, | | have You seen Guide to the SourceForge.net Compile Farm | http://sourceforge.net/docman/display_doc.php?docid=762_id=1 | | Could We use that ? ... to also test on other plattforms and have | an ant | task auto uppload the results for presentation ??? ... | | What do u think ? ... | | /peter_f | |