[jboss-cvs] JBossAS SVN: r102489 - in projects/snowdrop/trunk: aop and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 16 18:04:47 EDT 2010
Author: marius.bogoevici
Date: 2010-03-16 18:04:46 -0400 (Tue, 16 Mar 2010)
New Revision: 102489
Modified:
projects/snowdrop/trunk/aop/pom.xml
projects/snowdrop/trunk/build/pom.xml
projects/snowdrop/trunk/cluster/pom.xml
projects/snowdrop/trunk/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java
projects/snowdrop/trunk/deployers/pom.xml
projects/snowdrop/trunk/documentation/samples/web-scanning/pom.xml
projects/snowdrop/trunk/documentation/samples/web-weaving/pom.xml
projects/snowdrop/trunk/documentation/samples/web-weaving/src/main/webapp/WEB-INF/spring-context.xml
projects/snowdrop/trunk/documentation/user-guide/pom.xml
projects/snowdrop/trunk/facade/pom.xml
projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java
projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java
projects/snowdrop/trunk/pom.xml
projects/snowdrop/trunk/vfs/pom.xml
projects/snowdrop/trunk/weaving/pom.xml
Log:
Trunk becomes 2.0.0-SNAPSHOT. To support Spring3 + VFS 3.0/JBAS 6
Modified: projects/snowdrop/trunk/aop/pom.xml
===================================================================
--- projects/snowdrop/trunk/aop/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/aop/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/trunk/build/pom.xml
===================================================================
--- projects/snowdrop/trunk/build/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/build/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/trunk/cluster/pom.xml
===================================================================
--- projects/snowdrop/trunk/cluster/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/cluster/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/trunk/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java
===================================================================
--- projects/snowdrop/trunk/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/cluster/src/main/java/org/jboss/spring/cluster/CacheScope.java 2010-03-16 22:04:46 UTC (rev 102489)
@@ -54,4 +54,8 @@
public void registerDestructionCallback(String string, Runnable runnable)
{
}
+
+ public Object resolveContextualObject(String s) {
+ return null;
+ }
}
Modified: projects/snowdrop/trunk/deployers/pom.xml
===================================================================
--- projects/snowdrop/trunk/deployers/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/deployers/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/trunk/documentation/samples/web-scanning/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/web-scanning/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/documentation/samples/web-scanning/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-deployers</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jstl</groupId>
Modified: projects/snowdrop/trunk/documentation/samples/web-weaving/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/web-weaving/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/documentation/samples/web-weaving/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-weaving</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -64,4 +64,90 @@
</plugins>
</build>
+ <repositories>
+
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>repo1.maven.org</id>
+ <url>http://repo1.maven.org/maven2/</url>
+
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+
+ <repository>
+ <id>ibiblio</id>
+ <url>http://www.ibiblio.org/maven/mule/dependencies/maven2</url>
+
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+
+ </repositories>
+
+ <pluginRepositories>
+
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+
+ <pluginRepository>
+ <id>snapshots.jboss.org</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+
</project>
Modified: projects/snowdrop/trunk/documentation/samples/web-weaving/src/main/webapp/WEB-INF/spring-context.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/web-weaving/src/main/webapp/WEB-INF/spring-context.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/documentation/samples/web-weaving/src/main/webapp/WEB-INF/spring-context.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -7,6 +7,8 @@
<bean id="hello" class="springdemo.weaving.hello.HelloService"/>
+<!--
<context:load-time-weaver weaver-class="org.jboss.instrument.classloading.JBoss5LoadTimeWeaver"/>
+-->
</beans>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/user-guide/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/user-guide/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/documentation/user-guide/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -74,4 +74,27 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+
+<repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
Modified: projects/snowdrop/trunk/facade/pom.xml
===================================================================
--- projects/snowdrop/trunk/facade/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/facade/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java
===================================================================
--- projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/ControllerBeanFactory.java 2010-03-16 22:04:46 UTC (rev 102489)
@@ -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
Modified: projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java
===================================================================
--- projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java 2010-03-16 22:04:46 UTC (rev 102489)
@@ -21,21 +21,21 @@
*/
package org.jboss.spring.facade;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.lang.annotation.Annotation;
+import java.util.*;
+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;
import org.jboss.dependency.spi.ControllerStateModel;
+import org.jboss.dependency.spi.tracker.ContextFilter;
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.
@@ -167,4 +167,45 @@
}
return result;
}
+
+ public Map<String, Object> getBeansWithAnnotation(final Class<? extends Annotation> annotationType) throws BeansException {
+ Set<ControllerContext> controllerContexts = kernelController.filter(kernelController.getContextsByState(ControllerState.INSTALLED), new ContextFilter() {
+ public boolean accepts(ControllerContext context) {
+ Set<AnnotationMetaData> annotationMetaDataSet = ((KernelControllerContext) context).getBeanMetaData().getAnnotations();
+ for (AnnotationMetaData annotationMetaData: annotationMetaDataSet)
+ {
+ if (annotationType.isAssignableFrom(annotationMetaData.getAnnotationInstance().annotationType()))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
+ 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; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ 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/trunk/pom.xml
===================================================================
--- projects/snowdrop/trunk/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -7,7 +7,7 @@
</parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Snowdrop Parent POM</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -48,7 +48,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</version.spring>
+ <version.spring>3.0.1.RELEASE</version.spring>
</properties>
<build>
Modified: projects/snowdrop/trunk/vfs/pom.xml
===================================================================
--- projects/snowdrop/trunk/vfs/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/vfs/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
Modified: projects/snowdrop/trunk/weaving/pom.xml
===================================================================
--- projects/snowdrop/trunk/weaving/pom.xml 2010-03-16 21:57:26 UTC (rev 102488)
+++ projects/snowdrop/trunk/weaving/pom.xml 2010-03-16 22:04:46 UTC (rev 102489)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.snowdrop</groupId>
More information about the jboss-cvs-commits
mailing list