[jboss-cvs] JBossAS SVN: r74292 - in trunk: system-jmx/src/main/org/jboss/deployment/scanner and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Jun 8 17:35:30 EDT 2008 

Author: dimitris at jboss.org
Date: 2008-06-08 17:35:30 -0400 (Sun, 08 Jun 2008)
New Revision: 74292

Modified:
   trunk/component-matrix/pom.xml
   trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java
   trunk/testsuite/src/main/org/jboss/test/util/test/FileURLListerUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/util/test/ProtocolHandlerUnitTestCase.java
   trunk/tomcat/src/main/org/jboss/net/protocol/jndi/Handler.java
Log:
JBAS-5351, Upgrade jboss-common-core to 2.2.6.GA

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-06-08 14:52:45 UTC (rev 74291)
+++ trunk/component-matrix/pom.xml	2008-06-08 21:35:30 UTC (rev 74292)
@@ -1033,7 +1033,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
-        <version>2.2.5.GA</version>
+        <version>2.2.6.GA</version>
       </dependency>
       
       <dependency>

Modified: trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java	2008-06-08 14:52:45 UTC (rev 74291)
+++ trunk/system-jmx/src/main/org/jboss/deployment/scanner/URLDeploymentScanner.java	2008-06-08 21:35:30 UTC (rev 74292)
@@ -786,9 +786,6 @@
             {
                connection = url.openConnection();
             }
-            // no need to do special checks for files...
-            // org.jboss.net.protocol.file.FileURLConnection correctly
-            // implements the getLastModified method.
             long lastModified = connection.getLastModified();
 
             return lastModified;

Modified: trunk/testsuite/src/main/org/jboss/test/util/test/FileURLListerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/test/FileURLListerUnitTestCase.java	2008-06-08 14:52:45 UTC (rev 74291)
+++ trunk/testsuite/src/main/org/jboss/test/util/test/FileURLListerUnitTestCase.java	2008-06-08 21:35:30 UTC (rev 74292)
@@ -1,24 +1,24 @@
 /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.test.util.test;
 
 import java.net.URL;

Modified: trunk/testsuite/src/main/org/jboss/test/util/test/ProtocolHandlerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/test/ProtocolHandlerUnitTestCase.java	2008-06-08 14:52:45 UTC (rev 74291)
+++ trunk/testsuite/src/main/org/jboss/test/util/test/ProtocolHandlerUnitTestCase.java	2008-06-08 21:35:30 UTC (rev 74292)
@@ -1,24 +1,24 @@
 /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.test.util.test;
 
 import java.io.File;
@@ -28,14 +28,13 @@
 import org.jboss.test.JBossTestCase;
 import org.jboss.net.protocol.URLStreamHandlerFactory;
 import org.jboss.net.protocol.resource.ResourceURLConnection;
-import org.jboss.net.protocol.file.FileURLConnection;
 
 /** Unit tests for the custom JBoss protocol handler
-
- at see org.jboss.net.protocol.URLStreamHandlerFactory
- at author Scott.Stark at jboss.org
- at version $Revision$
-**/
+ * 
+ * @see org.jboss.net.protocol.URLStreamHandlerFactory
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
 public class ProtocolHandlerUnitTestCase extends JBossTestCase
 {
    public ProtocolHandlerUnitTestCase(String name)
@@ -43,8 +42,7 @@
       super(name);
    }
 
-   public void testJBossHandlers()
-      throws Exception
+   public void testJBossHandlers() throws Exception
    {
       getLog().debug("+++ testJBossHandlers");
       // Install a URLStreamHandlerFactory that uses the TCL
@@ -53,7 +51,8 @@
       URL cwdURL = cwd.toURL();
       URLConnection conn = cwdURL.openConnection();
       getLog().debug("File URLConnection: "+conn);
-      assertTrue("URLConnection is JBoss FileURLConnection", conn instanceof FileURLConnection);
+      // JBCOMMON-55, jboss custom org.jboss.net.protocol.file.FileURLConnection not used anymore
+      // assertTrue("URLConnection is JBoss FileURLConnection", conn instanceof FileURLConnection);
       long lastModified = conn.getLastModified();
       getLog().debug("CWD lastModified: "+lastModified);
       assertTrue("CWD lastModified != 0", lastModified != 0);

Modified: trunk/tomcat/src/main/org/jboss/net/protocol/jndi/Handler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/net/protocol/jndi/Handler.java	2008-06-08 14:52:45 UTC (rev 74291)
+++ trunk/tomcat/src/main/org/jboss/net/protocol/jndi/Handler.java	2008-06-08 21:35:30 UTC (rev 74292)
@@ -1,24 +1,24 @@
 /*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.net.protocol.jndi;
 
 import org.apache.naming.resources.DirContextURLConnection;
@@ -32,14 +32,13 @@
 import java.net.URLStreamHandler;
 
 /**
- * A protocol handler for the 'jndi' protocol.  Provides
- * access to jndi resources required by Tomcat 4.1.12. This
- * is basically a place-marker class so the org.jboss.net.protocol.URLStreamHandlerFactory
+ * A protocol handler for the 'jndi' protocol.  Provides access to jndi
+ * resources required by Tomcat 4.1.12. This is basically a place-marker
+ * class so the org.jboss.net.protocol.URLStreamHandlerFactory
  * class can find org.apache.naming.resources.DirContextURLStreamHandler.
- * See org.jboss.net.protocol.URLStreamHandlerFactory and org.jboss.net.protocol.file.Handler
- * for the pattern adopted here
+ * See org.jboss.net.protocol.URLStreamHandlerFactory and
+ * org.jboss.net.protocol.resource.Handler for the pattern adopted here
  */
-public class Handler
-   extends DirContextURLStreamHandler
+public class Handler extends DirContextURLStreamHandler
 {
 }

More information about the jboss-cvs-commits mailing list