[jboss-cvs] JBossAS SVN: r83761 - in trunk/system/src/main/org/jboss/system/server: profile/repository/metadata and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 2 03:02:41 EST 2009
Author: emuckenhuber
Date: 2009-02-02 03:02:41 -0500 (Mon, 02 Feb 2009)
New Revision: 83761
Added:
trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java
Modified:
trunk/system/src/main/org/jboss/system/server/profile/repository/AbstractProfile.java
trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/BasicProfileMetaData.java
trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java
trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/ImmutableProfileMetaData.java
trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractProfileFactory.java
trunk/system/src/main/org/jboss/system/server/profileservice/repository/TypedProfileRepository.java
Log:
update profile meta data.
Modified: trunk/system/src/main/org/jboss/system/server/profile/repository/AbstractProfile.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/AbstractProfile.java 2009-02-02 06:10:57 UTC (rev 83760)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/AbstractProfile.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -171,7 +171,7 @@
public void destroy()
{
- // nothing here
+ this.repository.unload();
}
public String toString()
Added: trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java (rev 0)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.system.server.profile.repository.metadata;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+import org.jboss.profileservice.spi.metadata.ProfileMetaData;
+import org.jboss.profileservice.spi.metadata.ProfileSourceMetaData;
+import org.jboss.profileservice.spi.metadata.SubProfileMetaData;
+
+/**
+ * The abstract profile meta data.
+ *
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public abstract class AbstractProfileMetaData implements ProfileMetaData
+{
+
+ /** The profile name. */
+ private String name;
+
+ /** The server. */
+ private String server;
+
+ /** The doamin. */
+ private String domain;
+
+ /** The profile sources. */
+ private ProfileSourceMetaData source;
+
+ /** The sub profiles. */
+ private List<SubProfileMetaData> subprofiles;
+
+ @XmlAttribute(name = "name")
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlAttribute(name = "server")
+ public String getServer()
+ {
+ return server;
+ }
+
+ public void setServer(String server)
+ {
+ this.server = server;
+ }
+
+ @XmlAttribute(name = "domain")
+ public String getDomain()
+ {
+ return domain;
+ }
+
+ public void setDomain(String domain)
+ {
+ this.domain = domain;
+ }
+
+ @XmlElement(name = "profile-source", type = FilteredProfileSourceMetaData.class)
+ public ProfileSourceMetaData getSource()
+ {
+ return source;
+ }
+
+ public void setSource(ProfileSourceMetaData source)
+ {
+ this.source = source;
+ }
+
+ @XmlElement(name = "sub-profile", type = BasicSubProfileMetaData.class)
+ public List<SubProfileMetaData> getSubprofiles()
+ {
+ return subprofiles;
+ }
+
+ public void setSubprofiles(List<SubProfileMetaData> subprofiles)
+ {
+ this.subprofiles = subprofiles;
+ }
+
+}
Modified: trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/BasicProfileMetaData.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/BasicProfileMetaData.java 2009-02-02 06:10:57 UTC (rev 83760)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/BasicProfileMetaData.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -23,94 +23,20 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
-import org.jboss.profileservice.spi.metadata.ProfileMetaData;
-import org.jboss.profileservice.spi.metadata.ProfileSourceMetaData;
-import org.jboss.profileservice.spi.metadata.SubProfileMetaData;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class BasicProfileMetaData implements ProfileMetaData
+public class BasicProfileMetaData extends AbstractProfileMetaData
{
-
- /** The profile name. */
- private String name;
- /** The server. */
- private String server;
-
- /** The doamin. */
- private String domain;
-
- /** The profile sources. */
- private ProfileSourceMetaData source;
-
- /** The sub profiles. */
- private List<SubProfileMetaData> subprofiles;
-
/** The deployments. */
private List<ProfileDeploymentMetaData> deployments;
- @XmlAttribute(name = "name")
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlAttribute(name = "server")
- public String getServer()
- {
- return server;
- }
-
- public void setServer(String server)
- {
- this.server = server;
- }
-
- @XmlAttribute(name = "domain")
- public String getDomain()
- {
- return domain;
- }
-
- public void setDomain(String domain)
- {
- this.domain = domain;
- }
-
- @XmlElement(name = "profile-source", type = FilteredProfileSourceMetaData.class)
- public ProfileSourceMetaData getSource()
- {
- return source;
- }
-
- public void setSource(ProfileSourceMetaData source)
- {
- this.source = source;
- }
-
- @XmlElement(name = "sub-profile", type = BasicSubProfileMetaData.class)
- public List<SubProfileMetaData> getSubprofiles()
- {
- return subprofiles;
- }
-
- public void setSubprofiles(List<SubProfileMetaData> subprofiles)
- {
- this.subprofiles = subprofiles;
- }
-
@XmlElement(name = "deployment", type = BasicProfileDeploymentMetaData.class)
public List<ProfileDeploymentMetaData> getDeployments()
{
Modified: trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java 2009-02-02 06:10:57 UTC (rev 83760)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -21,9 +21,13 @@
*/
package org.jboss.system.server.profile.repository.metadata;
+import java.util.Collections;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
import org.jboss.xb.annotations.JBossXmlSchema;
/**
@@ -34,8 +38,17 @@
*/
@JBossXmlSchema(namespace="urn:jboss:profileservice:profile:hotdeployment:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name = "hotdeployment-profile")
-public class HotDeploymentProfileMetaData extends BasicProfileMetaData
+public class HotDeploymentProfileMetaData extends AbstractProfileMetaData
{
+ /**
+ * There cannot be any specific deployments for a
+ * hot deployment profile, as it will scan the folders.
+ */
+ public List<ProfileDeploymentMetaData> getDeployments()
+ {
+ return Collections.EMPTY_LIST;
+ }
+
}
Modified: trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/ImmutableProfileMetaData.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/ImmutableProfileMetaData.java 2009-02-02 06:10:57 UTC (rev 83760)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/metadata/ImmutableProfileMetaData.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -21,15 +21,29 @@
*/
package org.jboss.system.server.profile.repository.metadata;
+import java.util.Collections;
+import java.util.List;
+import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
+
+
/**
* The meta data defining a immutable profile.
*
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ImmutableProfileMetaData extends BasicProfileMetaData
+public class ImmutableProfileMetaData extends AbstractProfileMetaData
{
+ /**
+ * There cannot be any specific deployments for a
+ * immutable profile, as it will scan the folders.
+ */
+ public List<ProfileDeploymentMetaData> getDeployments()
+ {
+ return Collections.EMPTY_LIST;
+ }
+
}
Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractProfileFactory.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractProfileFactory.java 2009-02-02 06:10:57 UTC (rev 83760)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractProfileFactory.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -27,6 +27,7 @@
import org.jboss.profileservice.spi.DeploymentRepository;
import org.jboss.profileservice.spi.Profile;
+import org.jboss.profileservice.spi.ProfileFactory;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileRepository;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
@@ -41,7 +42,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class AbstractProfileFactory
+public class AbstractProfileFactory implements ProfileFactory
{
/** The deployment repository factory. */
private ProfileRepository profileRepository;
Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/TypedProfileRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/TypedProfileRepository.java 2009-02-02 06:10:57 UTC (rev 83760)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/TypedProfileRepository.java 2009-02-02 08:02:41 UTC (rev 83761)
@@ -49,8 +49,6 @@
*/
public class TypedProfileRepository implements ProfileRepository
{
- /** The default repository type. */
- private static final String IMMUTABLE_TYPE = DefaultDeploymentRepositoryFactory.IMMUTABLE_TYPE;
/** The repository factories. */
private Map<String, DeploymentRepositoryFactory> repositoryFactories = new ConcurrentHashMap<String, DeploymentRepositoryFactory>();
@@ -151,4 +149,5 @@
for(String type : factory.getTypes())
this.repositoryFactories.remove(type);
}
+
}
More information about the jboss-cvs-commits
mailing list