This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxbean-java.
commit 846bfc6f68ace0db380318edbff8881395021db1 Merge: 39fe88b fe11305 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 29 00:31:46 2014 +0200 Merge tag 'upstream/4.0' Upstream version 4.0 NOTICE | 2 +- maven-xbean-plugin/pom.xml | 230 +-- .../java/org/apache/xbean/maven/XBeanMojo.java | 545 +++--- pom.xml | 115 +- src/site/site.xml | 2 +- xbean-asm-util/pom.xml | 48 + .../xbean/asm5/original/commons/EmptyVisitor.java | 394 ++++ {xbean-asm-shaded => xbean-asm5-shaded}/pom.xml | 69 +- .../main/appended-resources/META-INF/LICENSE.vm | 2 +- xbean-blueprint/pom.xml | 364 ++-- .../xbean/blueprint/cm/CmNamespaceHandler.java | 16 +- .../xbean/blueprint/cm/JexlExpressionParser.java | 2 +- .../blueprint/cm/JexlPropertyPlaceholder.java | 14 +- .../context/impl/QNameNamespaceHandler.java | 2 +- .../context/impl/XBeanNamespaceHandler.java | 2 +- .../blueprint/generator/ParameterMapping.java | 2 +- .../blueprint/generator/QdoxMappingLoader.java | 2 +- .../xbean/blueprint/generator/XsdGenerator.java | 2 +- .../blueprint/context/BlueprintTestSupport.java | 53 +- .../xbean/blueprint/context/impl/JexlTest.java | 2 +- xbean-bundleutils/pom.xml | 52 +- .../xbean/osgi/bundle/util/BundleClassFinder.java | 8 +- .../xbean/osgi/bundle/util/BundleClassLoader.java | 109 +- .../xbean/osgi/bundle/util/BundleDescription.java | 2 +- .../bundle/util/BundleResourceClassLoader.java | 45 + .../osgi/bundle/util/BundleResourceFinder.java | 119 +- .../osgi/bundle/util/BundleResourceHelper.java | 265 +++ .../apache/xbean/osgi/bundle/util/BundleUtils.java | 223 ++- .../osgi/bundle/util/ClassDiscoveryFilter.java | 2 +- .../xbean/osgi/bundle/util/DelegatingBundle.java | 285 ++- .../osgi/bundle/util/DelegatingBundleContext.java | 53 +- .../bundle/util/DelegatingBundleReference.java | 46 + .../xbean/osgi/bundle/util/DictionaryMap.java | 2 +- .../xbean/osgi/bundle/util/DiscoveryRange.java | 2 +- .../xbean/osgi/bundle/util/HeaderBuilder.java | 66 + .../xbean/osgi/bundle/util/HeaderParser.java | 89 +- .../osgi/bundle/util/ResourceDiscoveryFilter.java | 2 +- .../EquinoxBundleClassLoader.java} | 119 +- .../util/equinox/EquinoxBundleResourceHelper.java | 89 + .../xbean/osgi/bundle/util/jar/BundleJarEntry.java | 2 +- .../xbean/osgi/bundle/util/jar/BundleJarFile.java | 2 +- .../xbean/osgi/bundle/util/HeaderParserTest.java | 55 +- xbean-classloader/pom.xml | 14 +- .../xbean/classloader/AbstractResourceHandle.java | 2 +- .../classloader/AbstractUrlResourceLocation.java | 2 +- .../xbean/classloader/DirectoryResourceHandle.java | 2 +- .../classloader/DirectoryResourceLocation.java | 2 +- .../java/org/apache/xbean/classloader/IoUtil.java | 2 +- .../xbean/classloader/JarFileClassLoader.java | 145 +- .../xbean/classloader/JarFileUrlConnection.java | 2 +- .../xbean/classloader/JarFileUrlStreamHandler.java | 2 +- .../xbean/classloader/JarResourceHandle.java | 2 +- .../xbean/classloader/JarResourceLocation.java | 2 +- .../xbean/classloader/MultiParentClassLoader.java | 26 +- .../xbean/classloader/ResourceEnumeration.java | 2 +- .../apache/xbean/classloader/ResourceFinder.java | 2 +- .../apache/xbean/classloader/ResourceHandle.java | 2 +- .../apache/xbean/classloader/ResourceLocation.java | 2 +- .../apache/xbean/classloader/UnionEnumeration.java | 2 +- .../xbean/classloader/UrlResourceFinder.java | 2 +- .../classloader/MultiParentClassLoaderTest.java | 12 +- .../xbean/classloader/UrlResourceFinderTest.java | 42 +- xbean-classpath/pom.xml | 72 +- .../apache/xbean/classpath/SunURLClassPath.java | 26 +- .../apache/xbean/classpath/TomcatClassPath.java | 43 +- xbean-finder-shaded/pom.xml | 138 +- xbean-finder/pom.xml | 168 +- .../org/apache/xbean/finder/AbstractFinder.java | 505 ++++- .../java/org/apache/xbean/finder/Annotated.java} | 51 +- .../org/apache/xbean/finder/AnnotatedMember.java} | 49 +- .../org/apache/xbean/finder/AnnotatedMethod.java} | 64 +- .../org/apache/xbean/finder/AnnotationFinder.java | 2010 ++++++++++++++++++++ .../xbean/finder/BundleAnnotationFinder.java | 40 +- .../xbean/finder/BundleAssignableClassFinder.java | 27 +- .../java/org/apache/xbean/finder/ClassFinder.java | 63 +- .../java/org/apache/xbean/finder/ClassLoaders.java | 118 ++ .../org/apache/xbean/finder/IAnnotationFinder.java | 59 + .../org/apache/xbean/finder/MetaAnnotated.java} | 51 +- .../apache/xbean/finder/MetaAnnotatedClass.java | 294 +++ .../xbean/finder/MetaAnnotatedConstructor.java | 78 + .../apache/xbean/finder/MetaAnnotatedElement.java | 292 +++ .../apache/xbean/finder/MetaAnnotatedField.java} | 32 +- .../apache/xbean/finder/MetaAnnotatedMethod.java | 78 + .../org/apache/xbean/finder/MetaAnnotation.java} | 33 +- .../java/org/apache/xbean/finder/Parameter.java | 118 ++ .../org/apache/xbean/finder/ResourceFinder.java | 178 +- .../main/java/org/apache/xbean/finder/UriSet.java | 149 ++ .../main/java/org/apache/xbean/finder/UrlSet.java | 73 +- .../org/apache/xbean/finder/archive/Archive.java} | 58 +- .../xbean/finder/archive/ArchiveIterator.java | 59 + .../apache/xbean/finder/archive/BundleArchive.java | 98 + .../xbean/finder/archive/ClassesArchive.java | 93 + .../xbean/finder/archive/ClasspathArchive.java | 118 ++ .../xbean/finder/archive/CompositeArchive.java | 104 + .../apache/xbean/finder/archive/FileArchive.java | 175 ++ .../xbean/finder/archive/FilteredArchive.java | 93 + .../apache/xbean/finder/archive/JarArchive.java | 156 ++ .../apache/xbean/finder/filter/ClassFilter.java} | 83 +- .../apache/xbean/finder/filter/ContainsFilter.java | 60 + .../xbean/finder/filter/ExcludeIncludeFilter.java} | 28 +- .../org/apache/xbean/finder/filter/Filter.java} | 47 +- .../org/apache/xbean/finder/filter/FilterList.java | 58 + .../org/apache/xbean/finder/filter/Filters.java | 162 ++ .../xbean/finder/filter/IncludeExcludeFilter.java | 44 + .../apache/xbean/finder/filter/PackageFilter.java | 61 + .../apache/xbean/finder/filter/PatternFilter.java | 66 + .../apache/xbean/finder/filter/PrefixFilter.java | 60 + .../apache/xbean/finder/filter/SuffixFilter.java | 60 + .../java/org/apache/xbean/finder/util/Classes.java | 96 + .../java/org/apache/xbean/finder/util/Files.java | 51 + .../apache/xbean/finder/util/SingleLinkedList.java | 246 +++ .../src/test/java/org/acme/BarUrlHandler.java | 2 +- .../{foo/Green.java => ClassAnnotatedClass.java} | 27 +- .../src/test/java/org/acme/FooUrlHandler.java | 2 +- .../org/acme/{Three.java => NotAnnotated.java} | 25 +- xbean-finder/src/test/java/org/acme/One.java | 2 +- xbean-finder/src/test/java/org/acme/Three.java | 2 +- xbean-finder/src/test/java/org/acme/Two.java | 2 +- .../src/test/java/org/acme/bar/AnnType.java | 2 +- .../acme/bar/{Field.java => ClassAnnotation.java} | 9 +- .../src/test/java/org/acme/bar/Construct.java | 2 +- xbean-finder/src/test/java/org/acme/bar/Field.java | 2 +- .../src/test/java/org/acme/bar/FullyAnnotated.java | 2 +- xbean-finder/src/test/java/org/acme/bar/Get.java | 2 +- .../src/test/java/org/acme/bar/Method.java | 2 +- .../src/test/java/org/acme/bar/Optional.java | 2 +- .../src/test/java/org/acme/bar/Package.java | 2 +- .../src/test/java/org/acme/bar/ParamA.java | 2 +- .../src/test/java/org/acme/bar/ParamB.java | 2 +- xbean-finder/src/test/java/org/acme/bar/Set.java | 2 +- xbean-finder/src/test/java/org/acme/bar/Type.java | 2 +- .../src/test/java/org/acme/bar/Variable.java | 2 +- xbean-finder/src/test/java/org/acme/foo/Blue.java | 2 +- xbean-finder/src/test/java/org/acme/foo/Color.java | 2 +- .../src/test/java/org/acme/foo/Deployable.java | 2 +- .../test/java/org/acme/foo/FamilyHalloween.java | 46 +- .../java/org/acme/foo/FunnyFamilyHalloween.java | 46 +- xbean-finder/src/test/java/org/acme/foo/Green.java | 2 +- .../src/test/java/org/acme/foo/Halloween.java | 2 +- .../src/test/java/org/acme/foo/Holiday.java | 2 +- .../src/test/java/org/acme/foo/Primary.java | 2 +- .../src/test/java/org/acme/foo/Property.java | 2 +- xbean-finder/src/test/java/org/acme/foo/Red.java | 2 +- .../src/test/java/org/acme/foo/Thanksgiving.java | 2 +- .../src/test/java/org/acme/foo/ValentinesDay.java | 2 +- .../test/java/org/acme/javaURLContextFactory.java | 2 +- .../java/org/acme/kernelURLContextFactory.java | 2 +- .../test/java/org/acme/ldapURLContextFactory.java | 2 +- .../xbean/finder/AnnotatedParametersTest.java | 61 + .../xbean/finder/ClassAnnotationFinderTest.java | 94 + .../apache/xbean/finder/ClassFinderDepthTest.java | 131 ++ .../org/apache/xbean/finder/ClassFinderTest.java | 54 +- .../xbean/finder/ClassLoadersPerformancesTest.java | 54 + .../xbean/finder/ClassLoadersTest.java} | 28 +- .../apache/xbean/finder/FileDecodeFinderTest.java | 59 + .../java/org/apache/xbean/finder/FiltersTest.java | 117 ++ .../org/apache/xbean/finder/FinderSelectTest.java | 65 + .../xbean/finder/MetaAnnotatedClassTest.java | 274 +++ .../MetaAnnotatedConstructorParametersTest.java | 294 +++ .../xbean/finder/MetaAnnotatedConstructorTest.java | 332 ++++ .../xbean/finder/MetaAnnotatedFieldTest.java | 326 ++++ .../finder/MetaAnnotatedMethodParametersTest.java | 298 +++ .../xbean/finder/MetaAnnotatedMethodTest.java | 326 ++++ .../ResourceFinderFromWithWeirdUrlTest.java} | 29 +- .../apache/xbean/finder/ResourceFinderTest.java | 84 +- .../xbean/finder/RootMetaAnnotatedClassTest.java | 280 +++ .../xbean/finder/SelectMetaAnnotatedClassTest.java | 284 +++ .../apache/xbean/finder/SingleLinkedListTest.java | 168 ++ .../java/org/apache/xbean/finder/UrlSetTest.java | 86 +- .../org/apache/xbean/finder/archive/Archives.java | 149 ++ .../xbean/finder/archive/ClassesArchiveTest.java | 84 + .../xbean/finder/archive/ClasspathArchiveTest.java | 115 ++ .../xbean/finder/archive/CompositeArchiveTest.java | 89 + .../finder/archive/CompositeJarArchiveTest.java | 100 + .../xbean/finder/archive/FileArchiveTest.java | 123 ++ .../xbean/finder/archive/FilteredArchiveTest.java | 155 ++ .../xbean/finder/archive/JarArchiveTest.java | 108 ++ .../apache/xbean/finder/archive/MockArchive.java | 56 + .../java/org/apache/xbean/finder/util/IOUtil.java | 109 ++ xbean-naming/pom.xml | 68 +- .../xbean/naming/context/AbstractContext.java | 1720 ++++++++--------- .../xbean/naming/context/ContextFederation.java | 12 +- .../apache/xbean/naming/context/ContextUtil.java | 23 +- .../naming/context/ImmutableFederatedContext.java | 2 +- .../context/ImmutableFederatedContextTest.java | 2 +- .../xbean/naming/context/ReferenceableTest.java | 2 +- .../naming/global/GlobalContextManagerTest.java | 1 + .../org/apache/xbean/naming/referenceable/Foo.java | 2 +- .../xbean/naming/referenceable/FooFactory.java | 2 +- xbean-reflect/pom.xml | 256 +-- .../xbean/propertyeditor/AbstractConverter.java | 10 +- .../xbean/propertyeditor/CharacterEditor.java | 2 +- .../apache/xbean/propertyeditor/StringEditor.java | 2 +- .../org/apache/xbean/propertyeditor/URLEditor.java | 2 +- .../java/org/apache/xbean/recipe/ArrayRecipe.java | 2 +- .../xbean/recipe/AsmParameterNameLoader.java | 17 +- .../org/apache/xbean/recipe/ReflectionUtil.java | 35 +- .../xbean/recipe/XbeanAsmParameterNameLoader.java | 38 +- .../xbean/propertyeditor/DateEditorTest.java | 2 +- .../org/apache/xbean/recipe/ArrayRecipeTest.java | 2 +- .../apache/xbean/recipe/CollectionRecipeTest.java | 2 +- .../org/apache/xbean/recipe/ObjectRecipeTest.java | 18 + xbean-spring/pom.xml | 300 ++- .../xbean/spring/context/impl/XBeanHelper.java | 102 +- .../spring/context/impl/XBeanXmlBeanFactory.java | 152 +- .../v2/XBeanBeanDefinitionDocumentReader.java | 370 ++-- .../context/v2/XBeanNamespaceHandlerResolver.java | 82 +- .../xbean/spring/context/v2/XBeanV2Helper.java | 146 +- .../spring/context/v2/XBeanXmlBeanFactory.java | 150 +- .../v2c/XBeanBeanDefinitionParserDelegate.java | 198 +- .../spring/context/v2c/XBeanNamespaceHandler.java | 16 +- .../xbean/spring/context/v2c/XBeanQNameHelper.java | 236 +-- .../apache/xbean/spring/generator/LogFacade.java | 48 +- .../apache/xbean/spring/generator/MapMapping.java | 114 +- .../spring/generator/MappingGeneratorTask.java | 13 +- .../xbean/spring/generator/ParameterMapping.java | 76 +- .../xbean/spring/generator/QdoxMappingLoader.java | 2 +- .../generator/WikiDocumentationGenerator.java | 424 ++--- .../xbean/spring/generator/XsdGenerator.java | 19 +- .../apache/xbean/spring/jndi/DefaultContext.java | 904 ++++----- .../spring/jndi/SpringInitialContextFactory.java | 212 +-- .../org/apache/xbean/spring/spring-beans.xsd | 1418 +++++++------- .../xbean/spring/context/BadAttributeTest.java | 74 +- .../xbean/spring/context/BadElementTest.java | 74 +- .../xbean/spring/context/BadNamespaceTest.java | 74 +- .../apache/xbean/spring/context/BeerNullTest.java | 94 +- .../apache/xbean/spring/context/ComponentTest.java | 98 +- .../xbean/spring/context/QNameUsingSpringTest.java | 94 +- .../xbean/spring/context/QNameUsingXBeanTest.java | 54 +- ...gSpringTest.java => Recipe2UsingXBeanTest.java} | 98 +- .../spring/context/RecipeUsingSpringTest.java | 98 +- .../xbean/spring/context/RecipeUsingXBeanTest.java | 54 +- .../context/RestaurantUsingXBeanAsRootTest.java | 52 +- .../xbean/spring/context/SaladUsingSpringTest.java | 78 +- .../xbean/spring/context/SaladUsingXBeanTest.java | 64 +- .../spring/context/SocketAddressSpringTest.java | 126 +- .../spring/context/SocketAddressXBeanTest.java | 74 +- .../xbean/spring/context/SoupUsingSpringTest.java | 108 +- .../xbean/spring/context/SoupUsingXBeanTest.java | 64 +- .../xbean/spring/context/SpringExtensionTest.java | 72 +- .../xbean/spring/context/VodkaUsingSpringTest.java | 84 +- .../xbean/spring/context/VodkaUsingXBeanTest.java | 64 +- .../context/impl/NamedConstructorArgsTest.java | 162 +- .../apache/xbean/spring/example/ContainerBean.java | 74 +- .../org/apache/xbean/spring/example/DummyBean.java | 84 +- .../org/apache/xbean/spring/example/InnerBean.java | 62 +- .../apache/xbean/spring/example/QNameService.java | 98 +- .../org/apache/xbean/spring/example/Recipe.java | 96 +- .../apache/xbean/spring/example/RecipeService.java | 108 +- .../{RecipeService.java => RecipeService2.java} | 106 +- .../apache/xbean/spring/example/SaladService.java | 124 +- .../apache/xbean/spring/example/SoupService.java | 166 +- .../apache/xbean/spring/example/VodkaService.java | 126 +- .../xbean/spring/generator/CheeseService.java | 112 +- .../apache/xbean/spring/generator/ModelTest.java | 424 ++--- .../xbean/spring/jndi/DefaultContextTest.java | 136 +- .../org/apache/xbean/spring/jndi/JndiTest.java | 134 +- .../apache/xbean/spring/context/bad-attribute.xml | 48 +- .../apache/xbean/spring/context/bad-element.xml | 48 +- .../apache/xbean/spring/context/bad-namespace.xml | 48 +- .../apache/xbean/spring/context/beer-xbean-ns.xml | 58 +- .../xbean/spring/context/beer-xbean-null.xml | 58 +- .../xbean/spring/context/component-spring.xml | 56 +- .../xbean/spring/context/component-xbean.xml | 52 +- .../apache/xbean/spring/context/flatmap-xbean.xml | 68 +- .../apache/xbean/spring/context/qname-normal.xml | 92 +- .../apache/xbean/spring/context/qname-xbean.xml | 66 +- .../apache/xbean/spring/context/recipe-normal.xml | 84 +- .../apache/xbean/spring/context/recipe-xbean.xml | 74 +- .../context/{qname-xbean.xml => recipe2-xbean.xml} | 74 +- .../spring/context/restaurant-xbean-mixed.xml | 112 +- .../apache/xbean/spring/context/salad-normal.xml | 58 +- .../apache/xbean/spring/context/salad-xbean.xml | 54 +- .../xbean/spring/context/socket-address-normal.xml | 82 +- .../apache/xbean/spring/context/socket-address.xml | 64 +- .../apache/xbean/spring/context/soup-normal.xml | 62 +- .../org/apache/xbean/spring/context/soup-xbean.xml | 80 +- .../xbean/spring/context/spring-extension.xml | 46 +- .../org/apache/xbean/spring/jndi/jndi.xml | 94 +- .../org/apache/xbean/spring/jndi/spring.xml | 90 +- xbean-telnet/pom.xml | 90 +- .../apache/xbean/terminal/telnet/TelnetOption.java | 138 +- .../apache/xbean/terminal/telnet/TelnetShell.java | 146 +- 283 files changed, 19971 insertions(+), 8193 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxbean-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
