[jboss-cvs] JBossAS SVN: r102706 - in projects/snowdrop/branches/1_1: build and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 22 00:32:21 EDT 2010
Author: marius.bogoevici
Date: 2010-03-22 00:32:19 -0400 (Mon, 22 Mar 2010)
New Revision: 102706
Modified:
projects/snowdrop/branches/1_1/build/pom.xml
projects/snowdrop/branches/1_1/cluster/pom.xml
projects/snowdrop/branches/1_1/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java
projects/snowdrop/branches/1_1/deployer-assembly/pom.xml
projects/snowdrop/branches/1_1/deployers/pom.xml
projects/snowdrop/branches/1_1/facade/pom.xml
projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java
projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java
projects/snowdrop/branches/1_1/pom.xml
projects/snowdrop/branches/1_1/transaction/pom.xml
projects/snowdrop/branches/1_1/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java
projects/snowdrop/branches/1_1/vfs/pom.xml
projects/snowdrop/branches/1_1/weaving/pom.xml
Log:
1.1 Branch upgraded to Spring 3
Modified: projects/snowdrop/branches/1_1/build/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/build/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/build/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/branches/1_1/cluster/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/cluster/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/cluster/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/branches/1_1/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java
===================================================================
--- projects/snowdrop/branches/1_1/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java 2010-03-22 04:32:19 UTC (rev 102706)
@@ -54,4 +54,9 @@
public void registerDestructionCallback(String string, Runnable runnable)
{
}
+
+ public Object resolveContextualObject(String key)
+ {
+ return null;
+ }
}
Modified: projects/snowdrop/branches/1_1/deployer-assembly/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/deployer-assembly/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/deployer-assembly/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
@@ -62,9 +62,14 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<version>${version.spring}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
</dependencies>
</project>
Modified: projects/snowdrop/branches/1_1/deployers/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/deployers/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/deployers/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/branches/1_1/facade/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/facade/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/facade/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java
===================================================================
--- projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java 2010-03-22 04:32:19 UTC (rev 102706)
@@ -21,6 +21,7 @@
*/
package org.jboss.spring.facade;
+import java.util.HashSet;
import java.util.Set;
import org.jboss.beans.info.spi.BeanInfo;
@@ -48,7 +49,7 @@
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public class ControllerBeanFactory implements BeanFactory
+public abstract class ControllerBeanFactory implements BeanFactory
{
private Controller controller;
@@ -101,7 +102,7 @@
return getBeanWithType(name, clazz);
}
- /**
+ /**
* Get exact bean.
*
* @param name the bean name
@@ -224,11 +225,15 @@
/**
* Get prototype class.
*
- * @param kcc the kernel controller context
+ * @param cc the controller context
* @return prototype's class
*/
- protected Class<?> getPrototypeClass(KernelControllerContext kcc)
+ protected Class<?> getPrototypeClass(ControllerContext cc)
{
+ if (cc instanceof KernelControllerContext == false)
+ return null;
+
+ KernelControllerContext kcc = (KernelControllerContext) cc;
BeanMetaData bmd = kcc.getBeanMetaData();
Set<PropertyMetaData> properties = bmd.getProperties();
for (PropertyMetaData pmd : properties)
Modified: projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java
===================================================================
--- projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java 2010-03-22 04:32:19 UTC (rev 102706)
@@ -21,12 +21,15 @@
*/
package org.jboss.spring.facade;
+import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.factory.AbstractBeanFactory;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
@@ -34,8 +37,10 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
/**
* ListableBeanFactory facade over MC's KernelController.
@@ -83,7 +88,9 @@
{
Set<ControllerContext> byState = kernelController.getContextsByState(state);
for (ControllerContext context : byState)
+ {
result.add(context.getName().toString());
+ }
}
return result.toArray(new String[result.size()]);
}
@@ -115,13 +122,17 @@
if (prototypeClass != null)
{
if (clazz.isAssignableFrom(prototypeClass))
+ {
result.add(kcc.getName().toString());
+ }
}
else if (allowEagerInit)
{
Object bean = createBean(kcc.getTarget());
if (clazz.isInstance(bean))
+ {
result.add(kcc.getName().toString());
+ }
}
}
}
@@ -154,17 +165,66 @@
if (prototypeClass != null)
{
if (clazz.isAssignableFrom(prototypeClass))
+ {
result.put(kcc.getName().toString(), createBean(kcc.getTarget()));
+ }
}
else if (allowEagerInit)
{
Object bean = createBean(kcc.getTarget());
if (clazz.isInstance(bean))
+ {
result.put(kcc.getName().toString(), bean);
+ }
}
}
}
}
return result;
}
+
+ public Map<String, Object> getBeansWithAnnotation(final Class<? extends Annotation> annotationType) throws BeansException
+ {
+ Set<ControllerContext> controllerContexts = new HashSet<ControllerContext>();
+
+ for (ControllerContext controllerContext : kernelController.getContextsByState(ControllerState.INSTALLED))
+ {
+ Set<AnnotationMetaData> annotationMetaDataSet = ((KernelControllerContext) controllerContext).getBeanMetaData().getAnnotations();
+ for (AnnotationMetaData annotationMetaData : annotationMetaDataSet)
+ {
+ if (annotationType.isAssignableFrom(annotationMetaData.getAnnotationInstance().annotationType()))
+ {
+ controllerContexts.add(controllerContext);
+ }
+ }
+ }
+ Map<String, Object> returnedObjects = new HashMap<String, Object>();
+ for (ControllerContext controllerContext : controllerContexts)
+ {
+ returnedObjects.put((String) controllerContext.getName(), controllerContext.getTarget());
+ }
+ return returnedObjects;
+ }
+
+ public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
+ {
+ return null;
+ }
+
+ public <T> T getBean(Class<T> tClass) throws BeansException
+ {
+ Set<ControllerContext> foundContexts = new HashSet<ControllerContext>();
+ for (ControllerContext controllerContext : kernelController.getContexts(tClass, ControllerState.INSTALLED))
+ {
+
+ }
+ if (foundContexts.size() != 1)
+ {
+ throw new NoSuchBeanDefinitionException(tClass);
+ }
+ else
+ {
+ return (T) foundContexts.iterator().next().getTarget();
+ }
+ }
}
\ No newline at end of file
Modified: projects/snowdrop/branches/1_1/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -7,7 +7,7 @@
</parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Snowdrop Parent POM</name>
<url>http://jboss.org/snowdrop</url>
@@ -50,7 +50,7 @@
<version.javaee>3.0.0.GA</version.javaee>
<version.xerces>2.9.1</version.xerces>
<version.aopalliance>1.0</version.aopalliance>
- <version.spring>2.5.6.SEC01</version.spring>
+ <version.spring>3.0.0.RELEASE</version.spring>
</properties>
<build>
Modified: projects/snowdrop/branches/1_1/transaction/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/transaction/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/transaction/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -3,12 +3,12 @@
<parent>
<artifactId>snowdrop-parent</artifactId>
<groupId>org.jboss.snowdrop</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>snowdrop-transaction</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Snowdrop - Transaction</name>
<description>Snowdrop - Transaction</description>
<url>http://www.jboss.org/snowdrop</url>
Modified: projects/snowdrop/branches/1_1/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java
===================================================================
--- projects/snowdrop/branches/1_1/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java 2010-03-22 04:32:19 UTC (rev 102706)
@@ -6,6 +6,7 @@
import javax.transaction.Transaction;
import org.springframework.transaction.jta.JtaTransactionManager;
+import org.springframework.transaction.jta.SimpleTransactionFactory;
import org.springframework.transaction.jta.TransactionFactory;
/**
@@ -22,7 +23,6 @@
private JtaTransactionManager wrappedJtaTransactionManager;
-
public JtaTransactionManager getWrappedJtaTransactionManager()
{
return wrappedJtaTransactionManager;
@@ -48,5 +48,8 @@
}
}
-
+ public boolean supportsResourceAdapterManagedTransactions()
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
}
\ No newline at end of file
Modified: projects/snowdrop/branches/1_1/vfs/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/vfs/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/vfs/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/branches/1_1/weaving/pom.xml
===================================================================
--- projects/snowdrop/branches/1_1/weaving/pom.xml 2010-03-22 04:10:14 UTC (rev 102705)
+++ projects/snowdrop/branches/1_1/weaving/pom.xml 2010-03-22 04:32:19 UTC (rev 102706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
More information about the jboss-cvs-commits
mailing list