geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r454790 [1/5] - in /geronimo/xbean/trunk: ./ xbean-spring-itests/ xbean-spring-itests/2.0/ xbean-spring-itests/2.0/src/ xbean-spring-itests/2.0/src/main/ xbean-spring-itests/2.0/src/main/resources/ xbean-spring-itests/2.0/src/main/resources...
Date Tue, 10 Oct 2006 15:46:46 GMT
Author: gnodet
Date: Tue Oct 10 08:46:36 2006
New Revision: 454790

URL: http://svn.apache.org/viewvc?view=rev&rev=454790
Log:
XBEAN-57: fix incompatibility with Spring 2.0 final

Added:
    geronimo/xbean/trunk/xbean-spring-itests/2.0/   (with props)
    geronimo/xbean/trunk/xbean-spring-itests/2.0/LICENSE.txt
    geronimo/xbean/trunk/xbean-spring-itests/2.0/NOTICE.txt
    geronimo/xbean/trunk/xbean-spring-itests/2.0/pom.xml
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/LICENSE
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/NOTICE
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/context/
    geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/context/Spring20Test.java
    geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanQNameHelper.java
    geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanQNameHelper.java
    geronimo/xbean/trunk/xbean-spring-v2c/   (with props)
    geronimo/xbean/trunk/xbean-spring-v2c/LICENSE.txt
    geronimo/xbean/trunk/xbean-spring-v2c/NOTICE.txt
    geronimo/xbean/trunk/xbean-spring-v2c/README.txt
    geronimo/xbean/trunk/xbean-spring-v2c/pom.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanQNameHelper.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/resources/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/resources/META-INF/
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/resources/META-INF/LICENSE
    geronimo/xbean/trunk/xbean-spring-v2c/src/main/resources/META-INF/NOTICE
    geronimo/xbean/trunk/xbean-spring-v2c/src/site/
    geronimo/xbean/trunk/xbean-spring-v2c/src/site/apt/
    geronimo/xbean/trunk/xbean-spring-v2c/src/site/site.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BadAttributeTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BadElementTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BadNamespaceTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BeerNullTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BeerUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BeerUsingXBeanNSTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BeerUsingXBeanSystemPropTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/BeerUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/ComponentTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/FavoriteUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/FavoriteUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/GinUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/KegXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/PizzaUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/PizzaUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/QNameUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/QNameUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RecipeUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RecipeUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingSpringExtendedTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingXBeanMixedTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/SaladUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/SaladUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/SoupUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/SoupUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/SpringExtensionTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/SpringTestSupport.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/VodkaUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/VodkaUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/WineUsingSpringTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/WineUsingXBeanTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/impl/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/context/impl/NamedConstructorArgsTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/BeerService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/ContainerBean.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/DummyBean.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/FavoriteService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/GinService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/InnerBean.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/KegService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/MilliLittersPropertyEditor.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/PizzaService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/QNameService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/Recipe.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/RecipeService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/RestaurantService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/SaladService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/SoupService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/VodkaService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/example/WineService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/generator/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/generator/CheeseService.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/generator/ModelTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/jndi/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/jndi/DefaultContextTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/java/org/apache/xbean/spring/jndi/JndiTest.java
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/schemas/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/schemas/component
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/schemas/pizza-simple
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/schemas/restaurant
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/schemas/salad
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/META-INF/services/org/apache/xbean/spring/http/xbean.apache.org/schemas/soup
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/bad-attribute.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/bad-element.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/bad-namespace.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/beer-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/beer-xbean-ns.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/beer-xbean-null.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/beer-xbean-system-prop.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/beer-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/component-spring.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/component-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/favorite-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/favorite-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/gin.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/keg-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/pizza-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/pizza-xbean-bean-ref.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/pizza-xbean-java.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/pizza-xbean-properties.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/pizza-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/qname-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/qname-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/recipe-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/recipe-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/restaurant-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/restaurant-spring-extended.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-mixed.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-root.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-simple.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/salad-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/salad-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/soup-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/soup-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/spring-extension.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/vodka-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/vodka-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/wine-normal.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/context/wine-xbean.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/jndi/
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/jndi/jndi.xml
    geronimo/xbean/trunk/xbean-spring-v2c/src/test/resources/org/apache/xbean/spring/jndi/spring.xml
Removed:
    geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanQNameHelper.java
Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-spring-itests/pom.xml
    geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java
    geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java
    geronimo/xbean/trunk/xbean-spring/pom.xml

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?view=diff&rev=454790&r1=454789&r2=454790
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Tue Oct 10 08:46:36 2006
@@ -282,6 +282,7 @@
         <module>xbean-spring-v2</module>
         <module>xbean-spring-v2a</module>
         <module>xbean-spring-v2b</module>
