[jboss-cvs] JBossAS SVN: r69901 - in projects/microcontainer/trunk/deployers-impl/src: tests/org/jboss/test/deployers/classloading/test and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 13:21:25 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 13:21:25 -0500 (Mon, 18 Feb 2008)
New Revision: 69901
Modified:
projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSService.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SecMetaData.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestServiceMetaDataICF.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/scope/support/TestComponentMetaDataRepositoryPopulator.java
Log:
Source code tidyup in the deployers-impl project
Modified: projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/sort/DominoOrdering.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -34,7 +34,7 @@
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
* @param <T> exact domino type
*/
-public class DominoOrdering<T extends Domino>
+public class DominoOrdering<T extends Domino<?>>
{
protected String message;
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -82,20 +82,20 @@
super(name);
}
- protected Class assertLoadClass(ClassLoader start, Class reference) throws Exception
+ protected Class<?> assertLoadClass(ClassLoader start, Class<?> reference) throws Exception
{
return assertLoadClass(start, reference, start);
}
- protected Class assertLoadClass(ClassLoader start, Class reference, ClassLoader expected) throws Exception
+ protected Class<?> assertLoadClass(ClassLoader start, Class<?> reference, ClassLoader expected) throws Exception
{
- Class clazz = start.loadClass(reference.getName());
+ Class<?> clazz = start.loadClass(reference.getName());
if (expected != null)
assertEquals(expected, clazz.getClassLoader());
return clazz;
}
- protected void assertLoadClassFail(ClassLoader start, Class reference) throws Exception
+ protected void assertLoadClassFail(ClassLoader start, Class<?> reference) throws Exception
{
try
{
@@ -108,7 +108,7 @@
}
}
- protected void assertLoadClassIllegal(ClassLoader start, Class reference) throws Exception
+ protected void assertLoadClassIllegal(ClassLoader start, Class<?> reference) throws Exception
{
try
{
@@ -134,24 +134,24 @@
}
}
- protected static ClassLoaderMetaData addClassLoaderMetaData(Deployment deployment, Version version, Class... packages)
+ protected static ClassLoaderMetaData addClassLoaderMetaData(Deployment deployment, Version version, Class<?>... packages)
{
return addClassLoaderMetaData(deployment, version, false, packages);
}
- protected static ClassLoaderMetaData addClassLoaderMetaData(Deployment deployment, Version version, boolean useVersionOnPackages, Class... packages)
+ protected static ClassLoaderMetaData addClassLoaderMetaData(Deployment deployment, Version version, boolean useVersionOnPackages, Class<?>... packages)
{
ClassLoaderMetaData classLoaderMetaData = createMetaData(deployment, version, useVersionOnPackages, packages);
addMetaData(deployment, classLoaderMetaData);
return classLoaderMetaData;
}
- protected static ClassLoaderMetaData createMetaData(Deployment deployment, Version version, Class... packages)
+ protected static ClassLoaderMetaData createMetaData(Deployment deployment, Version version, Class<?>... packages)
{
return createMetaData(deployment, version, false, packages);
}
- protected static ClassLoaderMetaData createMetaData(Deployment deployment, Version version, boolean useVersionOnPackages, Class... packages)
+ protected static ClassLoaderMetaData createMetaData(Deployment deployment, Version version, boolean useVersionOnPackages, Class<?>... packages)
{
ClassLoaderMetaData classLoaderMetaData = new ClassLoaderMetaData();
classLoaderMetaData.setName(deployment.getName());
@@ -162,7 +162,7 @@
if (packages != null)
{
- for (Class pkg : packages)
+ for (Class<?> pkg : packages)
{
if (useVersionOnPackages)
capability = new PackageCapabilityImpl(pkg.getName(), version);
@@ -189,7 +189,7 @@
requirements.add(requirement);
}
- protected static void addRequirePackage(ClassLoaderMetaData classLoaderMetaData, Class pck, VersionRange versionRange)
+ protected static void addRequirePackage(ClassLoaderMetaData classLoaderMetaData, Class<?> pck, VersionRange versionRange)
{
List<Requirement> requirements = classLoaderMetaData.getRequirements();
if (requirements == null)
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -49,6 +49,7 @@
values.add(SimpleValueSupport.wrap("tx-connection-factory"));
}
+ @SuppressWarnings("unchecked")
public void populateManagedProperty(Class attachmentClass, PropertyInfo info, Fields fields)
{
fields.setField(Fields.LEGAL_VALUES, values);
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -49,6 +49,7 @@
values.add(new EnumValueSupport(TYPE, TxSupportMetaData.XA));
}
+ @SuppressWarnings("unchecked")
public void populateManagedProperty(Class attachmentClass, PropertyInfo info, Fields fields)
{
fields.setField(Fields.LEGAL_VALUES, values);
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSService.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSService.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSService.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.deployers.deployer.support;
-import java.io.Serializable;
-
import org.jboss.managed.api.ManagedOperation.Impact;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementObjectID;
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SecMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SecMetaData.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SecMetaData.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -24,7 +24,7 @@
/**
* The domain value refers to a security domain component if type is either
* DOMAIN, DOMAIN_AND_APPLICATION
- * @return
+ * @return the domain
*/
@ManagementProperty(name="domain-name")
@ManagementObjectRef(type="SecurityDomain")
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestServiceMetaDataICF.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestServiceMetaDataICF.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestServiceMetaDataICF.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -41,6 +41,7 @@
/** The meta value factory */
private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
+ @SuppressWarnings("unchecked")
public Class<? extends Serializable> getManagedObjectClass(TestServiceMetaData instance)
throws ClassNotFoundException
{
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/MockProfileService.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -121,6 +121,7 @@
* @param mo
* @param md -
*/
+ @SuppressWarnings("unchecked")
protected void processManagedObject(ManagedObject mo, ManagedDeployment md)
{
String key = mo.getName() + "/" + mo.getNameType();
@@ -251,6 +252,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected Object getRefName(Object value)
{
if (value instanceof MetaValue)
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -21,9 +21,7 @@
*/
package org.jboss.test.deployers.managed.support;
-import java.util.Collection;
import java.util.Map;
-import java.util.Set;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -144,6 +144,7 @@
* Validate the ManagedObjectFactory for DSMetaData class
*
*/
+ @SuppressWarnings("unchecked")
public void testDSMetaDataManagedObjectFactory()
{
ManagedObjectFactory mof = ManagedObjectFactory.getInstance();
@@ -188,6 +189,7 @@
* Validate the ManagedObjectFactory for DSMetaData instance
*
*/
+ @SuppressWarnings("unchecked")
public void testDSMetaDataManagedObjectFactoryInit()
{
ManagedObjectFactory mof = ManagedObjectFactory.getInstance();
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/scope/support/TestComponentMetaDataRepositoryPopulator.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/scope/support/TestComponentMetaDataRepositoryPopulator.java 2008-02-18 18:15:48 UTC (rev 69900)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/scope/support/TestComponentMetaDataRepositoryPopulator.java 2008-02-18 18:21:25 UTC (rev 69901)
@@ -27,7 +27,6 @@
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
import org.jboss.metadata.spi.MutableMetaData;
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.ScopeKey;
More information about the jboss-cvs-commits
mailing list