Permalink
Browse files

Build against Spring 2.5 so that we can stay compatible with that ver…

…sion
  • Loading branch information...
1 parent 83bb751 commit 6847fcd74ddac81bf64d734c77b680ee9e27c44b @mbogoevici mbogoevici committed Jul 25, 2011
View
2 facade/src/main/java/org/jboss/spring/facade/KernelControllerListableBeanFactory.java
@@ -176,7 +176,7 @@ public boolean accepts(ControllerContext context) {
}
if (foundContexts.size() != 1) {
- throw new NoSuchBeanDefinitionException(tClass);
+ throw new NoSuchBeanDefinitionException(tClass, "No controller of this class found");
} else {
return (T) foundContexts.iterator().next().getTarget();
}
View
11 pom.xml
@@ -21,7 +21,7 @@
</scm>
<modules>
- <module>deployers-common</module>
+ <module>deployers</module>
<module>deployers-vfs2</module>
<module>deployers-vfs3</module>
<module>subsystem-as7</module>
@@ -55,7 +55,7 @@
<version.xerces>2.9.1</version.xerces>
<version.aopalliance>1.0</version.aopalliance>
<version.org.jboss.as7>7.0.0.Final</version.org.jboss.as7>
- <version.spring>3.0.5.RELEASE</version.spring>
+ <version.spring>2.5.6.SEC02</version.spring>
<version.org.jboss.jandex>1.0.0.Beta7</version.org.jboss.jandex>
</properties>
@@ -344,36 +344,43 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${version.spring}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
View
18 vfs/src/main/java/org/jboss/spring/vfs/VFSUtil.java
@@ -112,11 +112,11 @@
// extract the rest of the reflective information that we need for VFS invocation
try {
if (VFS2_PACKAGE_NAME.equals(vfsPackageName)) {
- VFS_METHOD_GET_ROOT_URL = ReflectionUtils.findMethod(VFS_CLASS, "getRoot", URL.class);
- VFS_METHOD_GET_ROOT_URI = ReflectionUtils.findMethod(VFS_CLASS, "getRoot", URI.class);
+ VFS_METHOD_GET_ROOT_URL = ReflectionUtils.findMethod(VFS_CLASS, "getRoot", new Class[]{URL.class});
+ VFS_METHOD_GET_ROOT_URI = ReflectionUtils.findMethod(VFS_CLASS, "getRoot", new Class[]{URI.class});
} else {
- VFS_METHOD_GET_ROOT_URL = ReflectionUtils.findMethod(VFS_CLASS, "getChild", URL.class);
- VFS_METHOD_GET_ROOT_URI = ReflectionUtils.findMethod(VFS_CLASS, "getChild", URI.class);
+ VFS_METHOD_GET_ROOT_URL = ReflectionUtils.findMethod(VFS_CLASS, "getChild", new Class[]{URL.class});
+ VFS_METHOD_GET_ROOT_URI = ReflectionUtils.findMethod(VFS_CLASS, "getChild", new Class[]{URI.class});
}
VIRTUAL_FILE_CLASS = loader.loadClass(vfsPackageName + ".VirtualFile");
VIRTUAL_FILE_METHOD_EXISTS = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "exists");
@@ -129,18 +129,18 @@
VIRTUAL_FILE_METHOD_GET_PATH_NAME = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "getPathName");
if (VFS2_PACKAGE_NAME.equals(vfsPackageName)) {
- VIRTUAL_FILE_METHOD_GET_CHILD = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "findChild", String.class);
+ VIRTUAL_FILE_METHOD_GET_CHILD = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "findChild", new Class[]{String.class});
} else {
- VIRTUAL_FILE_METHOD_GET_CHILD = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "getChild", String.class);
+ VIRTUAL_FILE_METHOD_GET_CHILD = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "getChild", new Class[]{String.class});
}
VFS_UTILS_CLASS = loader.loadClass(vfsPackageName + ".VFSUtils");
- VFS_UTILS_METHOD_GET_COMPATIBLE_URI = ReflectionUtils.findMethod(VFS_UTILS_CLASS, "getCompatibleURI", VIRTUAL_FILE_CLASS);
- VFS_UTILS_METHOD_IS_NESTED_FILE = ReflectionUtils.findMethod(VFS_UTILS_CLASS, "isNestedFile", VIRTUAL_FILE_CLASS);
+ VFS_UTILS_METHOD_GET_COMPATIBLE_URI = ReflectionUtils.findMethod(VFS_UTILS_CLASS, "getCompatibleURI", new Class<?>[]{VIRTUAL_FILE_CLASS});
+ VFS_UTILS_METHOD_IS_NESTED_FILE = ReflectionUtils.findMethod(VFS_UTILS_CLASS, "isNestedFile", new Class<?>[]{VIRTUAL_FILE_CLASS});
VIRTUAL_FILE_VISITOR_CLASS = loader.loadClass(vfsPackageName + ".VirtualFileVisitor");
- VIRTUAL_FILE_METHOD_VISIT = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "visit", VIRTUAL_FILE_VISITOR_CLASS);
+ VIRTUAL_FILE_METHOD_VISIT = ReflectionUtils.findMethod(VIRTUAL_FILE_CLASS, "visit", new Class<?>[]{VIRTUAL_FILE_VISITOR_CLASS});
VISITOR_ATTRIBUTES_CLASS = loader.loadClass(vfsPackageName + ".VisitorAttributes");
VISITOR_ATTRIBUTES_FIELD_RECURSE = ReflectionUtils.findField(VISITOR_ATTRIBUTES_CLASS, "RECURSE");
View
2 weaving/src/main/java/org/jboss/instrument/classloading/JBossModulesLoadTimeWeaver.java
@@ -54,7 +54,7 @@ public void addTransformer(ClassFileTransformer transformer) {
Field transformers = ReflectionUtils.findField(classLoader.getClass(), "transformer");
transformers.setAccessible(true);
Object delegatingTransformer = transformers.get(classLoader);
- Method ADD_TRANSFORMER = ReflectionUtils.findMethod(delegatingTransformer.getClass(), "addTransformer", ClassFileTransformer.class);
+ Method ADD_TRANSFORMER = ReflectionUtils.findMethod(delegatingTransformer.getClass(), "addTransformer", new Class<?>[]{ClassFileTransformer.class});
ADD_TRANSFORMER.setAccessible(true);
ADD_TRANSFORMER.invoke(delegatingTransformer, transformer);
} catch (Exception e) {

0 comments on commit 6847fcd

Please sign in to comment.