[jboss-cvs] JBossAS SVN: r81539 - in trunk: server/src/etc/conf/default/bootstrap and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 25 06:09:30 EST 2008
Author: dimitris at jboss.org
Date: 2008-11-25 06:09:30 -0500 (Tue, 25 Nov 2008)
New Revision: 81539
Modified:
trunk/component-matrix/pom.xml
trunk/server/src/etc/conf/default/bootstrap/vfs.xml
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java
Log:
revert all component updates after r81421 except for jboss/pojo cache 3.0.0.GA
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-25 11:03:13 UTC (rev 81538)
+++ trunk/component-matrix/pom.xml 2008-11-25 11:09:30 UTC (rev 81539)
@@ -45,7 +45,7 @@
<version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence>
<version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
<version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
- <version.org.jboss.aop>2.0.0.SP1</version.org.jboss.aop>
+ <version.org.jboss.aop>2.0.0.GA</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
<version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
@@ -57,15 +57,15 @@
<version.org.jboss.ejb3.proxy.client>1.0.0-Beta4</version.org.jboss.ejb3.proxy.client>
<version.org.jboss.ejb3.proxy.clustered.client>1.0.0-Beta3</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0-Beta2</version.org.jboss.ejb3.security.client>
- <version.org.jboss.jpa>1.0.0-Beta4</version.org.jboss.jpa>
- <version.org.jboss.reflect>2.0.1.GA</version.org.jboss.reflect>
- <version.org.jboss.vfs>2.0.0.GA</version.org.jboss.vfs>
+ <version.org.jboss.jpa>1.0.0-Beta3</version.org.jboss.jpa>
+ <version.org.jboss.reflect>2.0.0.GA</version.org.jboss.reflect>
+ <version.org.jboss.vfs>2.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
<version.org.jboss.man>2.0.0.CR5</version.org.jboss.man>
<version.org.jboss.microcontainer>2.0.0.CR5</version.org.jboss.microcontainer>
<version.org.jboss.cl>2.0.0.CR5</version.org.jboss.cl>
<version.org.jboss.deployers>2.0.0.CR5</version.org.jboss.deployers>
- <version.org.jboss.cache.core>3.0.1.CR1</version.org.jboss.cache.core>
+ <version.org.jboss.cache.core>3.0.0.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
<version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
<version.org.jboss.cluster.cache.spi>1.1.0.GA</version.org.jboss.cluster.cache.spi>
@@ -73,7 +73,7 @@
<version.org.jboss.integration>5.0.3.GA</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
<version.org.jboss.metadata>1.0.0.CR6</version.org.jboss.metadata>
- <version.org.jboss.naming>5.0.0.SP1</version.org.jboss.naming>
+ <version.org.jboss.naming>5.0.0.GA</version.org.jboss.naming>
<version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
<version.org.jboss.security>2.0.2.SP2</version.org.jboss.security>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
Modified: trunk/server/src/etc/conf/default/bootstrap/vfs.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/vfs.xml 2008-11-25 11:03:13 UTC (rev 81538)
+++ trunk/server/src/etc/conf/default/bootstrap/vfs.xml 2008-11-25 11:09:30 UTC (rev 81539)
@@ -7,34 +7,19 @@
<bean name="VFSCache">
<constructor factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
- <!-- Use the IterableTimedVFSCache implementation -->
- <parameter>org.jboss.virtual.plugins.cache.IterableTimedVFSCache</parameter>
+ <!-- Use the TimedVFSCache implementation -->
+ <parameter>org.jboss.virtual.plugins.cache.TimedVFSCache</parameter>
</constructor>
<start ignored="true"/>
</bean>
- <bean name="VfsNamesExceptionHandler" class="org.jboss.virtual.plugins.context.helpers.NamesExceptionHandler">
- <constructor>
- <parameter class="java.lang.String">sqljdbc.jar</parameter>
- </constructor>
- </bean>
-
<bean name="JBossVFSInitializer" class="org.jboss.virtual.plugins.cache.PreInitializeVFSContexts">
<property name="initializedVFSContexts">
- <map keyClass="java.net.URL" valueClass="org.jboss.virtual.spi.ExceptionHandler">
- <entry>
- <key>${jboss.lib.url}</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>${jboss.common.lib.url}</key>
- <value><inject bean="VfsNamesExceptionHandler"/></value>
- </entry>
- <entry>
- <key>${jboss.server.lib.url}</key>
- <value><inject bean="VfsNamesExceptionHandler"/></value>
- </entry>
- </map>
+ <list elementClass="java.net.URL">
+ <value>${jboss.lib.url}</value>
+ <value>${jboss.common.lib.url}</value>
+ <value>${jboss.server.lib.url}</value>
+ </list>
</property>
<property name="holdReference">true</property>
</bean>
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2008-11-25 11:03:13 UTC (rev 81538)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2008-11-25 11:09:30 UTC (rev 81539)
@@ -65,7 +65,6 @@
import org.jboss.util.file.JarUtils;
import org.jboss.util.stream.Streams;
import org.jboss.virtual.VFS;
-import org.jboss.virtual.VFSUtils;
import org.jboss.virtual.VirtualFile;
/**
@@ -799,11 +798,6 @@
*/
public void deploy(URL url) throws DeploymentException
{
- deploy(url, false, false, false);
- }
-
- public void deploy(URL url, boolean noReaper, boolean forceCopy, boolean caseSensitive) throws DeploymentException
- {
log.info("deploy, url="+url);
String deploymentName = contextMap.get(url);
// if it does not exist create a new deployment
@@ -811,16 +805,14 @@
{
try
{
+/*
+ // disable reaper for old deployments
+ // currently I (alesj) have no idea why this custom enable doesn't work
VFS vfs = VFS.getVFS(url);
- // enable options
- if (noReaper)
- VFSUtils.enableNoReaper(vfs);
- if (forceCopy)
- VFSUtils.enableCopy(vfs);
- if (caseSensitive)
- VFSUtils.enableCaseSensitive(vfs);
-
+ VFSUtils.enableNoReaper(vfs);
VirtualFile file = vfs.getRoot();
+*/
+ VirtualFile file = VFS.getRoot(url);
VFSDeployment deployment = deploymentFactory.createVFSDeployment(file);
delegate.addDeployment(deployment);
deploymentName = deployment.getName();
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2008-11-25 11:03:13 UTC (rev 81538)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2008-11-25 11:09:30 UTC (rev 81539)
@@ -196,18 +196,6 @@
void deploy(URL url) throws DeploymentException;
/**
- * The <code>deploy</code> method deploys a package identified by a URL
- *
- * @param url an <code>URL</code> value
- * @param noReaper enable no reaper
- * @param forceCopy enable copy
- * @param caseSensitive enable case sensitive
- * @throws DeploymentException for any error
- */
- // TODO - use Map?
- void deploy(URL url, boolean noReaper, boolean forceCopy, boolean caseSensitive) throws DeploymentException;
-
- /**
* The <code>deploy</code> method deploys a package represented by a DeploymentInfo object.
* @param deployment a <code>DeploymentInfo</code> value
* @exception DeploymentException if an error occurs
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java 2008-11-25 11:03:13 UTC (rev 81538)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java 2008-11-25 11:09:30 UTC (rev 81539)
@@ -22,8 +22,6 @@
package org.jboss.test.jmx.test;
import java.io.File;
-import java.net.URL;
-import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.NamingException;
@@ -35,9 +33,9 @@
*
* @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
* @author Scott.Stark at jboss.org
- * @author ales.justin at jboss.org
* @version $Revision$
*/
+
public class UndeployBrokenPackageUnitTestCase extends JBossTestCase
{
public UndeployBrokenPackageUnitTestCase(String name)
@@ -140,7 +138,7 @@
getLog().info("Deploying testPackage: " + testPackage);
try
{
- deployNoReaper(testPackage);
+ deploy(testPackage);
fail("test package " + testPackage + " deployed successfully with bad descriptor!");
}
catch (Exception e)
@@ -148,10 +146,10 @@
log.info("caught exception as expected", e);
}
- assertTrue(thejar.delete()); // TODO - this should work
+ //assertTrue(thejar.delete()); // TODO - this should work
Files.copy(goodjar, thejar);
getLog().info("Redeploying testPackage: " + testPackage);
-
+
redeploy(testPackage);
Object home = getInitialContext().lookup("EntityA");
getLog().info("Found EntityA home: " + home);
@@ -207,21 +205,5 @@
}
}
- protected void deployNoReaper(String name) throws Exception
- {
- undeploy(name);
- URL url = getDeployURL(name);
- Object[] args = new Object[]{url, true, false, false};
- String boolSig = boolean.class.getName();
- String[] signature = new String[]{URL.class.getName(), boolSig, boolSig, boolSig};
- invokeMainDeployer("deploy", args, signature, null);
- }
-
- protected <T> T invokeMainDeployer(String methodName, Object[] args, String[] sig, Class<T> clazz) throws Exception
- {
- MBeanServerConnection server = getServer();
- Object result = server.invoke(getDeployerName(), methodName, args, sig);
- return clazz != null ? clazz.cast(result) : null;
- }
}// UndeployBrokenPackageUnitTestCase
More information about the jboss-cvs-commits
mailing list