+        <module>xbean-spring-v2c</module>
         <module>xbean-spring</module>
         <module>xbean-spring-itests</module>
         <module>xbean-telnet</module>

Propchange: geronimo/xbean/trunk/xbean-spring-itests/2.0/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 10 08:46:36 2006
@@ -0,0 +1 @@
+target

Added: geronimo/xbean/trunk/xbean-spring-itests/2.0/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/2.0/LICENSE.txt?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/2.0/LICENSE.txt (added)
+++ geronimo/xbean/trunk/xbean-spring-itests/2.0/LICENSE.txt Tue Oct 10 08:46:36 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: geronimo/xbean/trunk/xbean-spring-itests/2.0/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/2.0/NOTICE.txt?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/2.0/NOTICE.txt (added)
+++ geronimo/xbean/trunk/xbean-spring-itests/2.0/NOTICE.txt Tue Oct 10 08:46:36 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/xbean/trunk/xbean-spring-itests/2.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/2.0/pom.xml?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/2.0/pom.xml (added)
+++ geronimo/xbean/trunk/xbean-spring-itests/2.0/pom.xml Tue Oct 10 08:46:36 2006
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<!-- $Rev: 437612 $ $Date: 2006-08-28 10:57:37 +0200 (lun., 28 août 2006) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>xbean-spring-itests</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>2.7-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>xbean-spring-itests-20</artifactId>
+    <name>XBean :: Spring :: ITests :: 20</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-spring-itests-core</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

Added: geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/LICENSE?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/LICENSE (added)
+++ geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/LICENSE Tue Oct 10 08:46:36 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/NOTICE?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/NOTICE (added)
+++ geronimo/xbean/trunk/xbean-spring-itests/2.0/src/main/resources/META-INF/NOTICE Tue Oct 10 08:46:36 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/context/Spring20Test.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/context/Spring20Test.java?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/context/Spring20Test.java (added)
+++ geronimo/xbean/trunk/xbean-spring-itests/2.0/src/test/java/org/apache/xbean/spring/context/Spring20Test.java Tue Oct 10 08:46:36 2006
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.spring.context;
+
+public class Spring20Test extends RestaurantUsingXBeanTest {
+
+}

Modified: geronimo/xbean/trunk/xbean-spring-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/pom.xml?view=diff&rev=454790&r1=454789&r2=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-spring-itests/pom.xml Tue Oct 10 08:46:36 2006
@@ -177,6 +177,7 @@
         <module>2.0-rc1</module>
         <module>2.0-rc2</module>
         <module>2.0-rc3</module>
+        <module>2.0</module>
     </modules>
 
     <profiles>

Modified: geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java?view=diff&rev=454790&r1=454789&r2=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java (original)
+++ geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanBeanDefinitionDocumentReader.java Tue Oct 10 08:46:36 2006
@@ -16,6 +16,9 @@
  */
 package org.apache.xbean.spring.context.v2;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
 import org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
@@ -34,7 +37,28 @@
         String namespaceUri = root.getNamespaceURI();
         if (!DomUtils.nodeNameEquals(root, "beans") && 
             !delegate.isDefaultNamespace(namespaceUri)) {
-            delegate.parseCustomElement(root, false);
+            try {
+                try {
+                    Method m = BeanDefinitionParserDelegate.class.getMethod("parseCustomElement", new Class[] { Element.class });
+                    m.invoke(delegate, new Object[] { root });
+                } catch (NoSuchMethodException e) {
+                    try {
+                        Method m = BeanDefinitionParserDelegate.class.getMethod("parseCustomElement", new Class[] { Element.class, boolean.class });
+                        m.invoke(delegate, new Object[] { root, Boolean.FALSE });
+                    } catch (NoSuchMethodException e2) {
+                        throw new IllegalStateException(e);
+                    }
+                }
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalArgumentException e) {
+                throw new RuntimeException(e);
+            } catch (InvocationTargetException e) {
+                if (e.getCause() instanceof RuntimeException) {
+                    throw (RuntimeException) e.getCause();
+                }
+                throw new RuntimeException(e);
+            }
         } else {
             super.parseBeanDefinitions(root, delegate);
         }

