You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/01/28 06:16:33 UTC
svn commit: r1064460 - in /geronimo/server/branches/3.0-M2/plugins: ./
aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/
client/client/src/main/history/
client/geronimo-client-builder/src/main/java/org/apache/geronimo/client...
Author: djencks
Date: Fri Jan 28 05:16:31 2011
New Revision: 1064460
URL: http://svn.apache.org/viewvc?rev=1064460&view=rev
Log:
XBEAN-162 update to genericed xbean-finder apis Merge from trunk rev 1064433
Added:
geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/context/
- copied from r1064433, geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/context/
Modified:
geronimo/server/branches/3.0-M2/plugins/ (props changed)
geronimo/server/branches/3.0-M2/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java (props changed)
geronimo/server/branches/3.0-M2/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M2/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/ (props changed)
geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java (props changed)
geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java (props changed)
geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java (props changed)
geronimo/server/branches/3.0-M2/plugins/connector-1_6/ (props changed)
geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/ (props changed)
geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/ (props changed)
geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java
geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java
geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java
geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WebServiceContextAnnotationHelper.java
geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
geronimo/server/branches/3.0-M2/plugins/openejb/ (props changed)
geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java (props changed)
geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/ (props changed)
geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
geronimo/server/branches/3.0-M2/plugins/system-database/system-database/ (props changed)
geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java (props changed)
geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java (props changed)
geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java (props changed)
geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java (props changed)
geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java (props changed)
geronimo/server/branches/3.0-M2/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
Propchange: geronimo/server/branches/3.0-M2/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins:832538,885058
/geronimo/server/branches/3.0-M1/plugins:948864,951792
-/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064377,1064432-1064433
/geronimo/server/trunk/plugins/j2ee:887507
Propchange: geronimo/server/branches/3.0-M2/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,2 +1,2 @@
/geronimo/server/branches/3.0-M1/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433
Modified: geronimo/server/branches/3.0-M2/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/client/client/src/main/history/dependencies.xml?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/client/client/src/main/history/dependencies.xml Fri Jan 28 05:16:31 2011
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
Modified: geronimo/server/branches/3.0-M2/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri Jan 28 05:16:31 2011
@@ -814,7 +814,7 @@ public class AppClientModuleBuilder impl
// Find the list of classes from the application-client.xml we want to search for
// annotations in
//------------------------------------------------------------------------------------
- List<Class> classes = new ArrayList<Class>();
+ List<Class<?>> classes = new ArrayList<Class<?>>();
// Get the classloader from the module's EARContext
Bundle bundle = appClientModule.getEarContext().getDeploymentBundle();
Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,5 +1,5 @@
/geronimo/server/branches/2.1/plugins/clustering/geronimo-farm:903520
/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm:832538,885058
/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064377,1064432-1064433
/geronimo/server/trunk/plugins/j2ee/clustering/geronimo-deploy-farm:887507
Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:903520
/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:832538
/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:903520
/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:832538
/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:832538
/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:948864,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,3 +1,3 @@
/geronimo/server/branches/3.0-M1/plugins/connector-1_6:948864,951792
/geronimo/server/trunk/plugins/connector:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6:948864,951792
/geronimo/server/trunk/plugins/connector/connector-deployer:803943
/geronimo/server/trunk/plugins/connector/connector-deployer-1_6:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6:948864,951792
/geronimo/server/trunk/plugins/connector/geronimo-connector-builder:799922
/geronimo/server/trunk/plugins/connector/geronimo-connector-builder-1_6:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064377,1064432-1064433
Modified: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Jan 28 05:16:31 2011
@@ -564,11 +564,11 @@ public class ConnectorModuleBuilder impl
private Connector mergeMetadata(Bundle bundle, BundleAnnotationFinder classFinder, Connector connector) throws DeploymentException {
Class<? extends ResourceAdapter> raClass = null;
if (connector == null) {
- List<Class> resourceAdapterClasses = classFinder.findAnnotatedClasses(javax.resource.spi.Connector.class);
+ List<Class<?>> resourceAdapterClasses = classFinder.findAnnotatedClasses(javax.resource.spi.Connector.class);
if (resourceAdapterClasses.size() != 1) {
throw new DeploymentException("Not exactly one resource adapter: " + resourceAdapterClasses);
}
- raClass = resourceAdapterClasses.get(0);
+ raClass = resourceAdapterClasses.get(0).asSubclass(ResourceAdapter.class);
connector = new Connector();
// connector.setDescriptions(ra.description());
connector.setMetadataComplete(false);
@@ -619,7 +619,7 @@ public class ConnectorModuleBuilder impl
inboundResource.setMessageAdapter(new MessageAdapter());
}
MessageAdapter messageAdapter = inboundResource.getMessageAdapter();
- List<Class> activationSpecClasses = classFinder.findAnnotatedClasses(Activation.class);
+ List<Class<?>> activationSpecClasses = classFinder.findAnnotatedClasses(Activation.class);
for (Class<?> asClass : activationSpecClasses) {
Activation activation = asClass.getAnnotation(Activation.class);
@@ -670,14 +670,14 @@ public class ConnectorModuleBuilder impl
}
//outbound
- for (Class<? extends ManagedConnectionFactory> mcfClass : classFinder.findAnnotatedClasses(javax.resource.spi.ConnectionDefinition.class)) {
+ for (Class<?> mcfClass : classFinder.findAnnotatedClasses(javax.resource.spi.ConnectionDefinition.class)) {
javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation = mcfClass.getAnnotation(javax.resource.spi.ConnectionDefinition.class);
- buildConnectionDefinition(mcfClass, connectionDefinitionAnnotation, outboundResourceAdapter);
+ buildConnectionDefinition(mcfClass.asSubclass(ManagedConnectionFactory.class), connectionDefinitionAnnotation, outboundResourceAdapter);
}
- for (Class<? extends ManagedConnectionFactory> mcfClass : classFinder.findAnnotatedClasses(ConnectionDefinitions.class)) {
+ for (Class<?> mcfClass : classFinder.findAnnotatedClasses(ConnectionDefinitions.class)) {
ConnectionDefinitions connectionDefinitionAnnotations = mcfClass.getAnnotation(ConnectionDefinitions.class);
for (javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation : connectionDefinitionAnnotations.value()) {
- buildConnectionDefinition(mcfClass, connectionDefinitionAnnotation, outboundResourceAdapter);
+ buildConnectionDefinition(mcfClass.asSubclass(ManagedConnectionFactory.class), connectionDefinitionAnnotation, outboundResourceAdapter);
}
}
if (outboundResourceAdapter.getConnectionDefinition().size() > 0) {
@@ -789,7 +789,7 @@ public class ConnectorModuleBuilder impl
return list;
}
- private void buildConnectionDefinition(Class mcfClass, javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation, OutboundResourceAdapter outboundResourceAdapter) throws DeploymentException {
+ private void buildConnectionDefinition(Class<? extends ManagedConnectionFactory> mcfClass, javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation, OutboundResourceAdapter outboundResourceAdapter) throws DeploymentException {
ConnectionDefinition connectionDefinition = getConnectionDefinition(connectionDefinitionAnnotation, outboundResourceAdapter);
if (connectionDefinition.getManagedConnectionFactoryClass() == null) {
connectionDefinition.setManagedConnectionFactoryClass(mcfClass.getName());
Modified: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java Fri Jan 28 05:16:31 2011
@@ -100,10 +100,10 @@ public class DataSourceBuilder extends A
// step 1: process annotations and update deployment descriptor
if ((module != null) && (module.getClassFinder() != null)) {
- List<Class> classes;
+ List<Class<?>> classes;
classes = module.getClassFinder().findAnnotatedClasses(DataSourceDefinitions.class);
if (classes != null) {
- for (Class clazz : classes) {
+ for (Class<?> clazz : classes) {
DataSourceDefinitions dsDefinitions = (DataSourceDefinitions) clazz.getAnnotation(DataSourceDefinitions.class);
for (DataSourceDefinition dsDefinition : dsDefinitions.value()) {
processDefinition(dsDefinition, specDD);
@@ -113,7 +113,7 @@ public class DataSourceBuilder extends A
}
classes = module.getClassFinder().findAnnotatedClasses(DataSourceDefinition.class);
if (classes != null) {
- for (Class clazz : classes) {
+ for (Class<?> clazz : classes) {
DataSourceDefinition dsDefinition = (DataSourceDefinition) clazz.getAnnotation(DataSourceDefinition.class);
processDefinition(dsDefinition, specDD);
}
Modified: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java Fri Jan 28 05:16:31 2011
@@ -53,7 +53,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(ResourceAnnotationExample.class));
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -112,7 +112,7 @@ public final class EJBAnnotationHelper e
private static void processEJB(JndiConsumer annotatedApp, AbstractFinder classFinder) throws Exception {
log.debug("processEJB(): Entry: AnnotatedApp: " + annotatedApp.toString());
- List<Class> classesWithEJB = classFinder.findAnnotatedClasses(EJB.class);
+ List<Class<?>> classesWithEJB = classFinder.findAnnotatedClasses(EJB.class);
List<Method> methodsWithEJB = classFinder.findAnnotatedMethods(EJB.class);
List<Field> fieldsWithEJB = classFinder.findAnnotatedFields(EJB.class);
@@ -157,7 +157,7 @@ public final class EJBAnnotationHelper e
private static void processEJBs(JndiConsumer annotatedApp, AbstractFinder classFinder) throws Exception {
log.debug("processEJBs(): Entry");
- List<Class> classesWithEJBs = classFinder.findAnnotatedClasses(EJBs.class);
+ List<Class<?>> classesWithEJBs = classFinder.findAnnotatedClasses(EJBs.class);
// Class-level annotation(s)
List<EJB> ejbList = new ArrayList<EJB>();
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -102,7 +102,7 @@ public final class PersistenceContextAnn
private static void processPersistenceContext(JndiConsumer annotatedApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processPersistenceContext(): Entry: AnnotatedApp: " + annotatedApp.toString());
- List<Class> classeswithPersistenceContext = classFinder.findAnnotatedClasses(PersistenceContext.class);
+ List<Class<?>> classeswithPersistenceContext = classFinder.findAnnotatedClasses(PersistenceContext.class);
List<Method> methodswithPersistenceContext = classFinder.findAnnotatedMethods(PersistenceContext.class);
List<Field> fieldswithPersistenceContext = classFinder.findAnnotatedFields(PersistenceContext.class);
@@ -147,7 +147,7 @@ public final class PersistenceContextAnn
private static void processPersistenceContexts(JndiConsumer annotatedApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processPersistenceContexts(): Entry");
- List<Class> classeswithPersistenceContexts = classFinder.findAnnotatedClasses(PersistenceContexts.class);
+ List<Class<?>> classeswithPersistenceContexts = classFinder.findAnnotatedClasses(PersistenceContexts.class);
// Class-level annotation(s)
List<PersistenceContext> persistenceContextList = new ArrayList<PersistenceContext>();
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -99,7 +99,7 @@ public final class PersistenceUnitAnnota
private static void processPersistenceUnit(JndiConsumer annotatedApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processPersistenceUnit(): Entry: AnnotatedApp: " + annotatedApp.toString());
- List<Class> classeswithPersistenceUnit = classFinder.findAnnotatedClasses(PersistenceUnit.class);
+ List<Class<?>> classeswithPersistenceUnit = classFinder.findAnnotatedClasses(PersistenceUnit.class);
List<Method> methodswithPersistenceUnit = classFinder.findAnnotatedMethods(PersistenceUnit.class);
List<Field> fieldswithPersistenceUnit = classFinder.findAnnotatedFields(PersistenceUnit.class);
@@ -144,7 +144,7 @@ public final class PersistenceUnitAnnota
private static void processPersistenceUnits(JndiConsumer annotatedApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processPersistenceUnits(): Entry");
- List<Class> classeswithPersistenceUnits = classFinder.findAnnotatedClasses(PersistenceUnits.class);
+ List<Class<?>> classeswithPersistenceUnits = classFinder.findAnnotatedClasses(PersistenceUnits.class);
// Class-level annotation(s)
List<PersistenceUnit> persistenceUnitList = new ArrayList<PersistenceUnit>();
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -94,7 +94,7 @@ public final class ResourceAnnotationHel
private static void processResource(JndiConsumer annotatedApp, AbstractFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
log.debug("processResource(): Entry: AnnotatedApp: " + annotatedApp.toString());
- List<Class> classeswithResource = classFinder.findAnnotatedClasses(Resource.class);
+ List<Class<?>> classeswithResource = classFinder.findAnnotatedClasses(Resource.class);
List<Method> methodswithResource = classFinder.findAnnotatedMethods(Resource.class);
List<Field> fieldswithResource = classFinder.findAnnotatedFields(Resource.class);
@@ -140,7 +140,7 @@ public final class ResourceAnnotationHel
private static void processResources(JndiConsumer annotatedApp, AbstractFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
log.debug("processResources(): Entry");
- List<Class> classeswithResources = classFinder.findAnnotatedClasses(Resources.class);
+ List<Class<?>> classeswithResources = classFinder.findAnnotatedClasses(Resources.class);
// Class-level annotation(s)
List<Resource> resourceList = new ArrayList<Resource>();
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -90,7 +90,7 @@ public final class SecurityAnnotationHel
private static void processDeclareRoles(WebApp webApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processDeclareRoles(): Entry: webApp: " + webApp.toString());
- List<Class> classesWithDeclareRoles = classFinder.findAnnotatedClasses(DeclareRoles.class);
+ List<Class<?>> classesWithDeclareRoles = classFinder.findAnnotatedClasses(DeclareRoles.class);
// Class-level annotation
for (Class cls : classesWithDeclareRoles) {
@@ -117,7 +117,7 @@ public final class SecurityAnnotationHel
private static void processRunAs(WebApp webApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processRunAs(): Entry: webApp: " + webApp.toString());
- List<Class> classesWithRunAs = classFinder.findAnnotatedClasses(RunAs.class);
+ List<Class<?>> classesWithRunAs = classFinder.findAnnotatedClasses(RunAs.class);
// Class-level annotation
for (Class cls : classesWithRunAs) {
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -100,7 +100,7 @@ public final class WebServiceRefAnnotati
private static void processWebServiceRef(JndiConsumer annotatedApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processWebServiceRef(): Entry: AnnotatedApp: " + annotatedApp.toString());
- List<Class> classeswithWebServiceRef = classFinder.findAnnotatedClasses(WebServiceRef.class);
+ List<Class<?>> classeswithWebServiceRef = classFinder.findAnnotatedClasses(WebServiceRef.class);
List<Method> methodswithWebServiceRef = classFinder.findAnnotatedMethods(WebServiceRef.class);
List<Field> fieldswithWebServiceRef = classFinder.findAnnotatedFields(WebServiceRef.class);
@@ -145,7 +145,7 @@ public final class WebServiceRefAnnotati
private static void processWebServiceRefs(JndiConsumer annotatedApp, AbstractFinder classFinder) throws DeploymentException {
log.debug("processWebServiceRefs(): Entry");
- List<Class> classeswithWebServiceRefs = classFinder.findAnnotatedClasses(WebServiceRefs.class);
+ List<Class<?>> classeswithWebServiceRefs = classFinder.findAnnotatedClasses(WebServiceRefs.class);
// Class-level annotation(s)
List<WebServiceRef> webServiceRefList = new ArrayList<WebServiceRef>();
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java Fri Jan 28 05:16:31 2011
@@ -87,7 +87,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(EJBs.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(EJBs.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(EJBAnnotationExample.class));
@@ -131,7 +131,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(HandlerChain.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(HandlerChain.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(HandlerChainAnnotationExample.class));
@@ -173,7 +173,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(PersistenceContexts.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(PersistenceContexts.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(PersistenceContextAnnotationExample.class));
@@ -212,7 +212,7 @@ public class AnnotationHelperTest extend
public void testPersistenceUnitAnnotationHelper() throws Exception {
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(PersistenceUnits.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(PersistenceUnits.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(PersistenceUnitAnnotationExample.class));
@@ -254,7 +254,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(WebServiceRefs.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(WebServiceRefs.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(WebServiceRefAnnotationExample.class));
@@ -300,7 +300,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(DeclareRoles.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(DeclareRoles.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(SecurityAnnotationExample.class));
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java Fri Jan 28 05:16:31 2011
@@ -54,7 +54,7 @@ public class AnnotationHelperTest extend
//-------------------------------------------------
// Ensure annotations are discovered correctly
//-------------------------------------------------
- List<Class> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
+ List<Class<?>> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
assertNotNull(annotatedClasses);
assertEquals(1, annotatedClasses.size());
assertTrue(annotatedClasses.contains(ResourceAnnotationExample.class));
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Fri Jan 28 05:16:31 2011
@@ -642,7 +642,7 @@ public abstract class AbstractWebModuleB
for (Listener listener : webApp.getListener()) {
addClass(bundle, classes, listener.getListenerClass());
}
- return new ClassFinder(new ArrayList<Class>(classes));
+ return new ClassFinder(new ArrayList<Class<?>>(classes));
} catch (Exception e) {
throw new DeploymentException(e);
}
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java Fri Jan 28 05:16:31 2011
@@ -206,11 +206,11 @@ public class MergeHelper {
return isJarFile ? url.equals(prefix) : false;
}
});
- List<Class> webServlets = bundleAnnotationFinder.findAnnotatedClasses(WebServlet.class);
+ List<Class<?>> webServlets = bundleAnnotationFinder.findAnnotatedClasses(WebServlet.class);
WEB_SERVLET_ANNOTATION_MERGE_HANDLER.merge(webServlets.toArray(new Class<?>[0]), webApp, mergeContext);
- List<Class> webFilters = bundleAnnotationFinder.findAnnotatedClasses(WebFilter.class);
+ List<Class<?>> webFilters = bundleAnnotationFinder.findAnnotatedClasses(WebFilter.class);
WEB_FILTER_ANNOTATION_MERGE_HANDLER.merge(webFilters.toArray(new Class<?>[0]), webApp, mergeContext);
- List<Class> webListeners = bundleAnnotationFinder.findAnnotatedClasses(WebListener.class);
+ List<Class<?>> webListeners = bundleAnnotationFinder.findAnnotatedClasses(WebListener.class);
WEB_LISTENER_ANNOTATION_MERGE_HANDLER.merge(webListeners.toArray(new Class<?>[0]), webApp, mergeContext);
} catch (Exception e) {
throw new DeploymentException("Fail to merge annotations in " + prefix, e);
Modified: geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Fri Jan 28 05:16:31 2011
@@ -156,7 +156,7 @@ public class JspModuleBuilderExtension i
Collection<URL> urls = getTldFiles(webApp, webModule);
LinkedHashSet<Class<?>> classes = getListenerClasses(webApp, webModule, urls, listenerNames);
- ClassFinder classFinder = new ClassFinder(new ArrayList<Class>(classes));
+ ClassFinder classFinder = new ClassFinder(new ArrayList<Class<?>>(classes));
webModule.setClassFinder(classFinder);
namingBuilders.buildNaming(webApp, jettyWebApp, webModule, buildingContext);
Modified: geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java Fri Jan 28 05:16:31 2011
@@ -71,7 +71,7 @@ public class AdvancedWARWebServiceFinder
// partial web.xml, discover all web service classes
Map<String, List<String>> classServletMap = createClassServetMap(webApp);
- List<Class> services = WARWebServiceFinder.discoverWebServices(module, bundle, false);
+ List<Class<?>> services = WARWebServiceFinder.discoverWebServices(module, bundle, false);
String contextRoot = ((WebModule) module).getContextRoot();
for (Class service : services) {
// skip interfaces and such
Modified: geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java Fri Jan 28 05:16:31 2011
@@ -53,7 +53,7 @@ public class SimpleWARWebServiceFinder i
if (webApp.getServlet().size() == 0) {
// web.xml not present (empty really), discover annotated
// classes and update DD
- List<Class> services = WARWebServiceFinder.discoverWebServices(module.getModuleFile(), false, this.getClass().getClassLoader());
+ List<Class<?>> services = WARWebServiceFinder.discoverWebServices(module.getModuleFile(), false, this.getClass().getClassLoader());
String contextRoot = ((WebModule) module).getContextRoot();
for (Class service : services) {
// skip interfaces and such
Modified: geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java Fri Jan 28 05:16:31 2011
@@ -84,7 +84,7 @@ public class WARWebServiceFinder impleme
* Returns a list of any classes annotated with @WebService or
* @WebServiceProvider annotation.
*/
- static List<Class> discoverWebServices(Module module,
+ static List<Class<?>> discoverWebServices(Module module,
Bundle bundle,
boolean isEJB)
throws DeploymentException {
@@ -102,7 +102,7 @@ public class WARWebServiceFinder impleme
* Returns a list of any classes annotated with @WebService or
* @WebServiceProvider annotation.
*/
- static List<Class> discoverWebServices(Bundle bundle,
+ static List<Class<?>> discoverWebServices(Bundle bundle,
boolean isEJB)
throws DeploymentException {
LOG.debug("Discovering web service classes");
@@ -111,7 +111,7 @@ public class WARWebServiceFinder impleme
PackageAdmin packageAdmin = (PackageAdmin) bundle.getBundleContext().getService(sr);
try {
BundleAnnotationFinder classFinder = new BundleAnnotationFinder(packageAdmin, bundle);
- List<Class> classes = new ArrayList<Class>();
+ List<Class<?>> classes = new ArrayList<Class<?>>();
classes.addAll(classFinder.findAnnotatedClasses(WebService.class));
classes.addAll(classFinder.findAnnotatedClasses(WebServiceProvider.class));
return classes;
@@ -126,7 +126,7 @@ public class WARWebServiceFinder impleme
* Returns a list of any classes annotated with @WebService or
* @WebServiceProvider annotation.
*/
- static List<Class> discoverWebServices(JarFile moduleFile,
+ static List<Class<?>> discoverWebServices(JarFile moduleFile,
boolean isEJB,
ClassLoader parentClassLoader)
throws DeploymentException {
@@ -205,7 +205,7 @@ public class WARWebServiceFinder impleme
TemporaryClassLoader tempClassLoader;
try {
tempClassLoader = new TemporaryClassLoader(urls, parentClassLoader);
- List<Class> classes = new ArrayList<Class>();
+ List<Class<?>> classes = new ArrayList<Class<?>>();
for (URL url : urlList) {
try {
ClassFinder classFinder = new ClassFinder(tempClassLoader, Collections.singletonList(url));
Modified: geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WebServiceContextAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WebServiceContextAnnotationHelper.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WebServiceContextAnnotationHelper.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WebServiceContextAnnotationHelper.java Fri Jan 28 05:16:31 2011
@@ -33,8 +33,8 @@ public class WebServiceContextAnnotation
public static final String RELATIVE_JNDI_NAME = "env/WebServiceContext";
public static final String ABSOLUTE_JNDI_NAME = "java:comp/" + RELATIVE_JNDI_NAME;
- public static void addWebServiceContextInjections(Holder holder, Class clazz) {
- List<Class> classes = new ArrayList<Class>();
+ public static void addWebServiceContextInjections(Holder holder, Class<?> clazz) {
+ List<Class<?>> classes = new ArrayList<Class<?>>();
while (clazz != Object.class) {
classes.add(clazz);
clazz = clazz.getSuperclass();
Modified: geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java Fri Jan 28 05:16:31 2011
@@ -341,14 +341,14 @@ public class MyFacesModuleBuilderExtensi
}
});
- annotationClassSetMap.put(FacesComponent.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(FacesComponent.class)));
- annotationClassSetMap.put(FacesConverter.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(FacesConverter.class)));
- annotationClassSetMap.put(FacesValidator.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(FacesValidator.class)));
- annotationClassSetMap.put(FacesRenderer.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(FacesRenderer.class)));
- annotationClassSetMap.put(javax.faces.bean.ManagedBean.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(javax.faces.bean.ManagedBean.class)));
- annotationClassSetMap.put(NamedEvent.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(NamedEvent.class)));
- annotationClassSetMap.put(FacesBehavior.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(FacesBehavior.class)));
- annotationClassSetMap.put(FacesBehaviorRenderer.class, new HashSet(bundleAnnotationFinder.findAnnotatedClasses(FacesBehaviorRenderer.class)));
+ annotationClassSetMap.put(FacesComponent.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(FacesComponent.class)));
+ annotationClassSetMap.put(FacesConverter.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(FacesConverter.class)));
+ annotationClassSetMap.put(FacesValidator.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(FacesValidator.class)));
+ annotationClassSetMap.put(FacesRenderer.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(FacesRenderer.class)));
+ annotationClassSetMap.put(javax.faces.bean.ManagedBean.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(javax.faces.bean.ManagedBean.class)));
+ annotationClassSetMap.put(NamedEvent.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(NamedEvent.class)));
+ annotationClassSetMap.put(FacesBehavior.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(FacesBehavior.class)));
+ annotationClassSetMap.put(FacesBehaviorRenderer.class, new HashSet<Class<?>>(bundleAnnotationFinder.findAnnotatedClasses(FacesBehaviorRenderer.class)));
return new AnnotationConfigurator() {
@Override
@@ -408,7 +408,7 @@ public class MyFacesModuleBuilderExtensi
}
protected ClassFinder createMyFacesClassFinder(List<FacesConfig> facesConfigs, Bundle bundle) throws DeploymentException {
- List<Class> managedBeanClasses = new ArrayList<Class>();
+ List<Class<?>> managedBeanClasses = new ArrayList<Class<?>>();
for (FacesConfig facesConfig : facesConfigs) {
for (ManagedBean managedBean : facesConfig.getManagedBeans()) {
String className = managedBean.getManagedBeanClassName().trim();
Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins/openejb:830343,830385,830420,830443,830766,831498,831811,832538,885058,941914
/geronimo/server/branches/3.0-M1/plugins/openejb:948864,951792
/geronimo/server/trunk/plugins/j2ee/openejb:887507
-/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433
Modified: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Fri Jan 28 05:16:31 2011
@@ -429,13 +429,13 @@ public class EjbDeploymentBuilder {
//
Map<EARContext.Key, Object> buildingContext = new HashMap<EARContext.Key, Object>();
buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, gbean.getAbstractName());
- Class ejbClass;
+ Class<?> ejbClass;
try {
ejbClass = ejbModule.getEarContext().getDeploymentBundle().loadClass(bean.getEjbClass());
} catch (ClassNotFoundException e) {
throw new DeploymentException("Could not load ejb class", e);
}
- List<Class> classes = new ArrayList<Class>();
+ List<Class<?>> classes = new ArrayList<Class<?>>();
while (ejbClass != null && !ejbClass.equals(Object.class)) {
classes.add(ejbClass);
ejbClass = ejbClass.getSuperclass();
Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,2 +1,2 @@
/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:951792
-/geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -2,4 +2,4 @@
/geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa20-builder:829715
/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder:829426,829715,832538,885058
/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder:948864,951792
-/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder:1056676,1057959-1057962,1064377,1064432-1064433
Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java Fri Jan 28 05:16:31 2011
@@ -175,11 +175,11 @@ public class OpenWebBeansModuleBuilderEx
protected ClassFinder createOpenWebBeansClassFinder(WebApp webApp, WebModule webModule)
throws DeploymentException {
- List<Class> classes = getManagedClasses(webApp, webModule);
+ List<Class<?>> classes = getManagedClasses(webApp, webModule);
return new ClassFinder(classes);
}
- private List<Class> getManagedClasses(WebApp webApp, WebModule webModule) throws DeploymentException {
+ private List<Class<?>> getManagedClasses(WebApp webApp, WebModule webModule) throws DeploymentException {
Bundle bundle = webModule.getEarContext().getDeploymentBundle();
ServiceReference reference = bundle.getBundleContext().getServiceReference(PackageAdmin.class.getName());
try {
@@ -214,7 +214,7 @@ public class OpenWebBeansModuleBuilderEx
for (Field field: fields) {
classes.add(field.getDeclaringClass());
}
- return new ArrayList(classes);
+ return new ArrayList<Class<?>>(classes);
} catch (Exception e) {
throw new DeploymentException("Fail to scan jsr299 annotations", e);
} finally {
Propchange: geronimo/server/branches/3.0-M2/plugins/system-database/system-database/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 28 05:16:31 2011
@@ -1,10 +1,9 @@
-*.iws
*.ipr
-*.iml
-.project
-.classpath
-*.log
junit*.properties
+.classpath
+*.iws
+.project
target
bin
.settings
+*.log
Propchange: geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,3 +1,3 @@
/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:948864,951792
-/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1056676,1057959-1057962,1064377,1064432-1064433
/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915
Modified: geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Fri Jan 28 05:16:31 2011
@@ -57,6 +57,11 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>util</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
<type>jar</type>
Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:832538,885058
/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:832538,885058
/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:832538,885058
/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:1056676,1057959-1057962,1064377,1064432-1064433
Propchange: geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 28 05:16:31 2011
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:832538,885058
/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:887507
-/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962,1064432
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1056676,1057959-1057962,1064377,1064432-1064433
Modified: geronimo/server/branches/3.0-M2/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java?rev=1064460&r1=1064459&r2=1064460&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java Fri Jan 28 05:16:31 2011
@@ -156,7 +156,7 @@ public class WinkModuleBuilderExtension
protected ClassFinder createWinkClassFinder(List<FacesConfig> facesConfigs, Set<Class> annotatedManagedBeanClasses, Bundle bundle) throws DeploymentException {
- List<Class> managedBeanClasses = new ArrayList<Class>();
+ List<Class<?>> managedBeanClasses = new ArrayList<Class<?>>();
for (FacesConfig facesConfig : facesConfigs) {
for (FacesManagedBean managedBean : facesConfig.getManagedBean()) {
String className = managedBean.getManagedBeanClass().trim();