[jboss-cvs] JBossAS SVN: r102514 - in projects/profileservice/trunk/core/src: main/java/org/jboss/profileservice/config and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 17 09:13:07 EDT 2010
Author: emuckenhuber
Date: 2010-03-17 09:13:04 -0400 (Wed, 17 Mar 2010)
New Revision: 102514
Added:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/PersistenceRepositoryConfiguration.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/hotdeploy/ProfileDeploymentModificationChecker.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileConfigurationExt.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/
Removed:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/ProfileDeploymentModificationChecker.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/
Modified:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/bootstrap/AbstractProfileServiceInitializer.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/ProfileServiceConfig.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDependencyContext.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDeployAction.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/HDScanningProfile.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/ScanningProfileFactory.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileMetaData.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/BasicSubProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/domain/RequiredProfiles.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileCapability.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileKeyCapability.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileKeyMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileRequirement.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractSubProfileKeyMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/ClassPathProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/EmptyProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileSourceMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/LegacyHDScanningRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeploymentRequirement.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/resolver/support/TestProfile.java
Log:
meta data update.
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/bootstrap/AbstractProfileServiceInitializer.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/bootstrap/AbstractProfileServiceInitializer.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/bootstrap/AbstractProfileServiceInitializer.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -47,7 +47,6 @@
*/
abstract class AbstractProfileServiceInitializer
{
- protected abstract Kernel getKernel();
/** The profileservice config. */
private final ProfileServiceConfig config;
@@ -60,6 +59,13 @@
}
this.config = config;
}
+
+ /**
+ * Get the MC kernel.
+ *
+ * @return the kernel
+ */
+ protected abstract Kernel getKernel();
/**
* Initialize
Added: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/PersistenceRepositoryConfiguration.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/PersistenceRepositoryConfiguration.java (rev 0)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/PersistenceRepositoryConfiguration.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -0,0 +1,56 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.profileservice.config;
+
+import java.io.File;
+import java.net.URI;
+
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+
+/**
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class PersistenceRepositoryConfiguration
+{
+
+ private static final String JBOSS_DATA_DIR = "jboss.server.data.dir";
+ private static final String PERSISTENCE_DIR = "profileservice";
+ private static final URI DATA_ROOT;
+
+ static
+ {
+ String dataRoot = System.getProperty(JBOSS_DATA_DIR);
+ File dataFile = new File(dataRoot);
+ DATA_ROOT = dataFile.toURI();
+ }
+
+ VirtualFile getPersistenceRepositoryRoot()
+ {
+ VirtualFile root = VFS.getChild(DATA_ROOT);
+ return root.getChild(PERSISTENCE_DIR);
+ }
+
+
+}
+
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/ProfileServiceConfig.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/ProfileServiceConfig.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/config/ProfileServiceConfig.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -55,6 +55,9 @@
/** The deployer registry. */
private ProfileDeployerPluginRegistry deployerRegistry;
+ /** The persistence repository configuration. */
+ private PersistenceRepositoryConfiguration persistenceRepositoryConfiguration;
+
/** The common artifact repository configuration options. */
private ArtifactRepositoriesConfig repositoriesConfiguration = new ArtifactRepositoriesConfig();
@@ -122,6 +125,17 @@
this.profileFactory = profileFactory;
}
+ public PersistenceRepositoryConfiguration getPersistenceRepositoryConfiguration()
+ {
+ return persistenceRepositoryConfiguration;
+ }
+
+ public void setPersistenceRepositoryConfiguration(
+ PersistenceRepositoryConfiguration persistenceRepositoryConfiguration)
+ {
+ this.persistenceRepositoryConfiguration = persistenceRepositoryConfiguration;
+ }
+
public ArtifactRepositoriesConfig getRepositoriesConfiguration()
{
return repositoriesConfiguration;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDependencyContext.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDependencyContext.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDependencyContext.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -30,7 +30,7 @@
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.profileservice.deployment.ProfileDeployerPlugin;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileKeyCapability;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileKeyCapability;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.dependency.ProfileCapability;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDeployAction.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDeployAction.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/ProfileDeployAction.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -22,17 +22,21 @@
package org.jboss.profileservice.dependency;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.plugins.dependency.InstallsAwareAction;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
+import org.jboss.profileservice.metadata.ProfileConfigurationExt;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.deployment.ProfileDeploymentFlag;
import org.jboss.profileservice.spi.managed.ManagedProfileDeployer;
+import org.jboss.profileservice.spi.metadata.ProfileMetaData;
/**
* deploy/undeploy action. This deploys/undeploys the profile deployments
@@ -70,8 +74,8 @@
protected void installActionInternal(KernelControllerContext ctx) throws Throwable
{
super.installActionInternal(ctx);
- ProfileControllerContext context = ProfileControllerContext.class.cast(ctx);
- Profile profile = context.getProfile();
+ final ProfileControllerContext context = ProfileControllerContext.class.cast(ctx);
+ final Profile profile = context.getProfile();
if(profile == null)
{
throw new NoSuchProfileException("null profile " + context.getProfileKey());
@@ -79,26 +83,14 @@
if(profile.getDeployments() != null & profile.getDeployments().isEmpty() == false)
{
// Get the deployer plugin
- ManagedProfileDeployer deployer = context.getManagedDeployer();
+ final ManagedProfileDeployer deployer = context.getManagedDeployer();
if(deployer == null)
{
throw new IllegalStateException("null deployer for profile " + profile.getKey());
}
+ final boolean isCheckComplete = isCheckComplete(context.getProfileMetaData());
// Deploy
- deploy(profile, deployer);
- // TODO add isCheckComplete flag.
- try
- {
- for(ProfileDeployment deployment : profile.getDeployments())
- {
- deployer.checkComplete(deployment.getName());
- }
- }
- catch(Exception e)
- {
- log.error(e);
- throw e;
- }
+ deploy(profile, deployer, isCheckComplete);
}
}
@@ -121,13 +113,14 @@
super.uninstallActionInternal(ctx);
}
- protected void deploy(Profile profile, ManagedProfileDeployer deployer) throws Exception
+ protected void deploy(final Profile profile, final ManagedProfileDeployer deployer, final boolean isCheckComplete) throws Exception
{
- Collection<? extends ProfileDeployment> deployments = profile.getDeployments();
+ final Collection<? extends ProfileDeployment> deployments = profile.getDeployments();
if (deployments != null && !deployments.isEmpty())
{
// Add deployments
- for (ProfileDeployment deployment : profile.getDeployments())
+ final Set<String> deploymentNames = new HashSet<String>();
+ for (final ProfileDeployment deployment : profile.getDeployments())
{
try
{
@@ -138,11 +131,23 @@
}
catch(Exception e)
{
- log.error("Failed to add deployment: " + deployment, e);
+ if(isCheckComplete)
+ {
+ throw e;
+ }
+ else
+ {
+ log.error("Failed to add deployment: " + deployment, e);
+ }
}
}
// deploy
deployer.process();
+ // Check complete
+ if(isCheckComplete)
+ {
+ deployer.checkComplete(deploymentNames.toArray(new String[deploymentNames.size()]));
+ }
}
}
@@ -171,4 +176,13 @@
}
}
+ boolean isCheckComplete(ProfileMetaData metaData)
+ {
+ if(metaData instanceof ProfileConfigurationExt)
+ {
+ return ProfileConfigurationExt.class.cast(metaData).isCheckComplete();
+ }
+ return false;
+ }
+
}
Deleted: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/ProfileDeploymentModificationChecker.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/ProfileDeploymentModificationChecker.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/ProfileDeploymentModificationChecker.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2010, Red Hat Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.profileservice.deployment;
-
-import org.jboss.profileservice.spi.ProfileDeployment;
-import org.jboss.vfs.VirtualFile;
-
-/**
- * Modification checker interface.
- *
- * This will usually delegate to the {@code StructureModificationChecker}.
- *
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public interface ProfileDeploymentModificationChecker
-{
-
- /**
- * Check a deployment for modifications.
- *
- * @param deployment the profile deployment
- * @param deploymentRoot the unmounted virtual file
- * @return true when the deployment was modified, false otherwise
- */
- boolean isDeploymentModified(ProfileDeployment deployment, VirtualFile deploymentRoot);
-
-}
-
Copied: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/hotdeploy/ProfileDeploymentModificationChecker.java (from rev 102120, projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/ProfileDeploymentModificationChecker.java)
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/hotdeploy/ProfileDeploymentModificationChecker.java (rev 0)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployment/hotdeploy/ProfileDeploymentModificationChecker.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.profileservice.deployment.hotdeploy;
+
+import org.jboss.profileservice.spi.ProfileDeployment;
+import org.jboss.vfs.VirtualFile;
+
+/**
+ * Modification checker interface.
+ *
+ * This will usually delegate to the {@code StructureModificationChecker}.
+ *
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public interface ProfileDeploymentModificationChecker
+{
+
+ /**
+ * Check a deployment for modifications.
+ *
+ * @param deployment the profile deployment
+ * @param deploymentRoot the unmounted virtual file
+ * @return true when the deployment was modified, false otherwise
+ */
+ boolean isDeploymentModified(ProfileDeployment deployment, VirtualFile deploymentRoot);
+
+}
+
Added: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileConfigurationExt.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileConfigurationExt.java (rev 0)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/ProfileConfigurationExt.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.profileservice.metadata;
+
+/**
+ * TODO move this to managed SPI ?
+ *
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public interface ProfileConfigurationExt
+{
+
+ /**
+ * Does the profile support redeployment.
+ *
+ * @return
+ */
+ boolean isSupportRedeployment();
+
+ /**
+ * Check complete during the profile lifecycle.
+ *
+ * @return
+ */
+ boolean isCheckComplete();
+
+}
+
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/HDScanningProfile.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/HDScanningProfile.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/HDScanningProfile.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -26,7 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.profileservice.deployment.ProfileDeploymentModificationChecker;
+import org.jboss.profileservice.deployment.hotdeploy.ProfileDeploymentModificationChecker;
import org.jboss.profileservice.repository.artifact.file.FileArtifactId;
import org.jboss.profileservice.spi.ModificationInfo;
import org.jboss.profileservice.spi.ProfileDeployment;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/ScanningProfileFactory.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/ScanningProfileFactory.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/ScanningProfileFactory.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -27,7 +27,7 @@
import java.util.Collection;
import org.jboss.profileservice.config.ProfileServiceConfig;
-import org.jboss.profileservice.deployment.ProfileDeploymentModificationChecker;
+import org.jboss.profileservice.deployment.hotdeploy.ProfileDeploymentModificationChecker;
import org.jboss.profileservice.profile.metadata.plugin.HotDeploymentProfileMetaData;
import org.jboss.profileservice.profile.metadata.plugin.PropertyProfileMetaData;
import org.jboss.profileservice.profile.metadata.plugin.PropertyProfileSourceMetaData;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -32,12 +32,12 @@
import org.jboss.profileservice.domain.spi.DomainFeatureNode;
import org.jboss.profileservice.domain.spi.DomainFeatureVisitor;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.profile.metadata.BasicProfileDeploymentMetaData;
import org.jboss.profileservice.profile.metadata.BasicSubProfileMetaData;
import org.jboss.profileservice.profile.metadata.CommonProfileNameSpaces;
import org.jboss.profileservice.profile.metadata.FeatureCapability;
import org.jboss.profileservice.profile.metadata.FileRepositorySourceConfiguration;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitor;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitorNode;
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-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -32,7 +32,7 @@
import org.jboss.profileservice.domain.spi.DomainFeatureNode;
import org.jboss.profileservice.domain.spi.DomainFeatureVisitor;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitor;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicSubProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicSubProfileMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicSubProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -24,7 +24,7 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
-import org.jboss.profileservice.metadata.helpers.AbstractSubProfileKeyMetaData;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractSubProfileKeyMetaData;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.dependency.DependencyMode;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -25,7 +25,7 @@
import javax.xml.bind.annotation.XmlType;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileRequirement;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileRequirement;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitor;
import org.jboss.profileservice.virtual.deployment.AbstractVirtualDeployment;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/domain/RequiredProfiles.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/domain/RequiredProfiles.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/domain/RequiredProfiles.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -33,9 +33,9 @@
import org.jboss.profileservice.domain.spi.DomainFeatureNode;
import org.jboss.profileservice.domain.spi.DomainFeatureVisitor;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
-import org.jboss.profileservice.metadata.helpers.AbstractSubProfileKeyMetaData;
import org.jboss.profileservice.profile.metadata.CommonProfileNameSpaces;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractSubProfileKeyMetaData;
import org.jboss.profileservice.spi.dependency.DependencyMode;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitorNode;
Copied: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers (from rev 102115, projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers)
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileCapability.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/AbstractProfileCapability.java 2010-03-09 07:26:39 UTC (rev 102115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileCapability.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.profileservice.metadata.helpers;
+package org.jboss.profileservice.profile.metadata.helpers;
import org.jboss.profileservice.spi.dependency.ProfileCapability;
import org.jboss.profileservice.version.helpers.NameAndVersionSupport;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileKeyCapability.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/AbstractProfileKeyCapability.java 2010-03-09 07:26:39 UTC (rev 102115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileKeyCapability.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.profileservice.metadata.helpers;
+package org.jboss.profileservice.profile.metadata.helpers;
import org.jboss.profileservice.spi.dependency.ProfileCapability;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileKeyMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/AbstractProfileKeyMetaData.java 2010-03-09 07:26:39 UTC (rev 102115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileKeyMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.profileservice.metadata.helpers;
+package org.jboss.profileservice.profile.metadata.helpers;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.metadata.ProfileKeyMetaData;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/AbstractProfileMetaData.java 2010-03-09 07:26:39 UTC (rev 102115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -19,10 +19,11 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.profileservice.metadata.helpers;
+package org.jboss.profileservice.profile.metadata.helpers;
import java.util.List;
+import org.jboss.profileservice.metadata.ProfileConfigurationExt;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitor;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitorNode;
@@ -33,7 +34,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public abstract class AbstractProfileMetaData extends AbstractProfileKeyCapability implements ProfileMetaData
+public abstract class AbstractProfileMetaData extends AbstractProfileKeyCapability implements ProfileMetaData, ProfileConfigurationExt
{
/** The features. */
@@ -54,6 +55,16 @@
this.features = features;
}
+ public boolean isCheckComplete()
+ {
+ return true;
+ }
+
+ public boolean isSupportRedeployment()
+ {
+ return false;
+ }
+
public void visit(ProfileMetaDataVisitor visitor)
{
// We provide a profile
@@ -69,7 +80,6 @@
}
}
- @Override
public boolean equals(Object obj)
{
if (obj == this)
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileRequirement.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/AbstractProfileRequirement.java 2010-03-09 07:26:39 UTC (rev 102115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractProfileRequirement.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.profileservice.metadata.helpers;
+package org.jboss.profileservice.profile.metadata.helpers;
import javax.xml.bind.annotation.XmlAttribute;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractSubProfileKeyMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/metadata/helpers/AbstractSubProfileKeyMetaData.java 2010-03-09 07:26:39 UTC (rev 102115)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/helpers/AbstractSubProfileKeyMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.profileservice.metadata.helpers;
+package org.jboss.profileservice.profile.metadata.helpers;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/ClassPathProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/ClassPathProfileMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/ClassPathProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -33,8 +33,8 @@
import org.jboss.profileservice.domain.spi.DomainFeatureNode;
import org.jboss.profileservice.domain.spi.DomainFeatureVisitor;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.profile.metadata.CommonProfileNameSpaces;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.repository.artifact.file.FileArtifactId;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitor;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/EmptyProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/EmptyProfileMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/EmptyProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -29,8 +29,8 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
-import org.jboss.profileservice.metadata.helpers.AbstractSubProfileKeyMetaData;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractSubProfileKeyMetaData;
import org.jboss.profileservice.spi.dependency.DependencyMode;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -33,8 +33,8 @@
import org.jboss.profileservice.domain.spi.DomainFeatureNode;
import org.jboss.profileservice.domain.spi.DomainFeatureVisitor;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.profile.metadata.CommonProfileNameSpaces;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -57,21 +57,18 @@
/** The source. */
private PropertyProfileSourceMetaData source;
- @Override
@XmlAttribute(name = "name")
public String getName()
{
return super.getName();
}
- @Override
@XmlTransient
public String getNameSpace()
{
return CommonProfileNameSpaces.IMMUTABLE_PROFILE_NAMESPACE;
}
- @Override
@XmlElement(name = "source", type = PropertyProfileSourceMetaData.class)
public PropertyProfileSourceMetaData getSource()
{
@@ -83,7 +80,24 @@
this.source = source;
}
- @Override
+ /**
+ * Enable redeployment.
+ */
+ public boolean isSupportRedeployment()
+ {
+ return true;
+ }
+
+ /**
+ * Check complete should be done externally, so that the
+ * profile can be installed - although all deployments
+ * might not be fully deployment due to errors.
+ */
+ public boolean isCheckComplete()
+ {
+ return false;
+ }
+
public void visit(DomainFeatureVisitor visitor)
{
visitor.addProfileMetaData(this);
@@ -93,7 +107,6 @@
* No, deployments defined - this profile configuration
* defines a profile, which scans the folder.
*/
- @XmlTransient
public List<ProfileDeploymentMetaData> getDeployments()
{
return Collections.emptyList();
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileSourceMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileSourceMetaData.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/plugin/PropertyProfileSourceMetaData.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -41,6 +41,16 @@
/** The upload dir. */
private boolean uploadPath;
+ public PropertyProfileSourceMetaData()
+ {
+ //
+ }
+
+ public PropertyProfileSourceMetaData(String path)
+ {
+ this.path = path;
+ }
+
@XmlTransient
public String getType()
{
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/LegacyHDScanningRepository.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/LegacyHDScanningRepository.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/legacy/LegacyHDScanningRepository.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -26,7 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.profileservice.deployment.ProfileDeploymentModificationChecker;
+import org.jboss.profileservice.deployment.hotdeploy.ProfileDeploymentModificationChecker;
import org.jboss.profileservice.repository.artifact.file.FileArtifactId;
import org.jboss.profileservice.spi.ModificationInfo;
import org.jboss.profileservice.spi.ProfileDeployment;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileCapability;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileRequirement;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileCapability;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileRequirement;
import org.jboss.profileservice.spi.dependency.ProfileCapability;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeploymentRequirement.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeploymentRequirement.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeploymentRequirement.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -21,7 +21,7 @@
*/
package org.jboss.profileservice.virtual.deployment;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileRequirement;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileRequirement;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
/**
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/resolver/support/TestProfile.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/resolver/support/TestProfile.java 2010-03-17 12:46:41 UTC (rev 102513)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/resolver/support/TestProfile.java 2010-03-17 13:13:04 UTC (rev 102514)
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.profileservice.metadata.helpers.AbstractProfileMetaData;
+import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.spi.dependency.ProfileCapability;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
More information about the jboss-cvs-commits
mailing list