[jboss-cvs] JBossAS SVN: r85309 - in trunk: profileservice/src/main/org/jboss/profileservice/management and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 5 12:09:00 EST 2009
Author: emuckenhuber
Date: 2009-03-05 12:09:00 -0500 (Thu, 05 Mar 2009)
New Revision: 85309
Modified:
trunk/component-matrix/pom.xml
trunk/profileservice/src/main/org/jboss/profileservice/management/AbstractTemplateCreator.java
trunk/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java
trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
[JBAS-6472] update to jboss-integration alpha7
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/component-matrix/pom.xml 2009-03-05 17:09:00 UTC (rev 85309)
@@ -68,7 +68,7 @@
<version.org.jboss.ejb3.proxy.clustered.client>1.0.0</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
<version.org.jboss.ejb3>1.1.1</version.org.jboss.ejb3>
- <version.org.jboss.integration>6.0.0.Alpha6</version.org.jboss.integration>
+ <version.org.jboss.integration>6.0.0.Alpha7</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
<version.org.jboss.jpa>1.0.0-CR1</version.org.jboss.jpa>
<version.org.jboss.logbridge>1.0.0.CR1</version.org.jboss.logbridge>
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/AbstractTemplateCreator.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/AbstractTemplateCreator.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/AbstractTemplateCreator.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -76,7 +76,7 @@
throw new IllegalArgumentException("Null deployment template info.");
// Load the deployment manager
- this.deploymentMgr.loadProfile(defaultKey, false);
+ this.deploymentMgr.loadProfile(defaultKey);
// The virtual file
VirtualFile base = null;
// Deploy the deployment
@@ -141,7 +141,7 @@
finally
{
// Release the deployment manager
- this.deploymentMgr.releaseProfile(defaultKey, true);
+ this.deploymentMgr.releaseProfile();
// Remove the temp file
if(base != null)
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/upload/DeploymentManagerImpl.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -181,6 +181,12 @@
SerializableDeploymentID deployment = new SerializableDeploymentID(names, getTargetProfile(), null);
return targets.get(0).getRepositoryNames(deployment);
}
+
+ public boolean isRedeploySupported()
+ {
+ // TODO
+ return false;
+ }
public boolean isRedeploySupported(ProfileKey key) throws NoSuchProfileException
{
@@ -205,20 +211,7 @@
{
this.activeProfileKey = null;
}
-
- public void loadProfile(ProfileKey key, boolean allowHotDeployments)
- throws Exception
- {
- loadProfile(key);
- }
-
- public void releaseProfile(ProfileKey key, boolean allowHotDeployments)
- throws Exception
- {
- releaseProfile();
- }
-
public DeploymentProgress redeploy(String name)
{
if(name == null)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -120,7 +120,7 @@
InitialContext ctx = new InitialContext();
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
dm = ps.getDeploymentManager();
- dm.loadProfile(defaultProfile, false);
+ dm.loadProfile(defaultProfile);
return dm;
}
return dm;
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -155,7 +155,7 @@
InitialContext ctx = getInitialContext();
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
deployMgr = ps.getDeploymentManager();
- deployMgr.loadProfile(getProfileKey(), false);
+ deployMgr.loadProfile(getProfileKey());
// Init the VFS to setup the vfs* protocol handlers
VFS.init();
}
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -188,7 +188,7 @@
InitialContext ctx = getInitialContext();
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
deployMgr = ps.getDeploymentManager();
- deployMgr.loadProfile(getProfileKey(), true);
+ deployMgr.loadProfile(getProfileKey());
// Init the VFS to setup the vfs* protocol handlers
VFS.init();
}
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/DeployUnitTestCase.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -58,14 +58,14 @@
{
super.setUp();
DeploymentManager deployMgr = getDeploymentManager();
- deployMgr.loadProfile(getProfileKey(), false);
+ deployMgr.loadProfile(getProfileKey());
}
@Override
protected void tearDown() throws Exception
{
DeploymentManager deployMgr = getDeploymentManager();
- deployMgr.releaseProfile(getProfileKey(), true);
+ deployMgr.releaseProfile();
super.tearDown();
}
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-03-05 16:58:27 UTC (rev 85308)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-03-05 17:09:00 UTC (rev 85309)
@@ -295,7 +295,7 @@
ProfileKey badKey = new ProfileKey("no-such-profile");
try
{
- deployMgr.loadProfile(badKey, false);
+ deployMgr.loadProfile(badKey);
fail("Did not see NoSuchProfileException");
}
catch(NoSuchProfileException e)
More information about the jboss-cvs-commits
mailing list