[jboss-cvs] JBossAS SVN: r66883 - in trunk: embedded/src/main/java/org/jboss/embedded and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 8 13:47:23 EST 2007
Author: alesj
Date: 2007-11-08 13:47:23 -0500 (Thu, 08 Nov 2007)
New Revision: 66883
Modified:
trunk/embedded/build.xml
trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java
trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
Log:
Adding metadata to embedded.
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2007-11-08 18:31:55 UTC (rev 66882)
+++ trunk/embedded/build.xml 2007-11-08 18:47:23 UTC (rev 66883)
@@ -134,6 +134,7 @@
<path refid="jboss.test.classpath"/>
<path refid="jboss.ejb3.classpath"/>
<path refid="jboss.bootstrap.classpath"/>
+ <path refid="jboss.metadata.classpath"/>
</path>
@@ -393,8 +394,8 @@
<zipfileset src="${jboss.j2se.lib}/jboss-j2se.jar"/>
<zipfileset src="${jboss.jca.lib}/jboss-jca.jar"/>
<zipfileset src="${jboss.jca.lib}/jboss-common-jdbc-wrapper.jar"/>
- <zipfileset src="${jboss.jca.lib}/jboss-local-jdbc.jar"/>
- <zipfileset src="${jboss.iiop.lib}/jboss-iiop.jar"/>
+ <zipfileset src="${jboss.jca.lib}/jboss-local-jdbc.jar"/>
+ <zipfileset src="${jboss.iiop.lib}/jboss-iiop.jar"/>
<zipfileset src="${jboss.jca.lib}/jboss-xa-jdbc.jar"/>
<zipfileset src="${jboss.jca.lib}/jms-ra.jar"/>
<zipfileset src="${jboss.jmx.lib}/jboss-jmx.jar"/>
@@ -412,8 +413,9 @@
<zipfileset src="${jboss.jbossws.lib}/jbossws-client.jar"/>
<zipfileset src="${jboss.jbossws.spi.lib}/jbossws-spi.jar"/>
<zipfileset src="${jboss.jboss.vfs.lib}/jboss-vfs.jar"/>
- <zipfileset src="${jboss.messaging.lib}/jboss-messaging.jar"/>
- <zipfileset src="${jboss.jboss.jaspi.api.lib}/jboss-jaspi-api.jar"/>
+ <zipfileset src="${jboss.messaging.lib}/jboss-messaging.jar"/>
+ <zipfileset src="${jboss.jboss.jaspi.api.lib}/jboss-jaspi-api.jar"/>
+ <zipfileset src="${jboss.metadata.lib}/jboss-metadata.jar"/>
<zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
</jar>
Modified: trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-11-08 18:31:55 UTC (rev 66882)
+++ trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-11-08 18:47:23 UTC (rev 66883)
@@ -66,7 +66,9 @@
*/
public static synchronized Bootstrap getInstance()
{
- if (instance == null) instance = new Bootstrap(createKernel());
+ if (instance == null)
+ instance = new Bootstrap(createKernel());
+
return instance;
}
@@ -175,7 +177,9 @@
System.setProperty(BOOTSTRAP_RESOURCE_PATH, bootstrapResourcePath);
bootstrapResourcePath += BOOTSTRAP_RESOURCE_FILE;
URL url = loader.getResource(bootstrapResourcePath);
- if (url == null) throw new DeploymentException("Unable to find bootstrap file: " + bootstrapResourcePath + " in classpath");
+ if (url == null)
+ throw new DeploymentException("Unable to find bootstrap file: " + bootstrapResourcePath + " in classpath");
+
bootstrapURL(url);
}
@@ -203,8 +207,10 @@
}
catch (Exception e)
{
- if (!ignoreShutdownErrors) throw new RuntimeException(e);
- else log.error("Failed to shutdown Bootstrap", e);
+ if (!ignoreShutdownErrors)
+ throw new RuntimeException(e);
+ else
+ log.error("Failed to shutdown Bootstrap", e);
}
}
@@ -379,9 +385,13 @@
public void undeployResourceBase(String baseResource) throws DeploymentException
{
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- if (loader != null) classLoader = loader;
+ if (loader != null)
+ classLoader = loader;
+
URL url = classLoader.getResource(baseResource);
- if (url == null) throw new RuntimeException("Could not find baseResource: " + baseResource);
+ if (url == null)
+ throw new RuntimeException("Could not find baseResource: " + baseResource);
+
undeployResourceBase(url, baseResource);
}
@@ -442,9 +452,13 @@
public void undeployResource(String resource) throws DeploymentException
{
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- if (loader != null) classLoader = loader;
+ if (loader != null)
+ classLoader = loader;
+
URL url = classLoader.getResource(resource);
- if (url == null) throw new NullPointerException("Resource was null: " + resource);
+ if (url == null)
+ throw new NullPointerException("Resource was null: " + resource);
+
undeploy(url);
}
Modified: trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java 2007-11-08 18:31:55 UTC (rev 66882)
+++ trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java 2007-11-08 18:47:23 UTC (rev 66883)
@@ -283,9 +283,13 @@
break;
}
}
- if (!found) continue;
+ if (!found)
+ continue;
+
File fp = new File(path);
- if (!fp.exists()) throw new DeploymentException("File in java.class.path does not exists: " + fp);
+ if (!fp.exists())
+ throw new DeploymentException("File in java.class.path does not exists: " + fp);
+
try
{
list.add(fp.toURL());
@@ -312,9 +316,13 @@
public void addResource(String resource) throws DeploymentException, NullPointerException
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (classLoader != null) loader = classLoader;
+ if (classLoader != null)
+ loader = classLoader;
+
URL url = loader.getResource(resource);
- if (url == null) throw new NullPointerException("Resource was null: " + resource);
+ if (url == null)
+ throw new NullPointerException("Resource was null: " + resource);
+
add(url);
}
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-11-08 18:31:55 UTC (rev 66882)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-11-08 18:47:23 UTC (rev 66883)
@@ -99,8 +99,7 @@
URL deployURL = getDeployURL(deployment);
String[] sig = { URL.class.getName() };
Object[] args = {deployURL};
- DeploymentContext dc = (DeploymentContext) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeploymentContext", args, sig);
- return dc;
+ return (DeploymentContext) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeploymentContext", args, sig);
}
public AbstractDeploymentTest(String test)
More information about the jboss-cvs-commits
mailing list