[jboss-cvs] JBossAS SVN: r104116 - in projects/profileservice/trunk: core/src/main/java/org/jboss/profileservice/profile/metadata and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 21 10:09:44 EDT 2010
Author: emuckenhuber
Date: 2010-04-21 10:09:42 -0400 (Wed, 21 Apr 2010)
New Revision: 104116
Modified:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/Hack.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/FarmingProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/HotDeploymentProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/LocalFileArtifactRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/DelegateProfile.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/VirtualDeploymentProfile.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryBackupUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java
projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java
projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/actions/DeploymentStopAction.java
Log:
fix deployment target.
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/Hack.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/Hack.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/Hack.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -30,7 +30,7 @@
static volatile boolean checkHack = false;
- public static boolean checkHack()
+ public static boolean ignoreHack()
{
return checkHack;
}
@@ -40,7 +40,7 @@
*
* @param check
*/
- public static void setCheckHack(boolean check)
+ public static void setIgnoreHack(boolean check)
{
checkHack = check;
}
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -79,6 +79,12 @@
return this.deployments;
}
+ // FIXME
+ public boolean isCheckComplete()
+ {
+ return false;
+ }
+
@Override
@XmlAttribute(name = "name")
public String getName()
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/FarmingProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/FarmingProfileMetaData.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/FarmingProfileMetaData.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -74,7 +74,7 @@
@Override
public boolean isHotDeploymentEnabled()
{
- return scanPeriod != null;
+ return scanPeriod != null ? scanPeriod.isDisabled() == false : false;
}
@Override
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/HotDeploymentProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/HotDeploymentProfileMetaData.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/HotDeploymentProfileMetaData.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -73,7 +73,7 @@
@Override
public boolean isHotDeploymentEnabled()
{
- return scanPeriod != null;
+ return scanPeriod != null ? scanPeriod.isDisabled() == false : false;
}
@Override
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/LocalFileArtifactRepository.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/LocalFileArtifactRepository.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/LocalFileArtifactRepository.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -95,7 +95,7 @@
if(originalLocation.isDirectory() == false)
{
// TODO
- if(Hack.checkHack())
+ if(Hack.ignoreHack() == false)
throw new IOException(originalLocation + " is not a directory");
}
// In case we only use backups we need to remount
@@ -249,8 +249,7 @@
{
if(containsArtifact(artifactId) == false)
{
- if(Hack.checkHack())
- getConfiguration().getNotFoundHandler().handleArtifactNotFound(this, artifactId);
+ getConfiguration().getNotFoundHandler().handleArtifactNotFound(this, artifactId);
}
if(getConfiguration().getBackupPolicy() == VFSBackupPolicy.BACKUP)
{
@@ -278,8 +277,7 @@
VirtualFile vf = getRepositoryRoot().getChild(artifact.getPath());
if(checkExist && vf.exists() == false)
{
- if(Hack.checkHack())
- getConfiguration().getNotFoundHandler().handleArtifactNotFound(this, artifact);
+ getConfiguration().getNotFoundHandler().handleArtifactNotFound(this, artifact);
}
return vf;
}
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/DelegateProfile.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/DelegateProfile.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/DelegateProfile.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -49,7 +49,7 @@
final private DeploymentRepository repository;
/** Is hot deployment checking enabled */
- private volatile boolean hotdeployEnabled = false;
+ private volatile boolean hotdeployEnabled = true;
public DelegateProfile(DeploymentRepository repository, ProfileKey key)
{
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/VirtualDeploymentProfile.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/VirtualDeploymentProfile.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/VirtualDeploymentProfile.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -111,7 +111,7 @@
catch(Exception e)
{
// FIXME
- if(Hack.checkHack())
+ if(Hack.ignoreHack() == false)
{
throw e;
}
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryBackupUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryBackupUnitTestCase.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryBackupUnitTestCase.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -58,7 +58,7 @@
static
{
- Hack.setCheckHack(true);
+ Hack.setIgnoreHack(true);
}
static URL findResource(String name)
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/test/BasicProfileServiceUnitTestCase.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -56,7 +56,7 @@
public void test() throws Throwable
{
- Hack.setCheckHack(false);
+ Hack.setIgnoreHack(true);
deploy(findResource("system/bootstrap.xml"));
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -57,7 +57,7 @@
public void test() throws Exception
{
- Hack.setCheckHack(true);
+ Hack.setIgnoreHack(true);
// Set the jboss.deployment.resources
System.setProperty("jboss.deployment.resources", getResource(REPOSITORY_LOCATION).toExternalForm());
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -50,7 +50,7 @@
public void test() throws Exception
{
- Hack.setCheckHack(true);
+ Hack.setIgnoreHack(true);
// Set the jboss.deployment.resources
System.setProperty("jboss.deployment.resources", getResource(REPOSITORY_LOCATION).toExternalForm());
Modified: projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java
===================================================================
--- projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/AbstractDeployHandler.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -104,7 +104,13 @@
if(managed != null && managed.getProfile().isMutable() && managed.getProfile() instanceof MutableProfile)
{
MutableProfile mutable = MutableProfile.class.cast(managed.getProfile());
- actions.addAction(mutable.getKey(), new DeploymentDistributeAction(mutable, dtID, contentIS, null));
+ ProfileKey key = mutable.getKey();
+ DeploymentAction<? extends DeploymentActionContext> action = createWoraroundDistributeAction(key, dtID, contentIS, mutable);
+ if(action == null)
+ {
+ action = new DeploymentDistributeAction(mutable, dtID, contentIS, null);
+ }
+ actions.addAction(key, action);
}
else
{
@@ -117,13 +123,7 @@
if(managed != null && managed.getProfile().isMutable() && managed.getProfile() instanceof MutableProfile)
{
final MutableProfile mutable = MutableProfile.class.cast(managed.getProfile());
- ProfileKey key = mutable.getKey();
- DeploymentAction<? extends DeploymentActionContext> action = createWoraroundDistributeAction(key, dtID, contentIS, mutable);
- if(action == null)
- {
- action = new DeploymentAddAction(dtID, mutable, null);
- }
- actions.addAction(key, action);
+ actions.addAction(mutable.getKey(), new DeploymentAddAction(dtID, mutable, null));
}
else
{
Modified: projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/actions/DeploymentStopAction.java
===================================================================
--- projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/actions/DeploymentStopAction.java 2010-04-21 12:39:44 UTC (rev 104115)
+++ projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/deploy/actions/DeploymentStopAction.java 2010-04-21 14:09:42 UTC (rev 104116)
@@ -79,12 +79,7 @@
ProfileDeployment deployment = profile.getDeployment(deploymentName);
ProfileDeploymentInfo info = deployment.getDeploymentInfo();
info.setFlag(ProfileDeploymentFlag.LOCKED);
- // If it's already stopped ignore
- if(info.isDeployed() == false)
- {
- continue;
- }
- // Add to deployer
+ // Remove from deployer
deployer.removeDeployment(deployment);
// Add to the deployment list
addDeployment(deployment);
More information about the jboss-cvs-commits
mailing list