[jboss-cvs] JBossAS SVN: r70150 - in trunk: ejb3 and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 26 22:53:38 EST 2008
Author: scott.stark at jboss.org
Date: 2008-02-26 22:53:38 -0500 (Tue, 26 Feb 2008)
New Revision: 70150
Modified:
trunk/cluster/.classpath
trunk/ejb3/.classpath
trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
trunk/embedded/.classpath
trunk/iiop/.classpath
trunk/security/.classpath
trunk/server/.classpath
trunk/testsuite/.classpath
trunk/varia/.classpath
Log:
Update naming project references to thirdparty
Modified: trunk/cluster/.classpath
===================================================================
--- trunk/cluster/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/cluster/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -7,7 +7,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/server"/>
- <classpathentry kind="src" path="/naming"/>
<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/metadata/lib/jboss-metadata.jar" sourcepath="/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ha-client/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/jboss-ha-client/lib/jboss-ha-client-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ha-server-api/lib/jboss-ha-server-api.jar" sourcepath="/thirdparty/jboss/jboss-ha-server-api/lib/jboss-ha-server-api-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/ejb3/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -10,7 +10,6 @@
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="src" path="/naming"/>
<classpathentry kind="src" path="/aspects"/>
<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
@@ -73,5 +72,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-metadata/lib/jboss-ejb3-metadata.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-metadata/lib/jboss-ejb3-metadata-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2008-02-27 03:53:38 UTC (rev 70150)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collections;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -192,16 +193,22 @@
va.setRecurseFilter(noJars);
FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
- try
+ List<VirtualFile> classPath = unit.getClassPath();
+ if(classPath == null)
+ return Collections.emptyList();
+
+ for(VirtualFile root : classPath)
{
- VirtualFile root = getRootFile();
- if( root.isLeaf() == false )
- root.visit(visitor);
+ try
+ {
+ if( root.isLeaf() == false )
+ root.visit(visitor);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
List<VirtualFile> resources = visitor.getMatched();
Modified: trunk/embedded/.classpath
===================================================================
--- trunk/embedded/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/embedded/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -9,7 +9,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
<classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/naming"/>
<classpathentry combineaccessrules="false" kind="src" path="/aspects"/>
<classpathentry combineaccessrules="false" kind="src" path="/ejb3"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -50,5 +49,6 @@
<classpathentry kind="lib" path="/thirdparty/hibernate-validator/lib/hibernate-validator.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-collections/lib/commons-collections.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: trunk/iiop/.classpath
===================================================================
--- trunk/iiop/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/iiop/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -6,7 +6,6 @@
<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="src" path="/naming"/>
<classpathentry kind="src" path="/security"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/system"/>
@@ -23,5 +22,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/main"/>
<classpathentry kind="lib" path="/thirdparty/jboss/metadata/lib/jboss-metadata.jar" sourcepath="/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/security/.classpath
===================================================================
--- trunk/security/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/security/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-src.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/naming"/>
- <classpathentry combineaccessrules="false" kind="src" path="/system"/>
- <classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar" sourcepath="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar" sourcepath="/thirdparty/junit/lib/junit-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/metadata/lib/jboss-metadata.jar" sourcepath="/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar"/>
- <classpathentry kind="output" path="output/eclipse-classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-src.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar" sourcepath="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar" sourcepath="/thirdparty/junit/lib/junit-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/metadata/lib/jboss-metadata.jar" sourcepath="/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
+ <classpathentry kind="output" path="output/eclipse-classes"/>
+</classpath>
Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/server/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -8,7 +8,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/system"/>
- <classpathentry kind="src" path="/naming"/>
<classpathentry kind="lib" path="/thirdparty/apache-bcel/lib/bcel.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
@@ -47,5 +46,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/metadata/lib/jboss-metadata.jar" sourcepath="/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/testsuite/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -11,7 +11,6 @@
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/cluster"/>
<classpathentry kind="src" path="/messaging"/>
- <classpathentry kind="src" path="/naming"/>
<classpathentry kind="src" path="/connector"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
@@ -102,5 +101,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-common/lib/jbossws-common.jar" sourcepath="/thirdparty/jboss/jbossws-common/lib/jbossws-common-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
<classpathentry kind="lib" path="/thirdparty/stax-api/lib/stax-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/varia/.classpath
===================================================================
--- trunk/varia/.classpath 2008-02-27 03:36:41 UTC (rev 70149)
+++ trunk/varia/.classpath 2008-02-27 03:53:38 UTC (rev 70150)
@@ -8,7 +8,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/cluster"/>
<classpathentry kind="src" path="/server"/>
- <classpathentry kind="src" path="/naming"/>
<classpathentry kind="lib" path="/thirdparty/apache-bsf/lib/bsf.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/>
@@ -50,5 +49,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ha-server-api/lib/jboss-ha-server-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
More information about the jboss-cvs-commits
mailing list