[jboss-cvs] JBossAS SVN: r87932 - in branches/Branch_5_x/system/src: tests/org/jboss/test/server/profileservice/support and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 28 04:45:03 EDT 2009
Author: emuckenhuber
Date: 2009-04-28 04:45:03 -0400 (Tue, 28 Apr 2009)
New Revision: 87932
Modified:
branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/FilteredProfileMetaData.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/ProfilesMetaData.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/XmlProfileFactory.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/ProfileParsingUnitTestCase.java
Log:
add propOrder to xml metadata
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/AbstractProfileMetaData.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
import org.jboss.profileservice.spi.metadata.SubProfileMetaData;
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/FilteredProfileMetaData.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/FilteredProfileMetaData.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/FilteredProfileMetaData.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.profileservice.spi.metadata.SubProfileMetaData;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -38,6 +39,7 @@
*/
@JBossXmlSchema(namespace="urn:jboss:profileservice:profile:filtered:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name = "profile")
+ at XmlType(name = "profileType", propOrder = {"source", "subprofiles", "deployments"})
public class FilteredProfileMetaData extends BasicProfileMetaData
{
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/HotDeploymentProfileMetaData.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -28,9 +28,9 @@
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
-import org.jboss.profileservice.spi.metadata.ProfileSourceMetaData;
import org.jboss.profileservice.spi.metadata.SubProfileMetaData;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -42,11 +42,12 @@
*/
@JBossXmlSchema(namespace="urn:jboss:profileservice:profile:hotdeployment:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name = "hotdeployment-profile")
+ at XmlType(name = "profileType", propOrder = {"source", "subprofiles"})
public class HotDeploymentProfileMetaData extends AbstractProfileMetaData
{
/** The profile source. */
- private ProfileSourceMetaData source;
+ private HotDeploymentProfileSourceMetaData source;
public HotDeploymentProfileMetaData()
{
@@ -64,12 +65,12 @@
}
@XmlElement(name = "profile-source", type = HotDeploymentProfileSourceMetaData.class)
- public ProfileSourceMetaData getSource()
+ public HotDeploymentProfileSourceMetaData getSource()
{
return source;
}
- public void setSource(ProfileSourceMetaData source)
+ public void setSource(HotDeploymentProfileSourceMetaData source)
{
this.source = source;
}
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/ProfilesMetaData.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/ProfilesMetaData.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profile/repository/metadata/ProfilesMetaData.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -29,6 +29,7 @@
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.profileservice.spi.metadata.ProfileKeyMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
@@ -48,6 +49,7 @@
namespace= "urn:jboss:profileservice:profiles:1.0",
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
+ at XmlType(name = "profilesType", propOrder = {"name", "server", "domain", "profiles"})
public class ProfilesMetaData implements ProfileKeyMetaData
{
/** The name. */
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.system.server.profile.repository.metadata.BasicProfileMetaData;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -33,6 +34,7 @@
*/
@JBossXmlSchema(namespace="urn:jboss:profileservice:profile:maven:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name = "maven-profile")
+ at XmlType(name = "profileType", propOrder = {"source", "subprofiles", "deployments"})
public class MavenProfileMetaData extends BasicProfileMetaData
{
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/XmlProfileFactory.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/XmlProfileFactory.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/support/XmlProfileFactory.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -43,7 +43,6 @@
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
/**
* A profile factory based which generates the ProfileMetaData based on .xml files.
@@ -69,7 +68,7 @@
private Collection<ProfileKey> processedProfileKeys = new ArrayList<ProfileKey>();
/** The default schema resolver. */
- private static final DefaultSchemaResolver resolver = (DefaultSchemaResolver) SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+ private static final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
static
{
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/ProfileParsingUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/ProfileParsingUnitTestCase.java 2009-04-28 08:44:09 UTC (rev 87931)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/test/ProfileParsingUnitTestCase.java 2009-04-28 08:45:03 UTC (rev 87932)
@@ -31,7 +31,6 @@
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
/**
@@ -43,7 +42,7 @@
public class ProfileParsingUnitTestCase extends AbstractProfileServiceTestBase
{
- private static final DefaultSchemaResolver resolver = (DefaultSchemaResolver) SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+ private static final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
static
{
More information about the jboss-cvs-commits
mailing list