Index: deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java =================================================================== --- deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java (revision 34226) +++ deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java (working copy) @@ -36,7 +36,7 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.Param; import org.glassfish.api.I18n; import org.glassfish.internal.deployment.Deployment; @@ -106,7 +106,7 @@ } - Named module = ConfigBeansUtilities.getModule(applicationName); + ApplicationName module = ConfigBeansUtilities.getModule(applicationName); Application application = null; if (module instanceof Application) { Index: deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java =================================================================== --- deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java (revision 34226) +++ deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java (working copy) @@ -37,7 +37,7 @@ import org.glassfish.api.deployment.StateCommandParameters; import org.glassfish.api.deployment.UndeployCommandParameters; import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.internal.deployment.Deployment; import org.glassfish.internal.deployment.ExtendedDeploymentContext; import org.glassfish.internal.data.ApplicationInfo; @@ -108,7 +108,7 @@ commandParams.name = this.name(); final ExtendedDeploymentContext deploymentContext = deployment.getBuilder(logger, commandParams, report).source(appInfo.getSource()).build(); - Named module = ConfigBeansUtilities.getModule(name()); + ApplicationName module = ConfigBeansUtilities.getModule(name()); Application application = null; if (module instanceof Application) { application = (Application) module; Index: deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java =================================================================== --- deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java (revision 34226) +++ deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java (working copy) @@ -36,7 +36,7 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.Param; import org.glassfish.api.I18n; import org.glassfish.api.container.Sniffer; @@ -77,7 +77,7 @@ ActionReport.MessagePart part = report.getTopMessagePart(); int numOfApplications = 0; - for (Named module : applications.getModules()) { + for (ApplicationName module : applications.getModules()) { if (module instanceof Application) { final Application app = (Application)module; if (app.getObjectType().equals("user")) { Index: deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java =================================================================== --- deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java (revision 34226) +++ deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java (working copy) @@ -28,7 +28,7 @@ import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.StateCommandParameters; import org.glassfish.api.deployment.DeployCommandParameters; @@ -112,7 +112,7 @@ ApplicationConfigInfo savedAppConfig = null; try { Application app = null; - for (Named module : applications.getModules()) { + for (ApplicationName module : applications.getModules()) { if (module.getName().equals(name())) { app = (Application)module; break; Index: deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java =================================================================== --- deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java (revision 34226) +++ deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java (working copy) @@ -44,7 +44,7 @@ import com.sun.enterprise.config.serverbeans.Engine; import com.sun.enterprise.config.serverbeans.Module; import com.sun.enterprise.config.serverbeans.ServerTags; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import com.sun.enterprise.util.LocalStringManagerImpl; import org.jvnet.hk2.annotations.Scoped; import org.jvnet.hk2.component.PerLookup; @@ -95,10 +95,10 @@ return true; } - Named named = ConfigBeansUtilities.getModule(name); + ApplicationName ApplicationName = ConfigBeansUtilities.getModule(name); Application app = null; - if (named instanceof Application) { - app = (Application) named; + if (ApplicationName instanceof Application) { + app = (Application) ApplicationName; } if (app != null) { if (!app.isStandaloneModule()) { Index: core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java =================================================================== --- core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java (revision 34226) +++ core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java (working copy) @@ -56,7 +56,7 @@ import java.util.logging.Logger; import org.glassfish.api.ActionReport; import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.deployment.common.DeploymentProperties; import org.jvnet.hk2.component.Habitat; @@ -101,7 +101,7 @@ private void initAppReloadInfo(Applications applications) throws URISyntaxException { appReloadInfo = new HashMap(); logger.fine("[Reloader] Preparing list of apps to monitor:"); - for (Named m : applications.getModules()) { + for (ApplicationName m : applications.getModules()) { if (m instanceof Application) { Application app = (Application) m; if (Boolean.valueOf(app.getDeployProperties().getProperty @@ -154,7 +154,7 @@ */ Set possiblyUndeployedApps = new HashSet(appReloadInfo.values()); - for (Named m : applications.getModules()) { + for (ApplicationName m : applications.getModules()) { if (m instanceof Application) { Application app = (Application) m; if (Boolean.valueOf(app.getDeployProperties().getProperty Index: core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java =================================================================== --- core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java (revision 34226) +++ core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java (working copy) @@ -37,7 +37,7 @@ import org.glassfish.server.ServerEnvironmentImpl; import com.sun.enterprise.config.serverbeans.*; import org.jvnet.hk2.config.types.Property; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import com.sun.enterprise.deploy.shared.ArchiveFactory; import com.sun.enterprise.module.Module; import com.sun.enterprise.module.ModulesRegistry; @@ -922,7 +922,7 @@ } // remove application element - for (Named module : apps.getModules()) { + for (ApplicationName module : apps.getModules()) { if (module.getName().equals(appName)) { ((Applications)params[0]).getModules().remove(module); break; Index: common/glassfish-api/src/main/java/org/glassfish/api/admin/config/ApplicationName.java =================================================================== --- common/glassfish-api/src/main/java/org/glassfish/api/admin/config/ApplicationName.java (revision 34226) +++ common/glassfish-api/src/main/java/org/glassfish/api/admin/config/ApplicationName.java (working copy) @@ -4,7 +4,6 @@ import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; -import javax.validation.constraints.NotNull; import java.beans.PropertyVetoException; /** @@ -13,19 +12,16 @@ * @author Nandini Ektare */ @Configured -public interface ApplicationName extends Named { +public interface ApplicationName extends ConfigBeanProxy { /** * Name of the configured object * * @return name of the configured object */ - @Override - @NotNull - @Attribute(required=true) + @Attribute(key=true) public String getName(); - @Override public void setName(String value) throws PropertyVetoException; } Index: admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java =================================================================== --- admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java (revision 34226) +++ admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java (working copy) @@ -37,17 +37,17 @@ package com.sun.enterprise.configapi.tests; import org.junit.Test; -import org.junit.Ignore; import static org.junit.Assert.*; import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.EjbModule; import java.util.List; import java.beans.PropertyVetoException; +import org.glassfish.api.admin.config.ApplicationName; /** * User: Jerome Dochez @@ -75,7 +75,7 @@ ConfigSupport.apply(new SingleConfigCode() { public Object run(Applications param) throws PropertyVetoException, TransactionFailure { // this is the bug, we should not get the list from apps but from param. - List modules = apps.getModules(); + List modules = apps.getModules(); EjbModule m = param.createChild(EjbModule.class); modules.add(m); // should throw an exception return m; @@ -89,7 +89,7 @@ assertTrue(apps!=null); ConfigSupport.apply(new SingleConfigCode() { public Object run(Applications param) throws PropertyVetoException, TransactionFailure { - List modules = param.getModules(); + List modules = param.getModules(); EjbModule m = param.createChild(EjbModule.class); m.setName( "ejb-test" ); m.setLocation("test-location"); Index: admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java =================================================================== --- admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java (revision 34226) +++ admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java (working copy) @@ -38,7 +38,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.jvnet.hk2.config.*; import com.sun.enterprise.config.serverbeans.*; @@ -65,8 +65,8 @@ @Test public void getModulesTest() { Applications apps = getHabitat().getComponent(Applications.class); - List modules = apps.getModules(); - for (Named module : modules) { + List modules = apps.getModules(); + for (ApplicationName module : modules) { logger.fine("Module = " + module.getName()); } assertTrue(modules!=null); Index: admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java =================================================================== --- admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java (revision 34226) +++ admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java (working copy) @@ -37,7 +37,7 @@ package com.sun.enterprise.configapi.tests; import com.sun.enterprise.config.serverbeans.Applications; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; @@ -54,7 +54,7 @@ return "DomainTest"; } - Collection modules = null; + Collection modules = null; @Before public void setup() { @@ -67,7 +67,7 @@ @Test public void modulesTest() { - for (Named module : modules) { + for (ApplicationName module : modules) { logger.fine("Found module " + module.getName()); assertTrue(module.getName()!=null); } Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java (working copy) @@ -46,9 +46,10 @@ import java.net.URISyntaxException; import java.net.URI; +import javax.validation.constraints.NotNull; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.RestRedirect; @@ -56,23 +57,10 @@ import org.glassfish.quality.ToDo; import org.jvnet.hk2.component.Injectable; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.DuckTyped; import org.jvnet.hk2.config.Element; -import javax.validation.constraints.NotNull; - -/** - * - */ - -/* @XmlType(name = "", propOrder = { - "description", - "engine", - "property" -}) */ - @Configured @RestRedirects( { @@ -80,7 +68,7 @@ @RestRedirect(opType= RestRedirect.OpType.POST, commandName = "redeploy") } ) -public interface Application extends ConfigBeanProxy, Injectable, Named, PropertyBag { +public interface Application extends Injectable, ApplicationName, PropertyBag { /** * Gets the value of the contextRoot property. @@ -106,7 +94,6 @@ * {@link String } */ @Attribute - @NotNull String getLocation(); /** Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbModule.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbModule.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/EjbModule.java (working copy) @@ -41,7 +41,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.component.Injectable; @@ -52,20 +51,8 @@ import org.jvnet.hk2.config.types.PropertyBag; import org.glassfish.quality.ToDo; -import javax.validation.constraints.NotNull; - -/** - * - */ - -/* @XmlType(name = "", propOrder = { - "description", - "webServiceEndpoint", - "property" -}) */ - @Configured -public interface EjbModule extends ConfigBeanProxy, Injectable, ApplicationName, PropertyBag { +public interface EjbModule extends Injectable, ApplicationName, PropertyBag { /** * Gets the value of the location property. @@ -74,7 +61,6 @@ * {@link String } */ @Attribute - @NotNull String getLocation(); /** Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ExtensionModule.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ExtensionModule.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ExtensionModule.java (working copy) @@ -40,27 +40,20 @@ import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.component.Injectable; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; import java.beans.PropertyVetoException; import java.util.List; - import javax.validation.constraints.NotNull; -/* @XmlType(name = "", propOrder = { - "description", - "property" -}) */ - @Configured -public interface ExtensionModule extends ConfigBeanProxy, Injectable, Named, PropertyBag { +public interface ExtensionModule extends Injectable, ApplicationName, PropertyBag { /** @@ -70,7 +63,6 @@ * {@link String } */ @Attribute - @NotNull String getLocation(); /** Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SystemApplications.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SystemApplications.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SystemApplications.java (working copy) @@ -42,7 +42,7 @@ import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.component.Injectable; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import java.util.List; @@ -69,6 +69,6 @@ * {@link Application } */ @Element("*") - public List getModules(); + public List getModules(); } Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Domain.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Domain.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Domain.java (working copy) @@ -39,7 +39,7 @@ package com.sun.enterprise.config.serverbeans; import org.jvnet.hk2.config.types.PropertyBag; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.admin.config.PropertiesDesc; import org.jvnet.hk2.config.types.Property; import org.glassfish.api.admin.config.PropertyDesc; @@ -378,7 +378,7 @@ List allSysApps = new ArrayList(); SystemApplications sa = me.getSystemApplications(); if (sa != null) { - for (Named m : sa.getModules()) { + for (ApplicationName m : sa.getModules()) { if (m instanceof Application) allSysApps.add((Application)m); } Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/J2eeApplication.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/J2eeApplication.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/J2eeApplication.java (working copy) @@ -41,7 +41,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.component.Injectable; import java.beans.PropertyVetoException; @@ -52,20 +51,8 @@ import org.jvnet.hk2.config.types.PropertyBag; import org.glassfish.quality.ToDo; -import javax.validation.constraints.NotNull; - -/** - * - */ - -/* @XmlType(name = "", propOrder = { - "description", - "webServiceEndpoint", - "property" -}) */ - @Configured(name="j2ee-application") // name is necessary as hk2 name mangling will create j2-ee-application -public interface J2eeApplication extends ConfigBeanProxy, Injectable, ApplicationName, PropertyBag { +public interface J2eeApplication extends Injectable, ApplicationName, PropertyBag { /** * Gets the value of the location property. @@ -74,7 +61,6 @@ * {@link String } */ @Attribute - @NotNull String getLocation(); /** Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectorModule.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectorModule.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConnectorModule.java (working copy) @@ -39,7 +39,6 @@ package com.sun.enterprise.config.serverbeans; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.component.Injectable; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; @@ -52,19 +51,8 @@ import org.jvnet.hk2.config.types.PropertyBag; import org.glassfish.quality.ToDo; -import javax.validation.constraints.NotNull; - -/** - * - */ - -/* @XmlType(name = "", propOrder = { - "description", - "property" -}) */ - @Configured -public interface ConnectorModule extends ConfigBeanProxy, Injectable, ApplicationName, PropertyBag { +public interface ConnectorModule extends Injectable, ApplicationName, PropertyBag { /** * Gets the value of the location property. @@ -73,7 +61,6 @@ * {@link String } */ @Attribute - @NotNull String getLocation(); /** Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LifecycleModule.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LifecycleModule.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LifecycleModule.java (working copy) @@ -41,7 +41,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.component.Injectable; import java.beans.PropertyVetoException; @@ -64,7 +63,7 @@ }) */ @Configured -public interface LifecycleModule extends ConfigBeanProxy, Injectable, ApplicationName, PropertyBag { +public interface LifecycleModule extends Injectable, ApplicationName, PropertyBag { /** * Gets the value of the className property. Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java (working copy) @@ -31,7 +31,7 @@ import java.io.PrintWriter; import java.io.StringWriter; -import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.ApplicationName; import org.jvnet.hk2.annotations.Inject; import org.jvnet.hk2.annotations.Service; @@ -175,7 +175,7 @@ List allSysApps = new ArrayList(); SystemApplications sa = domain.getSystemApplications(); if (sa != null) { - for (Named m : sa.getModules()) { + for (ApplicationName m : sa.getModules()) { if (m instanceof Application) allSysApps.add((Application)m); } @@ -211,13 +211,13 @@ } } if (theServer != null) { - List modulesToExclude = excludeSystemApps ? - domain.getSystemApplications().getModules() : Collections.emptyList(); + List modulesToExclude = excludeSystemApps ? + domain.getSystemApplications().getModules() : Collections.emptyList(); List result = new ArrayList(); for (ApplicationRef candidateRef : theServer.getApplicationRef()) { String appRefModuleName = candidateRef.getRef(); boolean isSystem = false; - for (Named sysModule : modulesToExclude) { + for (ApplicationName sysModule : modulesToExclude) { if (sysModule.getName().equals(appRefModuleName)) { isSystem = true; break; @@ -257,8 +257,8 @@ return ( aref ); } - public static Named getModule(String moduleID) { - for (Named module : apps.getModules()) { + public static ApplicationName getModule(String moduleID) { + for (ApplicationName module : apps.getModules()) { if (module.getName().equals(moduleID)) { return module; } @@ -285,7 +285,7 @@ } public static String getContextRoot(String moduleID) { - Named module = getModule(moduleID); + ApplicationName module = getModule(moduleID); if (module == null) { return null; } @@ -300,7 +300,7 @@ } public static String getLibraries(String moduleID) { - Named module = getModule(moduleID); + ApplicationName module = getModule(moduleID); if (module == null) { return null; } @@ -319,7 +319,7 @@ } public static String getLocation(String moduleID) { - Named module = getModule(moduleID); + ApplicationName module = getModule(moduleID); if (module == null) { return null; } @@ -351,7 +351,7 @@ } public static String getDirectoryDeployed(String moduleID) { - Named module = getModule(moduleID); + ApplicationName module = getModule(moduleID); if (module == null) { return null; } Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourceAdapterConfig.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourceAdapterConfig.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourceAdapterConfig.java (working copy) @@ -85,7 +85,6 @@ * {@link String } */ @Attribute - @NotNull public String getName(); /** @@ -137,7 +136,6 @@ * {@link String } */ @Attribute(key=true) - @NotNull @Pattern(regexp="[^':,][^':,]*") public String getResourceAdapterName(); Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/WebModule.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/WebModule.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/WebModule.java (working copy) @@ -38,7 +38,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; import org.jvnet.hk2.component.Injectable; @@ -49,20 +48,9 @@ import org.glassfish.api.admin.config.*; import org.glassfish.quality.ToDo; -import javax.validation.constraints.NotNull; -/** - * - */ - -/* @XmlType(name = "", propOrder = { - "description", - "webServiceEndpoint", - "property" -}) */ - @Configured -public interface WebModule extends ConfigBeanProxy, Injectable, ApplicationName, PropertyBag { +public interface WebModule extends Injectable, ApplicationName, PropertyBag { /** * Gets the value of the contextRoot property. @@ -94,7 +82,6 @@ * {@link String } */ @Attribute - @NotNull public String getLocation(); /** Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Applications.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Applications.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Applications.java (working copy) @@ -38,7 +38,6 @@ package com.sun.enterprise.config.serverbeans; -import org.glassfish.api.admin.config.Named; import org.glassfish.api.admin.RestRedirect; import org.jvnet.hk2.component.Injectable; import org.jvnet.hk2.config.ConfigBeanProxy; @@ -47,6 +46,7 @@ import org.jvnet.hk2.config.Element; import java.util.*; +import org.glassfish.api.admin.config.ApplicationName; /** * @@ -75,7 +75,7 @@ */ @Element("*") @RestRedirect(opType= RestRedirect.OpType.PUT, commandName="deploy") - public List getModules(); + public List getModules(); /** * Gets a subset of {@link #getModules()} that has the given type. @@ -113,7 +113,7 @@ return null; } - for (Named module : apps.getModules()) + for (ApplicationName module : apps.getModules()) if (type.isInstance(module) && module.getName().equals(moduleID)) return type.cast(module); Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AppclientModule.java =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AppclientModule.java (revision 34226) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AppclientModule.java (working copy) @@ -52,9 +52,6 @@ import java.beans.PropertyVetoException; import java.util.List; -import javax.validation.constraints.NotNull; - - @Configured public interface AppclientModule extends Injectable, ApplicationName, PropertyBag { @@ -65,7 +62,6 @@ * {@link String } */ @Attribute - @NotNull String getLocation(); /**