Modified: geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java?view=diff&rev=454790&r1=454789&r2=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java (original)
+++ geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanV2Helper.java Tue Oct 10 08:46:36 2006
@@ -52,12 +52,17 @@
     private static String getVersion() {
         if (version == null) {
             try {
-                Class cl = Class.forName("org.springframework.beans.factory.xml.BeanDefinitionParserDelegate");
                 try {
-                    cl.getMethod("parsePropertyElements", new Class[] { Element.class, BeanDefinition.class });
-                    version = "v2b";
-                } catch (NoSuchMethodException e) {
-                    version = "v2a";
+                    Class.forName("org.springframework.beans.factory.parsing.BeanComponentDefinition");
+                    version = "v2c";
+                } catch (ClassNotFoundException e) {
+                    Class cl = Class.forName("org.springframework.beans.factory.xml.BeanDefinitionParserDelegate");
+                    try {
+                        cl.getMethod("parsePropertyElements", new Class[] { Element.class, BeanDefinition.class });
+                        version = "v2b";
+                    } catch (NoSuchMethodException e2) {
+                        version = "v2a";
+                    }
                 }
             } catch (Throwable e) {
                 throw (IllegalStateException) new IllegalStateException("Could not create namespace handler for: " + version).initCause(e);

Added: geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanQNameHelper.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanQNameHelper.java?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanQNameHelper.java (added)
+++ geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanQNameHelper.java Tue Oct 10 08:46:36 2006
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.spring.context.v2;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+
+import org.apache.xbean.spring.context.impl.PropertyEditorHelper;
+import org.apache.xbean.spring.context.impl.QNameReflectionHelper;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.XmlReaderContext;
+import org.w3c.dom.Element;
+
+public class XBeanQNameHelper {
+
+    private XmlReaderContext readerContext;
+    
+    private boolean qnameIsOnClassPath;
+
+    private boolean initQNameOnClassPath;
+    
+    public XBeanQNameHelper(XmlReaderContext readerContext) {
+        this.readerContext = readerContext;
+    }
+    
+    /**
+     * Any namespace aware property values (such as QNames) need to be coerced
+     * while we still have access to the XML Element from which its value comes -
+     * so lets do that now before we trash the DOM and just have the bean
+     * definition.
+     */
+    public void coerceNamespaceAwarePropertyValues(BeanDefinition definition, Element element) {
+        if (definition instanceof AbstractBeanDefinition && isQnameIsOnClassPath()) {
+            AbstractBeanDefinition bd = (AbstractBeanDefinition) definition;
+            // lets check for any QName types
+            BeanInfo beanInfo = getBeanInfo(bd.getBeanClassName());
+            if (beanInfo != null) {
+                PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+                for (int i = 0; i < descriptors.length; i++) {
+                    QNameReflectionHelper.coerceNamespaceAwarePropertyValues(bd, element, descriptors, i);
+                }
+            }
+        }
+    }
+
+    public BeanInfo getBeanInfo(String className) throws BeanDefinitionStoreException {
+        if (className == null) {
+            return null;
+        }
+
+        BeanInfo info = null;
+        Class type = null;
+        try {
+            type = loadClass(className);
+        }
+        catch (ClassNotFoundException e) {
+            throw new BeanDefinitionStoreException("Failed to load type: " + className + ". Reason: " + e, e);
+        }
+        try {
+            info = Introspector.getBeanInfo(type);
+        }
+        catch (IntrospectionException e) {
+            throw new BeanDefinitionStoreException("Failed to introspect type: " + className + ". Reason: " + e, e);
+        }
+        return info;
+    }
+
+    /**
+     * Attempts to load the class on the current thread context class loader or
+     * the class loader which loaded us
+     */
+    protected Class loadClass(String name) throws ClassNotFoundException {
+        ClassLoader beanClassLoader = readerContext.getReader().getBeanClassLoader();
+        if (beanClassLoader != null) {
+            try {
+                return beanClassLoader.loadClass(name);
+            }
+            catch (ClassNotFoundException e) {
+            }
+        }
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        if (contextClassLoader != null) {
+            try {
+                return contextClassLoader.loadClass(name);
+            }
+            catch (ClassNotFoundException e) {
+            }
+        }
+        return getClass().getClassLoader().loadClass(name);
+    }
+
+    protected boolean isQnameIsOnClassPath() {
+        if (initQNameOnClassPath == false) {
+            qnameIsOnClassPath = PropertyEditorHelper.loadClass("javax.xml.namespace.QName") != null;
+            initQNameOnClassPath = true;
+        }
+        return qnameIsOnClassPath;
+    }
+    
+}

Added: geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanQNameHelper.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanQNameHelper.java?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanQNameHelper.java (added)
+++ geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanQNameHelper.java Tue Oct 10 08:46:36 2006
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.spring.context.v2;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+
+import org.apache.xbean.spring.context.impl.PropertyEditorHelper;
+import org.apache.xbean.spring.context.impl.QNameReflectionHelper;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.XmlReaderContext;
+import org.w3c.dom.Element;
+
+public class XBeanQNameHelper {
+
+    private XmlReaderContext readerContext;
+    
+    private boolean qnameIsOnClassPath;
+
+    private boolean initQNameOnClassPath;
+    
+    public XBeanQNameHelper(XmlReaderContext readerContext) {
+        this.readerContext = readerContext;
+    }
+    
+    /**
+     * Any namespace aware property values (such as QNames) need to be coerced
+     * while we still have access to the XML Element from which its value comes -
+     * so lets do that now before we trash the DOM and just have the bean
+     * definition.
+     */
+    public void coerceNamespaceAwarePropertyValues(BeanDefinition definition, Element element) {
+        if (definition instanceof AbstractBeanDefinition && isQnameIsOnClassPath()) {
+            AbstractBeanDefinition bd = (AbstractBeanDefinition) definition;
+            // lets check for any QName types
+            BeanInfo beanInfo = getBeanInfo(bd.getBeanClassName());
+            if (beanInfo != null) {
+                PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+                for (int i = 0; i < descriptors.length; i++) {
+                    QNameReflectionHelper.coerceNamespaceAwarePropertyValues(bd, element, descriptors, i);
+                }
+            }
+        }
+    }
+
+    public BeanInfo getBeanInfo(String className) throws BeanDefinitionStoreException {
+        if (className == null) {
+            return null;
+        }
+
+        BeanInfo info = null;
+        Class type = null;
+        try {
+            type = loadClass(className);
+        }
+        catch (ClassNotFoundException e) {
+            throw new BeanDefinitionStoreException("Failed to load type: " + className + ". Reason: " + e, e);
+        }
+        try {
+            info = Introspector.getBeanInfo(type);
+        }
+        catch (IntrospectionException e) {
+            throw new BeanDefinitionStoreException("Failed to introspect type: " + className + ". Reason: " + e, e);
+        }
+        return info;
+    }
+
+    /**
+     * Attempts to load the class on the current thread context class loader or
+     * the class loader which loaded us
+     */
+    protected Class loadClass(String name) throws ClassNotFoundException {
+        ClassLoader beanClassLoader = readerContext.getReader().getBeanClassLoader();
+        if (beanClassLoader != null) {
+            try {
+                return beanClassLoader.loadClass(name);
+            }
+            catch (ClassNotFoundException e) {
+            }
+        }
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        if (contextClassLoader != null) {
+            try {
+                return contextClassLoader.loadClass(name);
+            }
+            catch (ClassNotFoundException e) {
+            }
+        }
+        return getClass().getClassLoader().loadClass(name);
+    }
+
+    protected boolean isQnameIsOnClassPath() {
+        if (initQNameOnClassPath == false) {
+            qnameIsOnClassPath = PropertyEditorHelper.loadClass("javax.xml.namespace.QName") != null;
+            initQNameOnClassPath = true;
+        }
+        return qnameIsOnClassPath;
+    }
+    
+}

Propchange: geronimo/xbean/trunk/xbean-spring-v2c/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 10 08:46:36 2006
@@ -0,0 +1,3 @@
+.classpath
+.project
+target

Added: geronimo/xbean/trunk/xbean-spring-v2c/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2c/LICENSE.txt?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2c/LICENSE.txt (added)
+++ geronimo/xbean/trunk/xbean-spring-v2c/LICENSE.txt Tue Oct 10 08:46:36 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Added: geronimo/xbean/trunk/xbean-spring-v2c/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2c/NOTICE.txt?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2c/NOTICE.txt (added)
+++ geronimo/xbean/trunk/xbean-spring-v2c/NOTICE.txt Tue Oct 10 08:46:36 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/xbean/trunk/xbean-spring-v2c/README.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2c/README.txt?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2c/README.txt (added)
+++ geronimo/xbean/trunk/xbean-spring-v2c/README.txt Tue Oct 10 08:46:36 2006
@@ -0,0 +1,6 @@
+This module contains the Spring additions for XBean which 
+
+* provide a custom XML extension mechanism, allowing more concise XML to be used 
+	along with XSDs so that they can be more easily validated with off the shelf XML tooling
+
+* LDAP enhancements to Spring's configuration mechanism.

Added: geronimo/xbean/trunk/xbean-spring-v2c/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2c/pom.xml?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2c/pom.xml (added)
+++ geronimo/xbean/trunk/xbean-spring-v2c/pom.xml Tue Oct 10 08:46:36 2006
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>xbean</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <version>2.7-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>xbean-spring-v2c</artifactId>
+    <name>XBean :: Spring :: V2C</name>
+
+    <dependencies>
+    
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>2.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-spring-v2</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+        <dependency>
+            <groupId>qdox</groupId>
+            <artifactId>qdox</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>target/test-generated</directory>
+            </testResource>
+        </testResources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/BeerUsingXBeanNSTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef classname="org.apache.xbean.spring.generator.MappingGeneratorTask" name="mapping">
+                                    <classpath>
+                                        <pathelement path="${basedir}/target/classes"></pathelement>
+                                        <pathelement path="${basedir}/target/test-classes"></pathelement>
+                                        <path refid="maven.runtime.classpath"></path>
+                                    </classpath>
+                                </taskdef>
+                                <mapping namespace="http://xbean.apache.org/schemas/pizza" srcdir="src/test/java" destFile="target/restaurant.xsd" metaInfDir="${basedir}/target/test-generated/"></mapping>
+                                <copy todir="${basedir}/target/test-classes">
+                                    <fileset dir="${basedir}/target/test-generated"></fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java?view=auto&rev=454790
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java (added)
+++ geronimo/xbean/trunk/xbean-spring-v2c/src/main/java/org/apache/xbean/spring/context/v2c/XBeanBeanDefinitionParserDelegate.java Tue Oct 10 08:46:36 2006
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.spring.context.v2c;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.xbean.spring.context.impl.PropertyEditorHelper;
+import org.apache.xbean.spring.context.impl.QNameReflectionHelper;
+import org.apache.xbean.spring.context.v2.XBeanNamespaceHandler;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
+import org.springframework.beans.factory.xml.XmlReaderContext;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class XBeanBeanDefinitionParserDelegate extends BeanDefinitionParserDelegate {
+
+    public static final String QNAME_ELEMENT = "qname";
+    
+    private XBeanQNameHelper qnameHelper;
+    
+    static {
+        PropertyEditorHelper.registerCustomEditors();
+    }
+    
+    public XBeanBeanDefinitionParserDelegate(XmlReaderContext readerContext) {
+        super(readerContext);
+        qnameHelper = new XBeanQNameHelper(readerContext);
+    }
+
+    public Object parsePropertySubElement(Element ele, BeanDefinition bd, String defaultTypeClassName) {
+        if (!isDefaultNamespace(ele.getNamespaceURI())) {
+            return internalParseNestedCustomElement(ele);
+        } 
+        else if (ele.getTagName().equals(QNAME_ELEMENT)) {
+            return parseQNameElement(ele);
+        } 
+        else {
+            return super.parsePropertySubElement(ele, bd, defaultTypeClassName);
+        }
+    }
+
+    public AbstractBeanDefinition parseBeanDefinitionElement(Element ele, String beanName, BeanDefinition containingBean) {
+        AbstractBeanDefinition bd = super.parseBeanDefinitionElement(ele, beanName, containingBean);
+        qnameHelper.coerceNamespaceAwarePropertyValues(bd, ele);
+        return bd;
+    }
+    
+    public boolean isDefaultNamespace(String namespaceUri) {
+        return (!StringUtils.hasLength(namespaceUri) || 
+               BEANS_NAMESPACE_URI.equals(namespaceUri)) ||
+               XBeanNamespaceHandler.SPRING_SCHEMA.equals(namespaceUri) ||
+               XBeanNamespaceHandler.SPRING_SCHEMA_COMPAT.equals(namespaceUri);
+    }
+    
+    protected Object parseQNameElement(Element element) {
+        return QNameReflectionHelper.createQName(element, getElementText(element));
+    }
+
+    protected String getElementText(Element element) {
+        StringBuffer buffer = new StringBuffer();
+        NodeList nodeList = element.getChildNodes();
+        for (int i = 0, size = nodeList.getLength(); i < size; i++) {
+            Node node = nodeList.item(i);
+            if (node.getNodeType() == Node.TEXT_NODE) {
+                buffer.append(node.getNodeValue());
+            }
+        }
+        return buffer.toString();
+    }
+    
+    private Object internalParseNestedCustomElement(Element candidateEle) {
+        try {
+            Method mth = getClass().getSuperclass().getDeclaredMethod("parseNestedCustomElement", new Class[] { Element.class, BeanDefinition.class });
+            mth.setAccessible(true);
+            return mth.invoke(this, new Object[] { candidateEle, null });
+        } catch (Exception e) {
+            if (e instanceof InvocationTargetException && e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            }
+            throw new IllegalStateException("Unable to invoke parseNestedCustomElement method", e);
+        }
+    }
+
+}



Mime
View raw message