From 07ea9c1b8334ac4d837e3b5bba04972005d1bc69 Mon Sep 17 00:00:00 2001 From: spullara-codehaus Date: Sat, 15 Oct 2005 20:43:42 +0000 Subject: [PATCH 001/736] change the forkmode junit to once rather than running them in the maven process. this exposed an initialization bug in the xbean parser where custom editors were being registered in the xbean:generate goal and the tests depended on that. also change the xbean:generate goal to a post goal so the test classes are compile before running the generator so you don't see warnings on a clean build. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380420 13f79535-47bb-0310-9956-ffa450edef68 --- project.properties | 4 +++- spring/maven.xml | 4 ++-- .../spring/context/impl/XBeanXmlBeanDefinitionParser.java | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/project.properties b/project.properties index ee39ee17..23886308 100644 --- a/project.properties +++ b/project.properties @@ -1 +1,3 @@ -maven.multiproject.include=*/project.xml \ No newline at end of file +maven.multiproject.include=*/project.xml +maven.junit.fork=yes +maven.junit.forkmode=once diff --git a/spring/maven.xml b/spring/maven.xml index 1adc935d..7c9915ac 100644 --- a/spring/maven.xml +++ b/spring/maven.xml @@ -16,9 +16,9 @@ --> - + - + diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index a9eeda0d..5222582f 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -63,6 +63,10 @@ */ public class XBeanXmlBeanDefinitionParser extends DefaultXmlBeanDefinitionParser { + static { + PropertyEditorHelper.registerCustomEditors(); + } + private static final Log log = LogFactory.getLog(XBeanXmlBeanDefinitionParser.class); /** From 7bfde715f01cfb4d333015c3f33bda9412637c53 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Sat, 15 Oct 2005 20:48:41 +0000 Subject: [PATCH 002/736] Added dependency on commons logging for tests git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380421 13f79535-47bb-0310-9956-ffa450edef68 --- server/project.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/project.xml b/server/project.xml index 8ab83e89..39f88a3e 100644 --- a/server/project.xml +++ b/server/project.xml @@ -59,6 +59,11 @@ + + commons-logging + commons-logging + 1.0.3 + backport175 backport175 From 5784ba5eca0d5fcd3d76d9239db593ce7fbd9d94 Mon Sep 17 00:00:00 2001 From: spullara-codehaus Date: Sat, 15 Oct 2005 21:41:09 +0000 Subject: [PATCH 003/736] prepare to be able to use emma for code coverage git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380422 13f79535-47bb-0310-9956-ffa450edef68 --- server/maven.xml | 2 +- spring/maven.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/maven.xml b/server/maven.xml index f848a205..25a1ee95 100644 --- a/server/maven.xml +++ b/server/maven.xml @@ -42,7 +42,7 @@ - + diff --git a/spring/maven.xml b/spring/maven.xml index 7c9915ac..7aa6e1e6 100644 --- a/spring/maven.xml +++ b/spring/maven.xml @@ -45,8 +45,7 @@ - - + From da6dd392fc7a5837047a56f183e0452a85a70fdc Mon Sep 17 00:00:00 2001 From: spullara-codehaus Date: Sat, 15 Oct 2005 22:12:22 +0000 Subject: [PATCH 004/736] you can now run 'maven emma' for code coverage reports git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380423 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/project.properties | 3 ++- classpath/project.xml | 6 ++++++ kernel/project.properties | 3 ++- kernel/project.xml | 6 ++++++ project.xml | 1 + server/project.properties | 3 ++- server/project.xml | 6 ++++++ spring/project.properties | 3 ++- spring/project.xml | 7 +++++++ telnet/project.properties | 3 ++- telnet/project.xml | 6 ++++++ 11 files changed, 42 insertions(+), 5 deletions(-) diff --git a/classpath/project.properties b/classpath/project.properties index 07280f09..d8a8fc95 100644 --- a/classpath/project.properties +++ b/classpath/project.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven maven.compile.source=1.4 maven.compile.target=1.4 @@ -32,3 +32,4 @@ maven.javadoc.additionalparam=-linksource maven.site.deploy.method=rsync maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/classpath/project.xml b/classpath/project.xml index 668108f0..8616727a 100644 --- a/classpath/project.xml +++ b/classpath/project.xml @@ -59,6 +59,12 @@ + + emma + maven-emma-plugin + 0.6 + plugin + diff --git a/kernel/project.properties b/kernel/project.properties index 07280f09..d8a8fc95 100644 --- a/kernel/project.properties +++ b/kernel/project.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven maven.compile.source=1.4 maven.compile.target=1.4 @@ -32,3 +32,4 @@ maven.javadoc.additionalparam=-linksource maven.site.deploy.method=rsync maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/kernel/project.xml b/kernel/project.xml index 7be8e828..d70d9388 100644 --- a/kernel/project.xml +++ b/kernel/project.xml @@ -64,6 +64,12 @@ backport-util-concurrent 2.0_01_pd + + emma + maven-emma-plugin + 0.6 + plugin + diff --git a/project.xml b/project.xml index 954d0e38..d9ccd07c 100644 --- a/project.xml +++ b/project.xml @@ -27,5 +27,6 @@ org.xbean + diff --git a/server/project.properties b/server/project.properties index 07280f09..e7a00a67 100644 --- a/server/project.properties +++ b/server/project.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/mave,http://emma.sourceforge.net/maven maven.compile.source=1.4 maven.compile.target=1.4 @@ -32,3 +32,4 @@ maven.javadoc.additionalparam=-linksource maven.site.deploy.method=rsync maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/server/project.xml b/server/project.xml index 39f88a3e..c26d7a42 100644 --- a/server/project.xml +++ b/server/project.xml @@ -100,6 +100,12 @@ xbean-spring 2.0-SNAPSHOT + + emma + maven-emma-plugin + 0.6 + plugin + diff --git a/spring/project.properties b/spring/project.properties index 07280f09..d8a8fc95 100644 --- a/spring/project.properties +++ b/spring/project.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven maven.compile.source=1.4 maven.compile.target=1.4 @@ -32,3 +32,4 @@ maven.javadoc.additionalparam=-linksource maven.site.deploy.method=rsync maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/spring/project.xml b/spring/project.xml index f935f3cc..7ab31e30 100644 --- a/spring/project.xml +++ b/spring/project.xml @@ -104,6 +104,13 @@ junit 3.8.1 + + + emma + maven-emma-plugin + 0.6 + plugin + diff --git a/telnet/project.properties b/telnet/project.properties index 07280f09..d8a8fc95 100644 --- a/telnet/project.properties +++ b/telnet/project.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven maven.compile.source=1.4 maven.compile.target=1.4 @@ -32,3 +32,4 @@ maven.javadoc.additionalparam=-linksource maven.site.deploy.method=rsync maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/telnet/project.xml b/telnet/project.xml index a75cadc1..2875a3ed 100644 --- a/telnet/project.xml +++ b/telnet/project.xml @@ -64,6 +64,12 @@ groovy 1.0-jsr-03 + + emma + maven-emma-plugin + 0.6 + plugin + From a2d61b21d4d99efb11af60fbb200e290d2506bac Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Sat, 15 Oct 2005 22:19:33 +0000 Subject: [PATCH 005/736] enum is a bad variable name. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380424 13f79535-47bb-0310-9956-ffa450edef68 --- telnet/src/java/org/xbean/telnet/Lookup.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/telnet/src/java/org/xbean/telnet/Lookup.java b/telnet/src/java/org/xbean/telnet/Lookup.java index eef8ddbd..06d9514e 100755 --- a/telnet/src/java/org/xbean/telnet/Lookup.java +++ b/telnet/src/java/org/xbean/telnet/Lookup.java @@ -82,9 +82,9 @@ public void exec(String[] args, InputStream in, PrintStream out) throws IOExcept public void list(String name, InputStream in, PrintStream out) throws IOException { try { - NamingEnumeration enum = null; + NamingEnumeration names = null; try { - enum = ctx.list(name); + names = ctx.list(name); } catch (NameNotFoundException e) { out.print("lookup: "); out.print(name); @@ -95,11 +95,11 @@ enum = ctx.list(name); e.printStackTrace(new PrintStream(out)); return; } - if (enum == null) { + if (names == null) { return; } - while (enum.hasMore()) { - NameClassPair entry = (NameClassPair) enum.next(); + while (names.hasMore()) { + NameClassPair entry = (NameClassPair) names.next(); out.println(entry.getName()); } } catch (Exception e) { From ad0cfa93015f1d2db5bec7df30896bdee5f6d63c Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Sat, 15 Oct 2005 23:18:19 +0000 Subject: [PATCH 006/736] Some of us live under Mr. Gates thumb. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380425 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/server/classloader/MultiParentClassLoaderTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/test/org/xbean/server/classloader/MultiParentClassLoaderTest.java b/server/src/test/org/xbean/server/classloader/MultiParentClassLoaderTest.java index 3d5bb897..2a5113a5 100644 --- a/server/src/test/org/xbean/server/classloader/MultiParentClassLoaderTest.java +++ b/server/src/test/org/xbean/server/classloader/MultiParentClassLoaderTest.java @@ -220,7 +220,7 @@ public void testGetResources() throws Exception { } /** - * Test getResources returns an empty enumeration when attempt is made to loade a non-existant resource. + * Test getResources returns an empty enumeration when attempt is made to loade a non-existant resource. * @throws Exception if a problem occurs */ public void testGetNonExistantResources() throws Exception { @@ -342,7 +342,6 @@ protected void tearDown() throws Exception { super.tearDown(); for (int i = 0; i < files.length; i++) { files[i].delete(); - assertFileNotExists(files[i]); } } From 77f03d4f7cf674898e455276ec8285c85f69f903 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Sun, 16 Oct 2005 00:37:10 +0000 Subject: [PATCH 007/736] Removed unused annotation code. Removed post processors since they are not integrated into the parser. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380426 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/annotation/AnnotationProvider.java | 144 -------- .../Backport175AnnotationProvider.java | 145 -------- .../server/annotation/DefaultConstructor.java | 29 -- .../server/annotation/ParameterNames.java | 33 -- .../spring/configuration/DefaultProperty.java | 102 ------ .../configuration/LifecycleDetector.java | 128 ------- .../spring/configuration/LifecycleInfo.java | 96 ----- .../configuration/NamedConstructorArgs.java | 339 ------------------ .../resources/META-INF/xbean-bootstrap.xml | 53 --- .../server/annotation/AnnotationTest.java | 41 --- .../xbean/server/annotation/Description.java | 39 -- .../xbean/server/annotation/PizzaService.java | 104 ------ 12 files changed, 1253 deletions(-) delete mode 100644 server/src/java/org/xbean/server/annotation/AnnotationProvider.java delete mode 100644 server/src/java/org/xbean/server/annotation/Backport175AnnotationProvider.java delete mode 100644 server/src/java/org/xbean/server/annotation/DefaultConstructor.java delete mode 100644 server/src/java/org/xbean/server/annotation/ParameterNames.java delete mode 100644 server/src/java/org/xbean/server/spring/configuration/DefaultProperty.java delete mode 100644 server/src/java/org/xbean/server/spring/configuration/LifecycleDetector.java delete mode 100644 server/src/java/org/xbean/server/spring/configuration/LifecycleInfo.java delete mode 100644 server/src/java/org/xbean/server/spring/configuration/NamedConstructorArgs.java delete mode 100644 server/src/test/org/xbean/server/annotation/AnnotationTest.java delete mode 100644 server/src/test/org/xbean/server/annotation/Description.java delete mode 100644 server/src/test/org/xbean/server/annotation/PizzaService.java diff --git a/server/src/java/org/xbean/server/annotation/AnnotationProvider.java b/server/src/java/org/xbean/server/annotation/AnnotationProvider.java deleted file mode 100644 index adefac45..00000000 --- a/server/src/java/org/xbean/server/annotation/AnnotationProvider.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -/** - * AnnotationProvider is a simple abstraction over the various annotatiom systems used in Java 1.4 and default provider - * in Java 5. - * - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public interface AnnotationProvider { - /** - * Gets the type of the specified annotation or null if not an recognized annotation. - * @param annotation the annotation instance - * @return the type of the annotation or null if not an recognized annotation - */ - Class getAnnotationType(Object annotation); - - /** - * Determines if the specific class had been annotated with the specified annotation. - * @param annotation the annotation type to test - * @param target the class to test - * @return true if the class has been annotated with the specified annotation - */ - boolean isAnnotationPresent(Class annotation, Class target); - - /** - * Gets all of the annotations on the specified class. - * @param target the class from which the annotations should be retrieved - * @return the annotations on the specified class - */ - Object[] getAnnotations(Class target); - - /** - * Gets a specific annotation on the specified class. - * @param annotation the annotation to retrieve from the class - * @param target the class from which the annotation should be retrieved - * @return an instance of the specified annotation or null if the class has not have the annotated - */ - Object getAnnotation(Class annotation, Class target); - - /** - * Determines if the specific method had been annotated with the specified annotation. - * @param annotation the annotation type to test - * @param target the method to test - * @return true if the method has been annotated with the specified annotation - */ - boolean isAnnotationPresent(Class annotation, Method target); - - /** - * Gets all of the annotations on the specified method. - * @param target the method from which the annotations should be retrieved - * @return the annotations on the specified method - */ - Object[] getAnnotations(Method target); - - /** - * Gets a specific annotation on the specified method. - * @param annotation the annotation to retrieve from the method - * @param target the method from which the annotation should be retrieved - * @return an instance of the specified annotation or null if the method has not have the annotated - */ - Object getAnnotation(Class annotation, Method target); - - /** - * Gets all of the annotations for each parameter of the specified method. - * @param target the method from which the parameter annotations should be retrieved - * @return the annotations on the parameters specified method - */ - Object[][] getParameterAnnotations(Method target); - - /** - * Determines if the specific constructor had been annotated with the specified annotation. - * @param annotation the annotation type to test - * @param target the constructor to test - * @return true if the constructor has been annotated with the specified annotation - */ - boolean isAnnotationPresent(Class annotation, Constructor target); - - /** - * Gets all of the annotations on the specified constructor. - * @param target the constructor from which the annotations should be retrieved - * @return the annotations on the specified constructor - */ - Object[] getAnnotations(Constructor target); - - /** - * Gets a specific annotation on the specified constructor. - * @param annotation the annotation to retrieve from the constructor - * @param target the constructor from which the annotation should be retrieved - * @return an instance of the specified annotation or null if the constructor has not have the annotated - */ - Object getAnnotation(Class annotation, Constructor target); - - /** - * Gets all of the annotations for each parameter of the specified constructor. - * @param target the constructor from which the parameter annotations should be retrieved - * @return the annotations on the parameters specified constructor - */ - Object[][] getParameterAnnotations(Constructor target); - - /** - * Determines if the specific field had been annotated with the specified annotation. - * @param annotation the annotation type to test - * @param target the field to test - * @return true if the field has been annotated with the specified annotation - */ - boolean isAnnotationPresent(Class annotation, Field target); - - /** - * Gets all of the annotations on the specified field. - * @param target the field from which the annotations should be retrieved - * @return the annotations on the specified field - */ - Object[] getAnnotations(Field target); - - /** - * Gets a specific annotation on the specified field. - * @param annotation the annotation to retrieve from the field - * @param target the field from which the annotation should be retrieved - * @return an instance of the specified annotation or null if the field has not have the annotated - */ - Object getAnnotation(Class annotation, Field target); -} diff --git a/server/src/java/org/xbean/server/annotation/Backport175AnnotationProvider.java b/server/src/java/org/xbean/server/annotation/Backport175AnnotationProvider.java deleted file mode 100644 index f278f62d..00000000 --- a/server/src/java/org/xbean/server/annotation/Backport175AnnotationProvider.java +++ /dev/null @@ -1,145 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import org.codehaus.backport175.reader.Annotation; -import org.codehaus.backport175.reader.Annotations; - -/** - * Annotation provider for backport 175. - * - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class Backport175AnnotationProvider implements AnnotationProvider { - private static final Annotation[][] NO_PARAMETER_ANNOTATIONS = new Annotation[0][0]; - - /** - * {@inheritDoc} - */ - public Class getAnnotationType(Object annotation) { - if (annotation instanceof Annotation) { - return ((Annotation) annotation).annotationType(); - } - return null; - } - - /** - * {@inheritDoc} - */ - public boolean isAnnotationPresent(Class annotation, Class target) { - return Annotations.isAnnotationPresent(annotation, target); - } - - /** - * {@inheritDoc} - */ - public Object[] getAnnotations(Class target) { - return Annotations.getAnnotations(target); - } - - /** - * {@inheritDoc} - */ - public Object getAnnotation(Class annotation, Class target) { - return Annotations.getAnnotation(annotation, target); - } - - /** - * {@inheritDoc} - */ - public boolean isAnnotationPresent(Class annotation, Method target) { - return Annotations.isAnnotationPresent(annotation, target); - } - - /** - * {@inheritDoc} - */ - public Object[] getAnnotations(Method method) { - return Annotations.getAnnotations(method); - } - - /** - * {@inheritDoc} - */ - public Object getAnnotation(Class annotation, Method target) { - return Annotations.getAnnotation(annotation, target); - } - - /** - * {@inheritDoc} - */ - public Object[][] getParameterAnnotations(Method target) { - // backport 175 does not support parameter annotations - return NO_PARAMETER_ANNOTATIONS; - } - - /** - * {@inheritDoc} - */ - public boolean isAnnotationPresent(Class annotation, Constructor target) { - return Annotations.isAnnotationPresent(annotation, target); - } - - /** - * {@inheritDoc} - */ - public Object[] getAnnotations(Constructor target) { - return Annotations.getAnnotations(target); - } - - /** - * {@inheritDoc} - */ - public Object getAnnotation(Class annotation, Constructor target) { - return Annotations.getAnnotation(annotation, target); - } - - /** - * {@inheritDoc} - */ - public Object[][] getParameterAnnotations(Constructor target) { - // backport 175 does not support parameter annotations - return NO_PARAMETER_ANNOTATIONS; - } - - /** - * {@inheritDoc} - */ - public boolean isAnnotationPresent(Class annotation, Field target) { - return Annotations.isAnnotationPresent(annotation, target); - } - - /** - * {@inheritDoc} - */ - public Object[] getAnnotations(Field field) { - return Annotations.getAnnotations(field); - } - - /** - * {@inheritDoc} - */ - public Object getAnnotation(Class annotation, Field target) { - return Annotations.getAnnotation(annotation, target); - } -} diff --git a/server/src/java/org/xbean/server/annotation/DefaultConstructor.java b/server/src/java/org/xbean/server/annotation/DefaultConstructor.java deleted file mode 100644 index 90e33c55..00000000 --- a/server/src/java/org/xbean/server/annotation/DefaultConstructor.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -/** - * DefaultConstructor is an annotation to select the default constructor for a class. This annotation informs the - * server that specific constructor should be used instead of the default no argument constrctor. The system will - * provide Java default values for an constructor argument that is not specified. - * - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public interface DefaultConstructor { -} diff --git a/server/src/java/org/xbean/server/annotation/ParameterNames.java b/server/src/java/org/xbean/server/annotation/ParameterNames.java deleted file mode 100644 index e7661bf8..00000000 --- a/server/src/java/org/xbean/server/annotation/ParameterNames.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -/** - * ParameterNames is an annotation to provide the names of constructor and method names to the server. Parameter names - * can be used during constructor injection instead of the standard index based approach. - * - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public interface ParameterNames { - /** - * The names of the constructor or method parameters. - * @return names of the constructor or method parameters. - */ - String[] names(); -} diff --git a/server/src/java/org/xbean/server/spring/configuration/DefaultProperty.java b/server/src/java/org/xbean/server/spring/configuration/DefaultProperty.java deleted file mode 100644 index eb8807b1..00000000 --- a/server/src/java/org/xbean/server/spring/configuration/DefaultProperty.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.spring.configuration; - -/** - * DefaultProperty contains the default value assigned to a property with a specific name and type. - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class DefaultProperty { - private String name; - private Class type; - private Object value; - - /** - * Creates a new empty default property. This instance is unusable until the name, type and values are assigned. - */ - public DefaultProperty() { - } - - /** - * Creates new default property value for a property with the specified name and type. - * @param name the name of the property - * @param type the type of the property - * @param value the default value - */ - public DefaultProperty(String name, Class type, Object value) { - this.name = name; - this.type = type; - this.value = value; - } - - /** - * Gets the property name. - * @return the property name - */ - public String getName() { - return name; - } - - /** - * Sets the property name. - * @param name the property name - */ - public void setName(String name) { - this.name = name; - } - - /** - * Gets the property type. - * @return the property type - */ - public Class getType() { - return type; - } - - /** - * Sets the property type. - * @param type the property type - */ - public void setType(Class type) { - this.type = type; - } - - /** - * Gets the default value. - * @return the default value - */ - public Object getValue() { - return value; - } - - /** - * Sets the default value. - * @param value the default value - */ - public void setValue(Object value) { - this.value = value; - } - - /** - * {@inheritDoc} - */ - public String toString() { - return "[" + name + ", " + type + ", " + value + "]"; - } -} diff --git a/server/src/java/org/xbean/server/spring/configuration/LifecycleDetector.java b/server/src/java/org/xbean/server/spring/configuration/LifecycleDetector.java deleted file mode 100644 index 2e1292cb..00000000 --- a/server/src/java/org/xbean/server/spring/configuration/LifecycleDetector.java +++ /dev/null @@ -1,128 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.spring.configuration; - -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.support.RootBeanDefinition; -import org.xbean.spring.util.SpringVisitor; -import org.xbean.spring.util.AbstractSpringVisitor; - -/** - * LifecycleDetector is a Spring configuration post processor that automatically sets the init and destroy methods - * on the bean definition based on the type of the bean class. - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class LifecycleDetector implements BeanFactoryPostProcessor { - private final Map lifecycleMap = new LinkedHashMap(); - - /** - * Gets the lifecycle interfaces used by this detectors. - * @return the lifecycle interfaces used by this detectors - */ - public List getLifecycleInterfaces() { - List lifecycleInterfaces = new LinkedList(); - for (Iterator iterator = lifecycleMap.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - Class type = (Class) entry.getKey(); - LifecycleMethods lifecycleMethods = (LifecycleMethods) entry.getValue(); - lifecycleInterfaces.add(new LifecycleInfo(type, lifecycleMethods.initMethodName, lifecycleMethods.destroyMethodName)); - } - return lifecycleInterfaces; - } - - /** - * Sets the lifecycle interfaces used by this detectors. - * @param lifecycleInterfaces the lifecycle interfaces used by this detectors - */ - public void setLifecycleInterfaces(List lifecycleInterfaces) { - lifecycleMap.clear(); - for (Iterator iterator = lifecycleInterfaces.iterator(); iterator.hasNext();) { - addLifecycleInterface((LifecycleInfo) iterator.next()); - } - } - - /** - * Adds a lifecycle interface to this detector. - * @param type the lifecycle interface - * @param initMethodName the name of the init method - * @param destroyMethodName the name of the destroy method - */ - public void addLifecycleInterface(Class type, String initMethodName, String destroyMethodName) { - lifecycleMap.put(type, new LifecycleMethods(initMethodName, destroyMethodName)); - } - - /** - * Adds a lifecycle interface to this detector. - * @param lifecycleInfo the lifecycle interfface info - */ - public void addLifecycleInterface(LifecycleInfo lifecycleInfo) { - lifecycleMap.put(lifecycleInfo.getType(), - new LifecycleMethods(lifecycleInfo.getInitMethodName(), lifecycleInfo.getDestroyMethodName())); - } - - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { - SpringVisitor visitor = new AbstractSpringVisitor() { - public void visitBeanDefinition(BeanDefinition beanDefinition, Object data) throws BeansException { - super.visitBeanDefinition(beanDefinition, data); - - if (!(beanDefinition instanceof RootBeanDefinition)) { - return; - } - RootBeanDefinition rootBeanDefinition = ((RootBeanDefinition) beanDefinition); - Class beanType = rootBeanDefinition.getBeanClass(); - for (Iterator iterator = lifecycleMap.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - Class lifecycleInterface = (Class) entry.getKey(); - LifecycleMethods value = (LifecycleMethods) entry.getValue(); - if (lifecycleInterface.isAssignableFrom(beanType)) { - if (rootBeanDefinition.getInitMethodName() == null) { - rootBeanDefinition.setInitMethodName(value.initMethodName); - } - if (rootBeanDefinition.getDestroyMethodName() == null) { - rootBeanDefinition.setDestroyMethodName(value.destroyMethodName); - } - if (rootBeanDefinition.getInitMethodName() != null && rootBeanDefinition.getDestroyMethodName() != null) { - return; - } - } - } - } - }; - visitor.visitBeanFactory(beanFactory, null); - } - - private static class LifecycleMethods { - private String initMethodName; - private String destroyMethodName; - - public LifecycleMethods(String initMethodName, String destroyMethodName) { - this.initMethodName = initMethodName; - this.destroyMethodName = destroyMethodName; - } - } -} diff --git a/server/src/java/org/xbean/server/spring/configuration/LifecycleInfo.java b/server/src/java/org/xbean/server/spring/configuration/LifecycleInfo.java deleted file mode 100644 index bfb33549..00000000 --- a/server/src/java/org/xbean/server/spring/configuration/LifecycleInfo.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.spring.configuration; - -/** - * LifecycleInfo defines the init and destroy method names for a lifecycle interface. - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class LifecycleInfo { - private Class type; - private String initMethodName; - private String destroyMethodName; - - /** - * Creates a new empty lifecycle info. Note, this instance is unusable until the type, inti method name and - * destroy method name are set. - */ - public LifecycleInfo() { - } - - /** - * Creates a new lifecycle info object for the specified interface and defining the init and destroy method names. - * @param type the lifecycle interface - * @param initMethodName the init method name - * @param destroyMethodName the destroy method name - */ - public LifecycleInfo(Class type, String initMethodName, String destroyMethodName) { - this.type = type; - this.initMethodName = initMethodName; - this.destroyMethodName = destroyMethodName; - } - - /** - * Gets the lifecycle interface type. - * @return the lifecycle interface type - */ - public Class getType() { - return type; - } - - /** - * Sets the lifecycle interface type. - * @param type the lifecycle interface type - */ - public void setType(Class type) { - this.type = type; - } - - /** - * Gets the init method name. - * @return the init method name - */ - public String getInitMethodName() { - return initMethodName; - } - - /** - * Sets the init method name. - * @param initMethodName the init method name - */ - public void setInitMethodName(String initMethodName) { - this.initMethodName = initMethodName; - } - - /** - * Gets the destroy method name. - * @return the destroy method name - */ - public String getDestroyMethodName() { - return destroyMethodName; - } - - /** - * Sets the destroy method name. - * @param destroyMethodName the destroy method name - */ - public void setDestroyMethodName(String destroyMethodName) { - this.destroyMethodName = destroyMethodName; - } -} diff --git a/server/src/java/org/xbean/server/spring/configuration/NamedConstructorArgs.java b/server/src/java/org/xbean/server/spring/configuration/NamedConstructorArgs.java deleted file mode 100644 index 5db1b3f6..00000000 --- a/server/src/java/org/xbean/server/spring/configuration/NamedConstructorArgs.java +++ /dev/null @@ -1,339 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.spring.configuration; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.LinkedList; -import java.util.Arrays; -import java.lang.reflect.Constructor; - -import org.springframework.beans.BeansException; -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.PropertyValue; -import org.springframework.beans.FatalBeanException; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.ConstructorArgumentValues; -import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.beans.factory.FactoryBean; -import org.xbean.server.annotation.AnnotationProvider; -import org.xbean.server.annotation.DefaultConstructor; -import org.xbean.server.annotation.ParameterNames; -import org.xbean.spring.util.SpringVisitor; -import org.xbean.spring.util.AbstractSpringVisitor; - -/** - * NamedConstructorArgs is a BeanFactoryPostProcessor that converts property declarations into indexed constructor args - * based on the the constructor parameter names annotation. This process first selctes a constructor and then fills in - * the constructor arguments from the properties defined in the bean definition. If a property is not defined in the - * bean definition, first the defaultValues map is checked for a value and if a value is not present a Java default - * value is provided for the constructor argument (e.g. numbers are assigned 0 and objects are assigned null). - * - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class NamedConstructorArgs implements BeanFactoryPostProcessor { - private AnnotationProvider annotationProvider; - private Map defaultValues = new HashMap(); - - /** - * Creates an empty NamedConstructorArgs. Note this class is not usable until an annotation provider is assigned. - */ - public NamedConstructorArgs() { - } - - /** - * Creates a NamedConstructorArgs that uses the specified annotation provider to select the default constructor - * and to determine the constructor argument names. - * @param annotationProvider the annotation provieder used to determine parameter names - */ - public NamedConstructorArgs(AnnotationProvider annotationProvider) { - this.annotationProvider = annotationProvider; - } - - /** - * Gets the annotation provider which is used to select the default constructor and to determine the constructor - * argument names. - * @return the annotation provider - */ - public AnnotationProvider getAnnotationProvider() { - return annotationProvider; - } - - /** - * Sets the annotation provider which is used to select the default constructor and to determine the constructor - * argument names. Note it is expected that this method is called immedately after a constructor using the same - * thread, therefore the setting of the annotation provider is not protected with a synchronized block. - * @param annotationProvider the new annotation provider - */ - public void setAnnotationProvider(AnnotationProvider annotationProvider) { - this.annotationProvider = annotationProvider; - } - - /** - * Gets the default values that are assigned to constructor arguments without a defined value. - * @return the default values that are assigned to constructor arguments without a defined value - */ - public List getDefaultValues() { - List values = new LinkedList(); - for (Iterator iterator = defaultValues.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - PropertyKey key = (PropertyKey) entry.getKey(); - Object value = entry.getValue(); - values.add(new DefaultProperty(key.name, key.type, value)); - } - return values; - } - - /** - * Sets the default values that are assigned to constructor arguments without a defined value. - * @param defaultValues the values that are assigned to constructor arguments without a defined value - */ - public void setDefaultValues(List defaultValues) { - this.defaultValues.clear(); - for (Iterator iterator = defaultValues.iterator(); iterator.hasNext();) { - addDefaultValue((DefaultProperty) iterator.next()); - } - } - - /** - * Adds a default value for a property with the specified name and type. - * @param name the name of the property - * @param type the type of the property - * @param value the default value for a property with the specified name and type - */ - public void addDefaultValue(String name, Class type, Object value) { - defaultValues.put(new PropertyKey(name, type), value); - } - - /** - * Adds a defautl value for a property. - * @param defaultProperty the default property information - */ - private void addDefaultValue(DefaultProperty defaultProperty) { - defaultValues.put(new PropertyKey(defaultProperty.getName(), defaultProperty.getType()), defaultProperty.getValue()); - } - - /** - * Finds all bean definitions and where possble assigns the indexed constructor argument values from the defined - * and default property values. - * @param beanFactory the bean factory to inspect - * @throws BeansException if the parameter name annotation for a constructor does not contain the same number of - * parameter names as the constructor - */ - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { - SpringVisitor visitor = new AbstractSpringVisitor() { - public void visitBeanDefinition(BeanDefinition beanDefinition, Object data) throws BeansException { - super.visitBeanDefinition(beanDefinition, data); - - if (!(beanDefinition instanceof RootBeanDefinition)) { - return; - } - - RootBeanDefinition rootBeanDefinition = ((RootBeanDefinition) beanDefinition); - processParameters(rootBeanDefinition); - - } - }; - visitor.visitBeanFactory(beanFactory, null); - } - - private void processParameters(RootBeanDefinition rootBeanDefinition) throws BeansException { - ConstructorArgumentValues constructorArgumentValues = rootBeanDefinition.getConstructorArgumentValues(); - - // if this bean already has constructor arguments defined, don't mess with them - if (constructorArgumentValues.getArgumentCount() > 0) { - return; - } - - // try to get a list of constructor arg names to use - ConstructorInfo constructorInfo = selectConstructor(rootBeanDefinition); - if (constructorInfo == null) { - return; - } - - // remove each named property and add an indexed constructor arg - MutablePropertyValues propertyValues = rootBeanDefinition.getPropertyValues(); - String[] parameterNames = constructorInfo.parameterNames; - Class[] parameterTypes = constructorInfo.constructor.getParameterTypes(); - for (int i = 0; i < parameterNames.length; i++) { - String parameterName = parameterNames[i]; - Class parameterType = parameterTypes[i]; - - PropertyValue propertyValue = propertyValues.getPropertyValue(parameterName); - if (propertyValue != null) { - propertyValues.removePropertyValue(parameterName); - constructorArgumentValues.addIndexedArgumentValue(i, propertyValue.getValue(), parameterType.getName()); - } else { - Object defaultValue = defaultValues.get(new PropertyKey(parameterName, parameterType)); - if (defaultValue == null) { - defaultValue = DEFAULT_VALUE.get(parameterType); - } - if (defaultValue instanceof FactoryBean) { - try { - defaultValue = ((FactoryBean)defaultValue).getObject(); - } catch (Exception e) { - throw new FatalBeanException("Unable to get object value from bean factory", e); - } - } - constructorArgumentValues.addIndexedArgumentValue(i, defaultValue, parameterType.getName()); - } - } - - // todo set any usable default values on the bean definition - } - - private ConstructorInfo selectConstructor(RootBeanDefinition rootBeanDefinition) { - Class beanType = rootBeanDefinition.getBeanClass(); - - // get a set containing the names of the defined properties - Set definedProperties = new HashSet(); - PropertyValue[] values = rootBeanDefinition.getPropertyValues().getPropertyValues(); - for (int i = 0; i < values.length; i++) { - definedProperties.add(values[i].getName()); - } - - // get the constructors sorted by longest arg length first - List constructors = new ArrayList(Arrays.asList(beanType.getConstructors())); - Collections.sort(constructors, new ArgLengthComparator()); - - // if a constructor has been annotated as the default constructor we always use that constructor - for (Iterator iterator = constructors.iterator(); iterator.hasNext();) { - Constructor constructor = (Constructor) iterator.next(); - if (annotationProvider.isAnnotationPresent(DefaultConstructor.class, constructor)) { - return new ConstructorInfo(constructor); - } - } - - // try to find a constructor for which we have all of the properties defined - for (Iterator iterator = constructors.iterator(); iterator.hasNext();) { - Constructor constructor = (Constructor) iterator.next(); - ConstructorInfo constructorInfo = new ConstructorInfo(constructor); - if (isUsableConstructor(constructorInfo, definedProperties)) { - return constructorInfo; - } - } - return null; - } - - private boolean isUsableConstructor(ConstructorInfo constructorInfo, Set definedProperties) { - // if we don't have parameter names this is not the constructor we are looking for - String[] parameterNames = constructorInfo.parameterNames; - if (parameterNames == null) { - return false; - } - - Class[] parameterTypes = constructorInfo.constructor.getParameterTypes(); - for (int i = 0; i < parameterNames.length; i++) { - String parameterName = parameterNames[i]; - Class parameterType = parameterTypes[i]; - - // can we satify this property using a defined property or default property - if (!definedProperties.contains(parameterName) && !defaultValues.containsKey(new PropertyKey(parameterName, parameterType))) { - return false; - } - } - - return true; - } - - private class ConstructorInfo { - private final Constructor constructor; - private final String[] parameterNames; - - public ConstructorInfo(Constructor constructor) { - this.constructor = constructor; - ParameterNames parameterNames = (ParameterNames) annotationProvider.getAnnotation(ParameterNames.class, constructor); - - // verify that we have enough parameter names - String[] names = parameterNames.names(); - int expectedParameterCount = constructor.getParameterTypes().length; - if (names != null && names.length != expectedParameterCount) { - throw new FatalBeanException("Excpected " + expectedParameterCount + " parameter names for constructor but only got " + - names.length + ": " + constructor.toString()); - } - if (expectedParameterCount == 0) { - names = new String[0]; - } - - this.parameterNames = names; - } - } - - private static class ArgLengthComparator implements Comparator { - public int compare(Object o1, Object o2) { - Constructor constructor1 = (Constructor) o1; - Constructor constructor2 = (Constructor) o2; - return constructor2.getParameterTypes().length - constructor1.getParameterTypes().length; - } - } - - private static class PropertyKey { - private final String name; - private final Class type; - - public PropertyKey(String name, Class type) { - this.name = name; - this.type = type; - } - - public boolean equals(Object object) { - if (!(object instanceof PropertyKey)) { - return false; - } - - PropertyKey defaultProperty = (PropertyKey) object; - return name.equals(defaultProperty.name) && type.equals(type); - } - - public int hashCode() { - int result = 17; - result = 37 * result + name.hashCode(); - result = 37 * result + type.hashCode(); - return result; - } - - public String toString() { - return "[" + name + " " + type + "]"; - } - } - - private static final Map DEFAULT_VALUE; - static { - Map temp = new HashMap(); - temp.put(Boolean.TYPE, Boolean.FALSE); - temp.put(Byte.TYPE, new Byte((byte) 0)); - temp.put(Character.TYPE, new Character((char) 0)); - temp.put(Short.TYPE, new Short((short) 0)); - temp.put(Integer.TYPE, new Integer(0)); - temp.put(Long.TYPE, new Long(0)); - temp.put(Float.TYPE, new Float(0)); - temp.put(Double.TYPE, new Double(0)); - - DEFAULT_VALUE = Collections.unmodifiableMap(temp); - } -} diff --git a/server/src/resources/META-INF/xbean-bootstrap.xml b/server/src/resources/META-INF/xbean-bootstrap.xml index c9e6ae42..5a713e14 100644 --- a/server/src/resources/META-INF/xbean-bootstrap.xml +++ b/server/src/resources/META-INF/xbean-bootstrap.xml @@ -22,7 +22,6 @@ - @@ -39,8 +38,6 @@ - - @@ -56,55 +53,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/src/test/org/xbean/server/annotation/AnnotationTest.java b/server/src/test/org/xbean/server/annotation/AnnotationTest.java deleted file mode 100644 index 1576db82..00000000 --- a/server/src/test/org/xbean/server/annotation/AnnotationTest.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -import junit.framework.TestCase; - -/** - * Tests the annotation provider system. - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class AnnotationTest extends TestCase { - /** - * Tests the backport 175 annotation provider. - */ - public void testRead175() { - AnnotationProvider annotationProvider = new Backport175AnnotationProvider(); - assertTrue(annotationProvider.isAnnotationPresent(Description.class, PizzaService.class)); - Object annotation = annotationProvider.getAnnotation(Description.class, PizzaService.class); - assertNotNull(annotation); - assertSame(Description.class, annotationProvider.getAnnotationType(annotation)); - Description description = (Description) annotation; - assertEquals("pizza making service", description.value()); - assertEquals("english", description.language()); - } -} diff --git a/server/src/test/org/xbean/server/annotation/Description.java b/server/src/test/org/xbean/server/annotation/Description.java deleted file mode 100644 index 222b3a32..00000000 --- a/server/src/test/org/xbean/server/annotation/Description.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -/** - * Simple description annotation used to test the annotation system. - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public interface Description { - /** - * Gets the language of the description. - * @return the language of the description - * - * @org.codehaus.backport175.DefaultValue ("english") - */ - String language(); - - /** - * Gets the description. - * @return the description - */ - String value(); -} diff --git a/server/src/test/org/xbean/server/annotation/PizzaService.java b/server/src/test/org/xbean/server/annotation/PizzaService.java deleted file mode 100644 index 8eae1394..00000000 --- a/server/src/test/org/xbean/server/annotation/PizzaService.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * - * Copyright 2005 the original author or authors. - * - * 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. - */ -package org.xbean.server.annotation; - -/** - * A sample pizza service. - * @org.xbean.server.annotation.Description ("pizza making service") - * - * @author Dain Sundstrom - * @version $Id$ - * @since 2.0 - */ -public class PizzaService { - private String topping; - private String cheese; - private int size; - private double price; - - /** - * Gets the cheese type. - * @return the cheese type - * - * @org.xbean.server.annotation.Description ("type of cheese") - */ - public String getCheese() { - return cheese; - } - - /** - * Sets the cheese type. - * @param cheese the cheese type - */ - public void setCheese(String cheese) { - this.cheese = cheese; - } - - /** - * Gets the price. - * @return the price - * - * @org.xbean.server.annotation.Description ("price in dollars") - */ - public double getPrice() { - return price; - } - - /** - * Sets the price. - * @param price the price - */ - public void setPrice(double price) { - this.price = price; - } - - /** - * Gets the size. - * @return the size - * - * @org.xbean.server.annotation.Description ("size of the pizza in inches") - */ - public int getSize() { - return size; - } - - /** - * Sets the size. - * @param size the size - */ - public void setSize(int size) { - this.size = size; - } - - /** - * Gets the toppings. - * @return the toppings - * - * @org.xbean.server.annotation.Description ("pizza topping") - */ - public String getTopping() { - return topping; - } - - /** - * Sets the toppings. - * @param topping the toppings - */ - public void setTopping(String topping) { - this.topping = topping; - } -} From 6ac85b1e811c657797c0cb3903f1777be0d378c0 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Sun, 16 Oct 2005 01:21:28 +0000 Subject: [PATCH 008/736] Initial empty osgi module git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380427 13f79535-47bb-0310-9956-ffa450edef68 --- osgi/maven.xml | 30 +++++++++++ osgi/project.properties | 35 +++++++++++++ osgi/project.xml | 113 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+) create mode 100644 osgi/maven.xml create mode 100644 osgi/project.properties create mode 100644 osgi/project.xml diff --git a/osgi/maven.xml b/osgi/maven.xml new file mode 100644 index 00000000..48775ddb --- /dev/null +++ b/osgi/maven.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + diff --git a/osgi/project.properties b/osgi/project.properties new file mode 100644 index 00000000..d8a8fc95 --- /dev/null +++ b/osgi/project.properties @@ -0,0 +1,35 @@ +### +# Copyright 2005 the original author or authors. +# +# 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. +### +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven + +maven.compile.source=1.4 +maven.compile.target=1.4 +maven.compile.deprecation=true +maven.compile.debug=true +maven.compile.optimize=true + +maven.remote.group=xbean +maven.username=${user.name} +maven.repo.central=beaver.codehaus.org +maven.repo.central.directory=/dist + +maven.javadoc.source=1.4 +maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ +maven.javadoc.additionalparam=-linksource + +maven.site.deploy.method=rsync +maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/osgi/project.xml b/osgi/project.xml new file mode 100644 index 00000000..44ecb921 --- /dev/null +++ b/osgi/project.xml @@ -0,0 +1,113 @@ + + + + + 3 + + XBean :: OSGi + xbean-osgi + xbean + 2.0-SNAPSHOT + + XBean.org + http://xbean.org + + + org.xbean + + XBean: OSGi Adaptor + + + XBean OSGi Adaptor is a bidirectional OSGi integration. + + + http://www.xbean.org/ + + www.xbean.org + /home/projects/xbean/public_html/maven + + + + xbean developers + mailto:dev-subscribe@xbean.org + mailto:dev-unsubscribe@xbean.org + + + xbean users + mailto:user-subscribe@xbean.org + mailto:user-unsubscribe@xbean.org + + + xbean source control messages + mailto:scm-subscribe@xbean.org + mailto:scm-unsubscribe@xbean.org + + + + + + org.eclipse + org.eclipse.osgi + 3.1.0 + + + + + src/java + + + src/resources + + + + src/test + + + + src/test + + META-INF/**/* + **/*.x* + + + + + **/*Test.java + + + + + + + + + + + + + + + maven-jxr-plugin + maven-javadoc-plugin + maven-junit-report-plugin + + + + + + + From 358f8276eda34d3b1399f4b12f2ba58aa11120eb Mon Sep 17 00:00:00 2001 From: James Strachan Date: Sun, 16 Oct 2005 23:03:23 +0000 Subject: [PATCH 009/736] added support for the use of Spring attributes mixed with property attributes and for beans to have properties such as 'id' or 'name' git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380428 13f79535-47bb-0310-9956-ffa450edef68 --- spring/.classpath | 5 +- spring/maven.xml | 6 +- spring/project.xml | 6 + .../impl/XBeanXmlBeanDefinitionParser.java | 118 +++++++++++++----- .../xbean/spring/task/SchemaGenerator.java | 30 ++++- .../spring/context/BeerUsingSpringTest.java | 40 ++++++ .../spring/context/BeerUsingXBeanTest.java | 33 +++++ .../org/xbean/spring/context/beer-normal.xml | 10 ++ .../org/xbean/spring/context/beer-xbean.xml | 9 ++ .../org/xbean/spring/example/BeerService.java | 52 ++++++++ .../xbean/spring/example/PizzaService.java | 3 + .../org/xbean/spring/example/WineService.java | 49 ++++++++ 12 files changed, 327 insertions(+), 34 deletions(-) create mode 100644 spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java create mode 100644 spring/src/test/org/xbean/spring/context/BeerUsingXBeanTest.java create mode 100644 spring/src/test/org/xbean/spring/context/beer-normal.xml create mode 100644 spring/src/test/org/xbean/spring/context/beer-xbean.xml create mode 100644 spring/src/test/org/xbean/spring/example/BeerService.java create mode 100644 spring/src/test/org/xbean/spring/example/WineService.java diff --git a/spring/.classpath b/spring/.classpath index 0d4b568e..954e8ed9 100644 --- a/spring/.classpath +++ b/spring/.classpath @@ -1,11 +1,14 @@ + - + + + diff --git a/spring/maven.xml b/spring/maven.xml index 7aa6e1e6..4767e0a6 100644 --- a/spring/maven.xml +++ b/spring/maven.xml @@ -39,7 +39,11 @@ + classpathref="test.classpath" srcdir="src/test" metaInfDir="target/generated/"/> + + + + diff --git a/spring/project.xml b/spring/project.xml index 7ab31e30..b7028f37 100644 --- a/spring/project.xml +++ b/spring/project.xml @@ -124,6 +124,12 @@ src/test + + target/generated + + META-INF/**/* + + src/test diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 5222582f..7e4d7b3b 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -50,7 +50,10 @@ import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; +import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -63,8 +66,10 @@ */ public class XBeanXmlBeanDefinitionParser extends DefaultXmlBeanDefinitionParser { + public static final String SPRING_SCHEMA = "http://xbean.org/schemas/spring/1.0"; + static { - PropertyEditorHelper.registerCustomEditors(); + PropertyEditorHelper.registerCustomEditors(); } private static final Log log = LogFactory.getLog(XBeanXmlBeanDefinitionParser.class); @@ -113,17 +118,19 @@ public static void registerCustomEditors(DefaultListableBeanFactory beanFactory) */ protected BeanDefinitionHolder parseBeanFromExtensionElement(Element element) { String uri = element.getNamespaceURI(); - String localName = element.getLocalName(); + String localName = getLocalName(element); MappingMetaData metadata = findNamespaceProperties(uri, localName); if (metadata != null) { // lets see if we configured the localName to a bean class String className = metadata.getClassName(localName); if (className != null) { + Element original = cloneElement(element); // lets assume the class name == the package name plus the element.setAttributeNS(null, "class", className); + addSpringAttributeValues(className, element); BeanDefinitionHolder definition = parseBeanDefinitionElement(element, false); - addAttributeProperties(definition, metadata, className, element); + addAttributeProperties(definition, metadata, className, original); addNestedPropertyElements(definition, metadata, className, element); addInlinedPropertiesFile(definition, metadata, className, element); coerceNamespaceAwarePropertyValues(definition, element); @@ -135,6 +142,33 @@ protected BeanDefinitionHolder parseBeanFromExtensionElement(Element element) { return null; } + protected void addSpringAttributeValues(String className, Element element) { + NamedNodeMap attributes = element.getAttributes(); + for (int i = 0, size = attributes.getLength(); i < size; i++) { + Attr attribute = (Attr) attributes.item(i); + String uri = attribute.getNamespaceURI(); + String localName = attribute.getLocalName(); + + if (uri != null && uri.equals(SPRING_SCHEMA)) { + element.setAttributeNS(null, localName, attribute.getNodeValue()); + } + } + } + + /** + * Creates a clone of the element and its attribute (though not its content) + */ + protected Element cloneElement(Element element) { + Element answer = element.getOwnerDocument().createElement(getLocalName(element)); + NamedNodeMap attributes = element.getAttributes(); + for (int i = 0, size = attributes.getLength(); i < size; i++) { + Attr attribute = (Attr) attributes.item(i); + String uri = attribute.getNamespaceURI(); + answer.setAttributeNS(uri, attribute.getName(), attribute.getNodeValue()); + } + return answer; + } + /** * Parses attribute names and values as being bean property expressions */ @@ -152,9 +186,16 @@ protected void addAttributeProperties(BeanDefinitionHolder definition, MappingMe // we could use namespaced attributes to differentiate real spring // attributes from namespace-specific attributes - if (((isEmpty(uri)) && !reservedBeanAttributeNames.contains(localName)) - || (!isEmpty(uri) && !uri.equals("http://www.w3.org/2000/xmlns/"))) { - addAttributeProperty(definition, metadata, element, attribute); + if (isEmpty(uri) && !localName.equals("class")) { + boolean addProperty = true; + if (reservedBeanAttributeNames.contains(localName)) { + // should we allow the property to shine through? + PropertyDescriptor descriptor = getPropertyDescriptor(className, localName); + addProperty = descriptor != null; + } + if (addProperty) { + addAttributeProperty(definition, metadata, element, attribute); + } } } } @@ -166,14 +207,14 @@ protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMeta if (value != null) { if (localName.endsWith(BEAN_REFERENCE_SUFFIX)) { localName = localName.substring(0, localName.length() - BEAN_REFERENCE_SUFFIX.length()); - String propertyName = metadata.getPropertyName(element.getLocalName(), localName); + String propertyName = metadata.getPropertyName(getLocalName(element), localName); if (propertyName != null) { definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, new RuntimeBeanReference(value)); } } else { - String propertyName = metadata.getPropertyName(element.getLocalName(), localName); + String propertyName = metadata.getPropertyName(getLocalName(element), localName); if (propertyName != null) { definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, value); } @@ -181,6 +222,14 @@ protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMeta } } + protected String getLocalName(Element element) { + String localName = element.getLocalName(); + if (localName == null) { + localName = element.getNodeName(); + } + return localName; + } + /** * Lets iterate through the children of this element and create any nested * child properties @@ -204,12 +253,12 @@ protected void addNestedPropertyElements(BeanDefinitionHolder definition, Mappin // * the child element maps to a tag and is the // bean tag too Object value = null; - String propertyName = metadata.getNestedListProperty(element.getLocalName(), localName); + String propertyName = metadata.getNestedListProperty(getLocalName(element), localName); if (propertyName != null) { value = parseListElement(childElement, propertyName); } else { - propertyName = metadata.getNestedProperty(element.getLocalName(), localName); + propertyName = metadata.getNestedProperty(getLocalName(element), localName); if (propertyName != null) { // lets find the first child bean that parses fine value = parseChildExtensionBean(childElement); @@ -231,19 +280,10 @@ protected void addNestedPropertyElements(BeanDefinitionHolder definition, Mappin * Attempts to use introspection to parse the nested property element. */ protected Object tryParseNestedPropertyViaIntrospection(MappingMetaData metadata, String className, Element element) { - BeanInfo beanInfo = getBeanInfo(className); - String localName = element.getLocalName(); - if (beanInfo != null) { - PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - PropertyDescriptor descriptor = descriptors[i]; - if (descriptor.getWriteMethod() != null) { - String name = descriptor.getName(); - if (name.equals(localName)) { - return parseNestedPropertyViaIntrospection(metadata, className, element, descriptor); - } - } - } + String localName = getLocalName(element); + PropertyDescriptor descriptor = getPropertyDescriptor(className, localName); + if (descriptor != null) { + return parseNestedPropertyViaIntrospection(metadata, className, element, descriptor); } return null; } @@ -309,7 +349,6 @@ protected void coerceNamespaceAwarePropertyValues(BeanDefinitionHolder definitio } } - protected BeanInfo getBeanInfo(String className) throws BeanDefinitionStoreException { BeanInfo info = null; Class type = null; @@ -328,6 +367,26 @@ protected BeanInfo getBeanInfo(String className) throws BeanDefinitionStoreExcep return info; } + /** + * Looks up the property decriptor for the given class and property name + */ + protected PropertyDescriptor getPropertyDescriptor(String className, String localName) { + BeanInfo beanInfo = getBeanInfo(className); + if (beanInfo != null) { + PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); + for (int i = 0; i < descriptors.length; i++) { + PropertyDescriptor descriptor = descriptors[i]; + if (descriptor.getWriteMethod() != null) { + String name = descriptor.getName(); + if (name.equals(localName)) { + return descriptor; + } + } + } + } + return null; + } + /** * Attempts to use introspection to parse the nested property element. */ @@ -451,18 +510,19 @@ protected boolean isEmpty(String uri) { return uri == null || uri.length() == 0; } - protected void declareLifecycleMethods(BeanDefinitionHolder definitionHolder, MappingMetaData metaData, Element element) { + protected void declareLifecycleMethods(BeanDefinitionHolder definitionHolder, MappingMetaData metaData, + Element element) { BeanDefinition definition = definitionHolder.getBeanDefinition(); if (definition instanceof AbstractBeanDefinition) { AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition) definition; if (beanDefinition.getInitMethodName() == null) { - beanDefinition.setInitMethodName(metaData.getInitMethodName(element.getLocalName())); + beanDefinition.setInitMethodName(metaData.getInitMethodName(getLocalName(element))); } if (beanDefinition.getDestroyMethodName() == null) { - beanDefinition.setDestroyMethodName(metaData.getDestroyMethodName(element.getLocalName())); + beanDefinition.setDestroyMethodName(metaData.getDestroyMethodName(getLocalName(element))); } if (beanDefinition.getFactoryMethodName() == null) { - beanDefinition.setFactoryMethodName(metaData.getFactoryMethodName(element.getLocalName())); + beanDefinition.setFactoryMethodName(metaData.getFactoryMethodName(getLocalName(element))); } } } @@ -513,7 +573,7 @@ else if (BEAN_ELEMENT.equals(node.getNodeName())) { protected Object parsePropertySubElement(Element element, String beanName) throws BeanDefinitionStoreException { String uri = element.getNamespaceURI(); - String localName = element.getLocalName(); + String localName = getLocalName(element); if (!isEmpty(uri) || !reservedElementNames.contains(localName)) { Object answer = parseBeanFromExtensionElement(element); diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java index 48e4a228..b4bf220e 100644 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java +++ b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java @@ -118,6 +118,7 @@ protected void generatePropertiesFile(PrintWriter out, String namespace, List el out.println(element.getLocalName() + " = " + element.getType().getQualifiedName()); generatePropertiesFileConstructors(out, namespace, element); + generatePropertiesFilePropertyAliases(out, namespace, element); } } @@ -129,7 +130,7 @@ protected void generatePropertiesFileConstructors(PrintWriter out, String namesp generatePropertiesFileConstructor(out, namespace, element, constructor); } } - + protected void generatePropertiesFileConstructor(PrintWriter out, String namespace, SchemaElement element, JConstructor constructor) { JParameter[] parameters = constructor.getParameters(); if (parameters.length == 0) { @@ -147,11 +148,30 @@ protected void generatePropertiesFileConstructor(PrintWriter out, String namespa out.print(").parameterNames ="); for (int i = 0; i < parameters.length; i++) { JParameter parameter = parameters[i]; - out.print(" "); + out.print(" "); out.print(parameter.getSimpleName()); } out.println(); } + + protected void generatePropertiesFilePropertyAliases(PrintWriter out, String namespace, SchemaElement element) { + JClass type = element.getType(); + JProperty[] properties = type.getProperties(); + for (int i = 0; i < properties.length; i++) { + generatePropertiesFilePropertyAlias(out, namespace, element, properties[i]); + } + } + + protected void generatePropertiesFilePropertyAlias(PrintWriter out, String namespace, SchemaElement element, JProperty property) { + JAnnotation annotation = property.getAnnotation("org.xbean.Alias"); + if (annotation != null) { + String text = getStringValue(annotation, "value"); + if (text != null) { + String name = decapitalise(property.getSimpleName()); + out.println(element.getLocalName() + "." + text + " = " +name); + } + } + } // Documentation generation // ------------------------------------------------------------------------- @@ -421,7 +441,7 @@ protected boolean isValidProperty(JProperty property) { protected String getPropertyXmlName(JAnnotatedElement element) { String answer = element.getSimpleName(); if (answer.length() > 0) { - answer = answer.substring(0, 1).toLowerCase() + answer.substring(1); + answer = decapitalise(answer); } // lets strip off the trailing Bean for *FactoryBean types by default @@ -431,6 +451,10 @@ protected String getPropertyXmlName(JAnnotatedElement element) { return answer; } + protected String decapitalise(String answer) { + return answer.substring(0, 1).toLowerCase() + answer.substring(1); + } + protected String getDescription(JClass type) { return getCommentText(type); } diff --git a/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java b/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java new file mode 100644 index 00000000..d8e46696 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java @@ -0,0 +1,40 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.BeerService; +import org.xbean.spring.example.SoupService; + +/** + * @author James Strachan + * @version $Id$ + * @since 1.0 + */ +public class BeerUsingSpringTest extends SpringTestSupport { + + public void testBeer() throws Exception { + BeerService soup = (BeerService) getBean("beerService"); + + assertEquals("name", "Stella", soup.getName()); + assertEquals("id", "123", soup.getId()); + } + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/beer-normal.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/BeerUsingXBeanTest.java b/spring/src/test/org/xbean/spring/context/BeerUsingXBeanTest.java new file mode 100644 index 00000000..7280f3a5 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/BeerUsingXBeanTest.java @@ -0,0 +1,33 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; + +/** + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ +public class BeerUsingXBeanTest extends BeerUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/beer-xbean.xml"); + } + +} diff --git a/spring/src/test/org/xbean/spring/context/beer-normal.xml b/spring/src/test/org/xbean/spring/context/beer-normal.xml new file mode 100644 index 00000000..7992c689 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/beer-normal.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring/src/test/org/xbean/spring/context/beer-xbean.xml b/spring/src/test/org/xbean/spring/context/beer-xbean.xml new file mode 100644 index 00000000..1e664bc9 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/beer-xbean.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/spring/src/test/org/xbean/spring/example/BeerService.java b/spring/src/test/org/xbean/spring/example/BeerService.java new file mode 100644 index 00000000..e81e39e4 --- /dev/null +++ b/spring/src/test/org/xbean/spring/example/BeerService.java @@ -0,0 +1,52 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.example; + + +/** + * @org.xbean.XBean element="beer" description="Mmmmm beer" + * + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ + +// START SNIPPET: bean +public class BeerService { + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} +// END SNIPPET: bean + diff --git a/spring/src/test/org/xbean/spring/example/PizzaService.java b/spring/src/test/org/xbean/spring/example/PizzaService.java index 1d292b58..730ff9b4 100644 --- a/spring/src/test/org/xbean/spring/example/PizzaService.java +++ b/spring/src/test/org/xbean/spring/example/PizzaService.java @@ -67,6 +67,9 @@ public void setSize(int size) { this.size = size; } + /** + * @org.xbean.Alias value="myTopping" + */ public String getTopping() { return topping; } diff --git a/spring/src/test/org/xbean/spring/example/WineService.java b/spring/src/test/org/xbean/spring/example/WineService.java new file mode 100644 index 00000000..d1f739df --- /dev/null +++ b/spring/src/test/org/xbean/spring/example/WineService.java @@ -0,0 +1,49 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.example; + +/** + * A drop of nice + * + * @org.xbean.XBean + * + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ + +// START SNIPPET: bean +public class WineService { + private String id; + private String name; + + public WineService(String id, String name) { + this.id = id; + this.name = name; + } + + public String getId() { + return id; + } + + public String getName() { + return name; + } +} +// END SNIPPET: bean + From b05052e52d5df78c860e248c9008c7e71be70d95 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Sun, 16 Oct 2005 23:47:34 +0000 Subject: [PATCH 010/736] Added test case and fix for constructor injection with read only properties git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380429 13f79535-47bb-0310-9956-ffa450edef68 --- .../ClassPathXmlApplicationContext.java | 8 ++-- .../FileSystemXmlApplicationContext.java | 8 ++-- .../ResourceXmlApplicationContext.java | 8 ++-- .../context/SpringApplicationContext.java | 20 ++-------- .../context/XmlWebApplicationContext.java | 10 ++--- .../spring/context/impl/MappingMetaData.java | 8 ++-- .../context/impl/NamedConstructorArgs.java | 14 ++++++- .../impl/XBeanXmlBeanDefinitionParser.java | 15 +++---- .../impl/XBeanXmlBeanDefinitionReader.java | 8 ++-- .../xbean/spring/task/SchemaGenerator.java | 5 ++- .../spring/util/AbstractSpringVisitor.java | 10 ++--- .../org/xbean/spring/util/SpringVisitor.java | 8 ++-- .../spring/context/BeerUsingSpringTest.java | 1 - .../spring/context/WineUsingSpringTest.java | 39 +++++++++++++++++++ .../spring/context/WineUsingXBeanTest.java | 33 ++++++++++++++++ .../impl/NamedConstructorArgsTest.java | 10 ++--- .../org/xbean/spring/context/wine-normal.xml | 10 +++++ .../org/xbean/spring/context/wine-xbean.xml | 9 +++++ .../xbean/spring/example/PizzaService.java | 2 +- .../spring/example/RestaurantService.java | 3 +- .../org/xbean/spring/example/WineService.java | 2 +- 21 files changed, 157 insertions(+), 74 deletions(-) create mode 100644 spring/src/test/org/xbean/spring/context/WineUsingSpringTest.java create mode 100644 spring/src/test/org/xbean/spring/context/WineUsingXBeanTest.java create mode 100644 spring/src/test/org/xbean/spring/context/wine-normal.xml create mode 100644 spring/src/test/org/xbean/spring/context/wine-xbean.xml diff --git a/spring/src/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java b/spring/src/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java index ef2e6ecd..c4856ea8 100644 --- a/spring/src/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java +++ b/spring/src/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java @@ -17,16 +17,16 @@ **/ package org.xbean.spring.context; -import java.io.IOException; -import java.util.Collections; -import java.util.List; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; import org.xbean.spring.context.impl.XBeanXmlBeanDefinitionReader; +import java.io.IOException; +import java.util.Collections; +import java.util.List; + /** * An XBean version of the regular Spring class to provide improved XML handling. * diff --git a/spring/src/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java b/spring/src/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java index 21749ecc..2e2e825f 100644 --- a/spring/src/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java +++ b/spring/src/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java @@ -17,16 +17,16 @@ **/ package org.xbean.spring.context; -import java.io.IOException; -import java.util.Collections; -import java.util.List; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; import org.xbean.spring.context.impl.XBeanXmlBeanDefinitionReader; +import java.io.IOException; +import java.util.Collections; +import java.util.List; + /** * An XBean version of the regular Spring class to provide improved XML * handling. diff --git a/spring/src/java/org/xbean/spring/context/ResourceXmlApplicationContext.java b/spring/src/java/org/xbean/spring/context/ResourceXmlApplicationContext.java index 3d0d942c..8a9d4fa5 100644 --- a/spring/src/java/org/xbean/spring/context/ResourceXmlApplicationContext.java +++ b/spring/src/java/org/xbean/spring/context/ResourceXmlApplicationContext.java @@ -17,10 +17,6 @@ **/ package org.xbean.spring.context; -import java.io.IOException; -import java.util.Collections; -import java.util.List; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; @@ -28,6 +24,10 @@ import org.springframework.core.io.Resource; import org.xbean.spring.context.impl.XBeanXmlBeanDefinitionReader; +import java.io.IOException; +import java.util.Collections; +import java.util.List; + /** * An XBean version of a regular Spring ApplicationContext which takes a * {@link Resource} as a parameter to load the application context diff --git a/spring/src/java/org/xbean/spring/context/SpringApplicationContext.java b/spring/src/java/org/xbean/spring/context/SpringApplicationContext.java index d66154cc..049c2f46 100644 --- a/spring/src/java/org/xbean/spring/context/SpringApplicationContext.java +++ b/spring/src/java/org/xbean/spring/context/SpringApplicationContext.java @@ -16,27 +16,13 @@ */ package org.xbean.spring.context; -import java.util.List; -import java.util.Map; -import java.util.Locale; -import java.io.IOException; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationEvent; -import org.springframework.context.NoSuchMessageException; -import org.springframework.context.MessageSourceResolvable; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.event.ContextClosedEvent; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.access.SingletonBeanFactoryLocator; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.BeansException; -import org.springframework.core.io.Resource; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ResourceLoader; +import java.util.List; + /** * SpringApplicationContext is an interface that defines the actual interface exposed by the application contexts * provided by Spring. This interface should be in Spring and the Spring application contexts should implement this diff --git a/spring/src/java/org/xbean/spring/context/XmlWebApplicationContext.java b/spring/src/java/org/xbean/spring/context/XmlWebApplicationContext.java index df54b0a7..ba1c6961 100644 --- a/spring/src/java/org/xbean/spring/context/XmlWebApplicationContext.java +++ b/spring/src/java/org/xbean/spring/context/XmlWebApplicationContext.java @@ -17,14 +17,14 @@ **/ package org.xbean.spring.context; -import java.util.List; -import java.util.Collections; -import java.io.IOException; - -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.xbean.spring.context.impl.XBeanXmlBeanDefinitionReader; +import java.io.IOException; +import java.util.Collections; +import java.util.List; + /** * An XBean version of the regular Spring class to provide improved XML * handling. diff --git a/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java b/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java index b4e82eed..c4263849 100644 --- a/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java +++ b/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java @@ -17,12 +17,12 @@ **/ package org.xbean.spring.context.impl; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.Collections; -import java.util.ArrayList; import java.lang.reflect.Constructor; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Properties; +import java.util.StringTokenizer; /** * A helper class which understands how to map an XML namespaced element to diff --git a/spring/src/java/org/xbean/spring/context/impl/NamedConstructorArgs.java b/spring/src/java/org/xbean/spring/context/impl/NamedConstructorArgs.java index eff7202b..8927afa3 100644 --- a/spring/src/java/org/xbean/spring/context/impl/NamedConstructorArgs.java +++ b/spring/src/java/org/xbean/spring/context/impl/NamedConstructorArgs.java @@ -27,11 +27,21 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * NamedConstructorArgs is a BeanFactoryPostProcessor that converts property declarations into indexed constructor args - * based on the the constructor parameter names annotation. This process first selctes a constructor and then fills in + * based on the the constructor parameter names annotation. This process first selects a constructor and then fills in * the constructor arguments from the properties defined in the bean definition. If a property is not defined in the * bean definition, first the defaultValues map is checked for a value and if a value is not present a Java default * value is provided for the constructor argument (e.g. numbers are assigned 0 and objects are assigned null). diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 7e4d7b3b..4d511e85 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -19,6 +19,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.MutablePropertyValues; +import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; @@ -28,8 +30,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.DefaultXmlBeanDefinitionParser; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.PropertyValue; import org.springframework.context.support.AbstractApplicationContext; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -50,10 +50,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; -import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; import java.util.Properties; import java.util.Set; @@ -376,11 +373,9 @@ protected PropertyDescriptor getPropertyDescriptor(String className, String loca PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); for (int i = 0; i < descriptors.length; i++) { PropertyDescriptor descriptor = descriptors[i]; - if (descriptor.getWriteMethod() != null) { - String name = descriptor.getName(); - if (name.equals(localName)) { - return descriptor; - } + String name = descriptor.getName(); + if (name.equals(localName)) { + return descriptor; } } } diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java index 53fa2a93..a1e3ba33 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java @@ -16,9 +16,6 @@ */ package org.xbean.spring.context.impl; -import java.util.Iterator; -import java.util.List; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.ResourceEntityResolver; @@ -26,8 +23,11 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; import org.w3c.dom.Document; -import org.xbean.spring.context.SpringXmlPreprocessor; import org.xbean.spring.context.SpringApplicationContext; +import org.xbean.spring.context.SpringXmlPreprocessor; + +import java.util.Iterator; +import java.util.List; /** * XBeanXmlBeanDefinitionReader extends XmlBeanDefinitionReader adds support for SpringXMLPreprocessors which can diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java index b4bf220e..7e2dd7fb 100644 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java +++ b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java @@ -51,6 +51,7 @@ */ public class SchemaGenerator { public static final String XBEAN_ANNOTATION = "org.xbean.XBean"; + public static final String PROPERTY_ANNOTATION = "org.xbean.Property"; private static final Log log = LogFactory.getLog(SchemaGenerator.class); @@ -163,9 +164,9 @@ protected void generatePropertiesFilePropertyAliases(PrintWriter out, String nam } protected void generatePropertiesFilePropertyAlias(PrintWriter out, String namespace, SchemaElement element, JProperty property) { - JAnnotation annotation = property.getAnnotation("org.xbean.Alias"); + JAnnotation annotation = property.getAnnotation(PROPERTY_ANNOTATION); if (annotation != null) { - String text = getStringValue(annotation, "value"); + String text = getStringValue(annotation, "alias"); if (text != null) { String name = decapitalise(property.getSimpleName()); out.println(element.getLocalName() + "." + text + " = " +name); diff --git a/spring/src/java/org/xbean/spring/util/AbstractSpringVisitor.java b/spring/src/java/org/xbean/spring/util/AbstractSpringVisitor.java index 99787498..eb2913e8 100644 --- a/spring/src/java/org/xbean/spring/util/AbstractSpringVisitor.java +++ b/spring/src/java/org/xbean/spring/util/AbstractSpringVisitor.java @@ -16,11 +16,6 @@ */ package org.xbean.spring.util; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.springframework.beans.BeansException; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; @@ -30,6 +25,11 @@ import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.config.RuntimeBeanReference; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + /** * Default do nothing implementation of SpringVisitor. * @author Dain Sundstrom diff --git a/spring/src/java/org/xbean/spring/util/SpringVisitor.java b/spring/src/java/org/xbean/spring/util/SpringVisitor.java index 293f707b..c6743ccf 100644 --- a/spring/src/java/org/xbean/spring/util/SpringVisitor.java +++ b/spring/src/java/org/xbean/spring/util/SpringVisitor.java @@ -16,17 +16,17 @@ */ package org.xbean.spring.util; -import java.util.Collection; -import java.util.Map; - import org.springframework.beans.BeansException; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.config.RuntimeBeanReference; -import org.springframework.beans.factory.config.BeanDefinitionHolder; + +import java.util.Collection; +import java.util.Map; /** * Walks a spring bean factory tree. diff --git a/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java b/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java index d8e46696..65be33f0 100644 --- a/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java +++ b/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java @@ -18,7 +18,6 @@ import org.springframework.context.support.AbstractXmlApplicationContext; import org.xbean.spring.example.BeerService; -import org.xbean.spring.example.SoupService; /** * @author James Strachan diff --git a/spring/src/test/org/xbean/spring/context/WineUsingSpringTest.java b/spring/src/test/org/xbean/spring/context/WineUsingSpringTest.java new file mode 100644 index 00000000..2b644c3f --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/WineUsingSpringTest.java @@ -0,0 +1,39 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.WineService; + +/** + * @author James Strachan + * @version $Id$ + * @since 1.0 + */ +public class WineUsingSpringTest extends SpringTestSupport { + + public void testWine() throws Exception { + WineService soup = (WineService) getBean("wineService"); + + assertEquals("name", "Amarone", soup.getName()); + assertEquals("id", "wineService", soup.getId()); + } + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/wine-normal.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/WineUsingXBeanTest.java b/spring/src/test/org/xbean/spring/context/WineUsingXBeanTest.java new file mode 100644 index 00000000..fa08bd57 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/WineUsingXBeanTest.java @@ -0,0 +1,33 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; + +/** + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ +public class WineUsingXBeanTest extends WineUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/wine-xbean.xml"); + } + +} diff --git a/spring/src/test/org/xbean/spring/context/impl/NamedConstructorArgsTest.java b/spring/src/test/org/xbean/spring/context/impl/NamedConstructorArgsTest.java index a09dbaf1..95302db0 100644 --- a/spring/src/test/org/xbean/spring/context/impl/NamedConstructorArgsTest.java +++ b/spring/src/test/org/xbean/spring/context/impl/NamedConstructorArgsTest.java @@ -16,14 +16,14 @@ */ package org.xbean.spring.context.impl; -import junit.framework.TestCase; - -import java.util.Properties; -import java.util.Arrays; import java.io.ByteArrayInputStream; import java.lang.reflect.Constructor; -import java.net.URLClassLoader; import java.net.URL; +import java.net.URLClassLoader; +import java.util.Arrays; +import java.util.Properties; + +import junit.framework.TestCase; /** * @author Dain Sundstrom diff --git a/spring/src/test/org/xbean/spring/context/wine-normal.xml b/spring/src/test/org/xbean/spring/context/wine-normal.xml new file mode 100644 index 00000000..ac5ec984 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/wine-normal.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring/src/test/org/xbean/spring/context/wine-xbean.xml b/spring/src/test/org/xbean/spring/context/wine-xbean.xml new file mode 100644 index 00000000..60107a09 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/wine-xbean.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/spring/src/test/org/xbean/spring/example/PizzaService.java b/spring/src/test/org/xbean/spring/example/PizzaService.java index 730ff9b4..f1fa942d 100644 --- a/spring/src/test/org/xbean/spring/example/PizzaService.java +++ b/spring/src/test/org/xbean/spring/example/PizzaService.java @@ -68,7 +68,7 @@ public void setSize(int size) { } /** - * @org.xbean.Alias value="myTopping" + * @org.xbean.Property alias="myTopping" */ public String getTopping() { return topping; diff --git a/spring/src/test/org/xbean/spring/example/RestaurantService.java b/spring/src/test/org/xbean/spring/example/RestaurantService.java index 0b14b6b4..f2862180 100644 --- a/spring/src/test/org/xbean/spring/example/RestaurantService.java +++ b/spring/src/test/org/xbean/spring/example/RestaurantService.java @@ -17,9 +17,10 @@ **/ package org.xbean.spring.example; +import javax.xml.namespace.QName; + import java.net.URI; import java.util.List; -import javax.xml.namespace.QName; /** * An owner POJO used for testing out nested properties diff --git a/spring/src/test/org/xbean/spring/example/WineService.java b/spring/src/test/org/xbean/spring/example/WineService.java index d1f739df..520258fb 100644 --- a/spring/src/test/org/xbean/spring/example/WineService.java +++ b/spring/src/test/org/xbean/spring/example/WineService.java @@ -20,7 +20,7 @@ /** * A drop of nice * - * @org.xbean.XBean + * @org.xbean.XBean element="wine" * * @author James Strachan * @version $Id$ From 4195b626b9a6001290ad51b79366a6eec5488c26 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Sun, 16 Oct 2005 23:59:01 +0000 Subject: [PATCH 011/736] Intermediate checkin for JMX wrapping git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380430 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/maven.xml | 35 ++++ jmx/project.properties | 35 ++++ jmx/project.xml | 150 ++++++++++++++++++ .../org/xbean/jmx/JMXServiceException.java | 52 ++++++ .../java/org/xbean/jmx/JMXServiceMonitor.java | 125 +++++++++++++++ .../java/org/xbean/jmx/JMXStrategyFinder.java | 106 +++++++++++++ .../org/xbean/jmx/JMXWrappingStrategy.java | 38 +++++ .../xbean/jmx/config/JMXServiceConfig.java | 44 +++++ .../strategies/JavaBeanWrappingStrategy.java | 35 ++++ .../org.xbean.jmx.StrategyFinder/javabean | 1 + 10 files changed, 621 insertions(+) create mode 100644 jmx/maven.xml create mode 100644 jmx/project.properties create mode 100644 jmx/project.xml create mode 100644 jmx/src/java/org/xbean/jmx/JMXServiceException.java create mode 100644 jmx/src/java/org/xbean/jmx/JMXServiceMonitor.java create mode 100644 jmx/src/java/org/xbean/jmx/JMXStrategyFinder.java create mode 100644 jmx/src/java/org/xbean/jmx/JMXWrappingStrategy.java create mode 100644 jmx/src/java/org/xbean/jmx/config/JMXServiceConfig.java create mode 100644 jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java create mode 100644 jmx/src/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean diff --git a/jmx/maven.xml b/jmx/maven.xml new file mode 100644 index 00000000..4c4bc418 --- /dev/null +++ b/jmx/maven.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + diff --git a/jmx/project.properties b/jmx/project.properties new file mode 100644 index 00000000..a960e0b9 --- /dev/null +++ b/jmx/project.properties @@ -0,0 +1,35 @@ +### +# Copyright 2005 the original author or authors. +# +# 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. +### +maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/mave,http://emma.sourceforge.net/maven + +maven.compile.source=1.4 +maven.compile.target=1.4 +maven.compile.deprecation=true +maven.compile.debug=true +maven.compile.optimize=true + +maven.remote.group=xbean +maven.username=${user.name} +maven.repo.central=beaver.codehaus.org +maven.repo.central.directory=/dist + +maven.javadoc.source=1.4 +maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ +maven.javadoc.additionalparam=-linksource + +maven.site.deploy.method=rsync +maven.site.deploy.clean=true +maven.emma.report.xml=true diff --git a/jmx/project.xml b/jmx/project.xml new file mode 100644 index 00000000..454cb500 --- /dev/null +++ b/jmx/project.xml @@ -0,0 +1,150 @@ + + + + + 3 + + XBean :: JMX + xbean-jmx + xbean + 2.0-SNAPSHOT + + XBean.org + http://xbean.org + + + org.xbean + + XBean: JMX Services + + + The XBean JMX module contains code that allows configuration of JMX MBeans. + + + http://www.xbean.org/ + + www.xbean.org + /home/projects/xbean/public_html/maven + + + + xbean developers + mailto:dev-subscribe@xbean.org + mailto:dev-unsubscribe@xbean.org + + + xbean users + mailto:user-subscribe@xbean.org + mailto:user-unsubscribe@xbean.org + + + xbean source control messages + mailto:scm-subscribe@xbean.org + mailto:scm-unsubscribe@xbean.org + + + + + + commons-logging + commons-logging + 1.0.3 + + + backport175 + backport175 + 1.0 + + + backport-util-concurrent + backport-util-concurrent + 2.0_01_pd + + + cglib + cglib-nodep + 2.1_2 + test + + + concurrent + concurrent + 1.3.4 + + + mx4j + mx4j + 3.0.1 + + + springframework + spring + 1.2.4 + + + xbean + xbean-kernel + 2.0-SNAPSHOT + + + xbean + xbean-spring + 2.0-SNAPSHOT + + + emma + maven-emma-plugin + 0.6 + plugin + + + + + src/java + + + src/resources + + + src/test + + + **/*Test.java + + + + + + + + + + + + + + + maven-jxr-plugin + maven-javadoc-plugin + maven-junit-report-plugin + + + + + + + diff --git a/jmx/src/java/org/xbean/jmx/JMXServiceException.java b/jmx/src/java/org/xbean/jmx/JMXServiceException.java new file mode 100644 index 00000000..4d4fa31d --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/JMXServiceException.java @@ -0,0 +1,52 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JMXServiceException extends Exception { + + /** + * {@inheritDoc} + */ + public JMXServiceException() { + super(); + } + + /** + * {@inheritDoc} + */ + public JMXServiceException(String message) { + super(message); + } + + /** + * {@inheritDoc} + */ + public JMXServiceException(String message, Throwable cause) { + super(message, cause); + } + + /** + * {@inheritDoc} + */ + public JMXServiceException(Throwable cause) { + super(cause); + } +} diff --git a/jmx/src/java/org/xbean/jmx/JMXServiceMonitor.java b/jmx/src/java/org/xbean/jmx/JMXServiceMonitor.java new file mode 100644 index 00000000..32f85cdf --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/JMXServiceMonitor.java @@ -0,0 +1,125 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import java.util.HashMap; +import java.util.Map; +import javax.management.InstanceAlreadyExistsException; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanRegistrationException; +import javax.management.MBeanServer; +import javax.management.NotCompliantMBeanException; + +import org.xbean.jmx.config.JMXServiceConfig; +import org.xbean.kernel.Kernel; +import org.xbean.kernel.NullServiceMonitor; +import org.xbean.kernel.ServiceEvent; +import org.xbean.kernel.ServiceName; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JMXServiceMonitor extends NullServiceMonitor { + + private final static Log log = LogFactory.getLog(JMXServiceMonitor.class); + private final static JMXStrategyFinder FINDER = new JMXStrategyFinder("META-INF/org.xbean.jmx.StrategyFinder/"); + private final Map configurations = new HashMap(); + private final Map strategies = new HashMap(); + private final MBeanServer server; + + public JMXServiceMonitor(Kernel kernel, MBeanServer server) { + if (kernel == null) throw new IllegalArgumentException("kernel is null"); + if (server == null) throw new IllegalArgumentException("server is null"); + + kernel.addServiceMonitor(this); + this.server = server; + } + + /** + * {@inheritDoc} + */ + public void serviceStarting(ServiceEvent serviceEvent) { + Cache entry = (Cache) configurations.get(serviceEvent.getServiceName()); + if (entry != null) { + try { + server.registerMBean(entry.strategy.wrapService(serviceEvent.getService(), entry.configuration), + entry.configuration.getObjectName()); + } catch (InstanceAlreadyExistsException doNothing) { + log.error("Starting " + serviceEvent.getServiceName(), doNothing); + } catch (MBeanRegistrationException doNothing) { + log.error("Starting " + serviceEvent.getServiceName(), doNothing); + } catch (NotCompliantMBeanException doNothing) { + log.error("Starting " + serviceEvent.getServiceName(), doNothing); + } catch (JMXServiceException doNothing) { + log.error("Starting " + serviceEvent.getServiceName(), doNothing); + } + } + } + + /** + * {@inheritDoc} + */ + public void serviceStopping(ServiceEvent serviceEvent) { + Cache entry = (Cache) configurations.get(serviceEvent.getServiceName()); + if (entry != null) { + try { + server.unregisterMBean(entry.configuration.getObjectName()); + entry.strategy.unwrapService(serviceEvent.getService(), entry.configuration); + } catch (InstanceNotFoundException doNothing) { + log.error("Starting " + serviceEvent.getServiceName(), doNothing); + } catch (MBeanRegistrationException doNothing) { + log.error("Starting " + serviceEvent.getServiceName(), doNothing); + } + } + } + + /** + * Add a service configuration to the monitor. The method loads the wrapping + * strategy, if it has not been loaded already. + * + * @param service of the service to be wrapped. + * @param config the details of how the service is to be wrapped. + * @throws JMXServiceException if no wrapping strategy exists for the config. + */ + public void addServiceConfig(ServiceName service, JMXServiceConfig config) throws JMXServiceException { + try { + String name = config.getStrategy(); + JMXWrappingStrategy strategy = (JMXWrappingStrategy) strategies.get(name); + if (strategy == null) { + strategy = FINDER.newInstance(name); + strategies.put(name, strategy); + } + configurations.put(service, new Cache(config, strategy)); + } catch (JMXServiceException doNothing) { + log.error("Adding " + service, doNothing); + throw doNothing; + } + } + + private class Cache { + final JMXServiceConfig configuration; + final JMXWrappingStrategy strategy; + + public Cache(JMXServiceConfig configuration, JMXWrappingStrategy strategy) { + this.configuration = configuration; + this.strategy = strategy; + } + } +} diff --git a/jmx/src/java/org/xbean/jmx/JMXStrategyFinder.java b/jmx/src/java/org/xbean/jmx/JMXStrategyFinder.java new file mode 100644 index 00000000..a47a9363 --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/JMXStrategyFinder.java @@ -0,0 +1,106 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.WeakHashMap; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JMXStrategyFinder { + + private final static String PROPERTY_NAME = "org.xbean.jmx.WrapperStrategyClass"; + private final String path; + private final WeakHashMap classCache = new WeakHashMap(); + + public JMXStrategyFinder(String path) { + this.path = path; + } + + /** + * Creates a new instance of the given key + * + * @param key is the key to add to the path to find a text file + * containing the factory name + * @return a newly created instance + */ + public JMXWrappingStrategy newInstance(String key) throws JMXServiceException { + JMXWrappingStrategy result = null; + try { + synchronized (classCache) { + Class clazz = (Class) classCache.get(key); + if (clazz == null) { + clazz = loadClass(doFindServiceWrapperProperies(key)); + classCache.put(key, clazz); + } + result = (JMXWrappingStrategy) clazz.newInstance(); + } + } catch (ClassNotFoundException doNothing) { + throw new JMXServiceException(doNothing); + } catch (IOException doNothing) { + throw new JMXServiceException(doNothing); + } catch (InstantiationException doNothing) { + throw new JMXServiceException(doNothing); + } catch (IllegalAccessException doNothing) { + throw new JMXServiceException(doNothing); + } + return result; + } + + private Class loadClass(Properties properties) throws ClassNotFoundException, IOException { + + String className = properties.getProperty(PROPERTY_NAME); + if (className == null) { + throw new IOException("Expected property is missing: " + PROPERTY_NAME); + } + try { + return Thread.currentThread().getContextClassLoader().loadClass(className); + } catch (ClassNotFoundException e) { + return JMXStrategyFinder.class.getClassLoader().loadClass(className); + } + } + + private Properties doFindServiceWrapperProperies(String key) throws IOException { + String uri = path + key; + + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(uri); + if (in == null) { + in = JMXStrategyFinder.class.getClassLoader().getResourceAsStream(uri); + if (in == null) { + throw new IOException("Could not find strategy class for resource: " + uri); + } + } + + BufferedInputStream reader = null; + try { + reader = new BufferedInputStream(in); + Properties properties = new Properties(); + properties.load(reader); + return properties; + } finally { + try { + reader.close(); + } catch (Exception e) { + } + } + } +} \ No newline at end of file diff --git a/jmx/src/java/org/xbean/jmx/JMXWrappingStrategy.java b/jmx/src/java/org/xbean/jmx/JMXWrappingStrategy.java new file mode 100644 index 00000000..e88c143d --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/JMXWrappingStrategy.java @@ -0,0 +1,38 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import org.xbean.jmx.config.JMXServiceConfig; + + +/** + * @version $Revision: $ $Date: $ + */ +public interface JMXWrappingStrategy { + + /** + * @param service + * @param config + */ + public Object wrapService(Object service, JMXServiceConfig config) throws JMXServiceException; + + /** + * @param service + * @param config + */ + public void unwrapService(Object service, JMXServiceConfig config); +} diff --git a/jmx/src/java/org/xbean/jmx/config/JMXServiceConfig.java b/jmx/src/java/org/xbean/jmx/config/JMXServiceConfig.java new file mode 100644 index 00000000..4edef771 --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/config/JMXServiceConfig.java @@ -0,0 +1,44 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx.config; + +import javax.management.ObjectName; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JMXServiceConfig { + private String strategy; + private ObjectName objectName; + + public String getStrategy() { + return strategy; + } + + public void setStrategy(String strategy) { + this.strategy = strategy; + } + + public ObjectName getObjectName() { + return objectName; + } + + public void setObjectName(ObjectName objectName) { + this.objectName = objectName; + } +} diff --git a/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java b/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java new file mode 100644 index 00000000..57f1059a --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java @@ -0,0 +1,35 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx.strategies; + +import org.xbean.jmx.JMXWrappingStrategy; +import org.xbean.jmx.config.JMXServiceConfig; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JavaBeanWrappingStrategy implements JMXWrappingStrategy { + + public Object wrapService(Object service, JMXServiceConfig config) { + return null; //TODO: change body of implemented methods use File | Settings | File Templates. + } + + public void unwrapService(Object service, JMXServiceConfig config) { + //TODO: change body of implemented methods use File | Settings | File Templates. + } +} diff --git a/jmx/src/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean b/jmx/src/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean new file mode 100644 index 00000000..7afd7c62 --- /dev/null +++ b/jmx/src/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean @@ -0,0 +1 @@ +org.xbean.jmx.WrapperStrategyClass=org.xbean.jmx.strategies.JavaBeanWrappingStrategy \ No newline at end of file From e81d150f60073d84736494a90981c5e673bf416f Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 17 Oct 2005 00:00:49 +0000 Subject: [PATCH 012/736] added support for the # style of references in the XML git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380431 13f79535-47bb-0310-9956-ffa450edef68 --- .../context/impl/XBeanXmlBeanDefinitionParser.java | 9 +++++---- .../org/xbean/spring/context/pizza-xbean-bean-ref.xml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 4d511e85..11c1b90b 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -87,7 +87,7 @@ public class XBeanXmlBeanDefinitionParser extends DefaultXmlBeanDefinitionParser private static final String JAVA_PACKAGE_PREFIX = "java://"; - private static final String BEAN_REFERENCE_SUFFIX = "-ref"; + private static final String BEAN_REFERENCE_PREFIX = "#"; private Set reservedElementNames = new HashSet(Arrays.asList(RESERVED_ELEMENT_NAMES)); private Set reservedBeanAttributeNames = new HashSet(Arrays.asList(RESERVED_BEAN_ATTRIBUTE_NAMES)); @@ -202,12 +202,13 @@ protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMeta String localName = attribute.getName(); String value = attribute.getValue(); if (value != null) { - if (localName.endsWith(BEAN_REFERENCE_SUFFIX)) { - localName = localName.substring(0, localName.length() - BEAN_REFERENCE_SUFFIX.length()); + if (value.startsWith(BEAN_REFERENCE_PREFIX)) { + String ref = value.substring(BEAN_REFERENCE_PREFIX.length()); + // TOOD handle custom reference types like local or queries etc String propertyName = metadata.getPropertyName(getLocalName(element), localName); if (propertyName != null) { definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, - new RuntimeBeanReference(value)); + new RuntimeBeanReference(ref)); } } else { diff --git a/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml b/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml index b8b67e83..af2b2f82 100644 --- a/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml +++ b/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml @@ -8,7 +8,7 @@ - + From 9af2945510e5c6cc96998a77bb26f4b1b7d7274c Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 17 Oct 2005 00:08:03 +0000 Subject: [PATCH 013/736] =?UTF-8?q?allow=20#=C2=A0to=20be=20escaped,=20usi?= =?UTF-8?q?ng=20a=20double=20##?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380432 13f79535-47bb-0310-9956-ffa450edef68 --- .../context/impl/XBeanXmlBeanDefinitionParser.java | 12 ++++++++++-- .../context/PizzaUsingXBeanWinBeanRefTest.java | 10 ++++++++++ .../PizzaUsingXBeanWithJavaNamespaceTest.java | 1 + .../xbean/spring/context/pizza-xbean-bean-ref.xml | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 11c1b90b..af314202 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -202,13 +202,21 @@ protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMeta String localName = attribute.getName(); String value = attribute.getValue(); if (value != null) { + boolean reference = false; if (value.startsWith(BEAN_REFERENCE_PREFIX)) { - String ref = value.substring(BEAN_REFERENCE_PREFIX.length()); + value = value.substring(BEAN_REFERENCE_PREFIX.length()); + + // we could be an escaped string + if (!value.startsWith(BEAN_REFERENCE_PREFIX)) { + reference = true; + } + } + if (reference) { // TOOD handle custom reference types like local or queries etc String propertyName = metadata.getPropertyName(getLocalName(element), localName); if (propertyName != null) { definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, - new RuntimeBeanReference(ref)); + new RuntimeBeanReference(value)); } } else { diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java b/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java index 7f6c0163..da319442 100644 --- a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java +++ b/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java @@ -18,12 +18,22 @@ package org.xbean.spring.context; import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.PizzaService; /** * * @version $Revision: 1.1 $ */ public class PizzaUsingXBeanWinBeanRefTest extends PizzaUsingSpringTest { + + public void testPizza() throws Exception { + PizzaService pizza = (PizzaService) getBean("pizzaService"); + pizza.makePizza(); + + assertEquals("topping", "Salami", pizza.getTopping()); + assertEquals("cheese", "#Edam", pizza.getCheese()); + assertEquals("size", 17, pizza.getSize()); + } protected AbstractXmlApplicationContext createApplicationContext() { return new ClassPathXmlApplicationContext("org/xbean/spring/context/pizza-xbean-bean-ref.xml"); diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java b/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java index 1815b77b..b545544a 100644 --- a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java +++ b/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java @@ -18,6 +18,7 @@ package org.xbean.spring.context; import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.PizzaService; /** * @author James Strachan diff --git a/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml b/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml index af2b2f82..28b32905 100644 --- a/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml +++ b/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml @@ -8,7 +8,7 @@ - + From 63be3c1c62c2504ea84cbf44823c3bae47c6a387 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 17 Oct 2005 00:37:41 +0000 Subject: [PATCH 014/736] fixed build to work in multi-project git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380433 13f79535-47bb-0310-9956-ffa450edef68 --- spring/maven.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring/maven.xml b/spring/maven.xml index 4767e0a6..f0b95cf1 100644 --- a/spring/maven.xml +++ b/spring/maven.xml @@ -39,10 +39,10 @@ + classpathref="test.classpath" srcdir="src/test" metaInfDir="${basedir}/target/generated/"/> - - + + From b8a243d34753a8d345d3f29aeb41538e88d40f4e Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Mon, 17 Oct 2005 00:43:23 +0000 Subject: [PATCH 015/736] Some initial schema code for JMX git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380434 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/project.xml | 10 ++ jmx/src/java/org/xbean/jmx/EventAdapter.java | 103 ++++++++++++++++++ jmx/src/java/org/xbean/jmx/JMXException.java | 29 +++++ jmx/src/java/org/xbean/jmx/MBean.java | 32 ++++++ jmx/src/java/org/xbean/jmx/MBeanExporter.java | 39 +++++++ .../org/xbean/jmx/http/xbean.org/schemas/jmx | 21 ++++ jmx/src/test/org/xbean/jmx/JMXService.java | 8 ++ .../org/xbean/jmx/JMXStrategyFinderTest.java | 33 ++++++ jmx/src/test/org/xbean/jmx/JMXTest.java | 27 +++++ jmx/src/test/org/xbean/jmx/jmx-simple.xml | 10 ++ jmx/src/test/org/xbean/jmx/jmx.xml | 17 +++ 11 files changed, 329 insertions(+) create mode 100644 jmx/src/java/org/xbean/jmx/EventAdapter.java create mode 100644 jmx/src/java/org/xbean/jmx/JMXException.java create mode 100644 jmx/src/java/org/xbean/jmx/MBean.java create mode 100644 jmx/src/java/org/xbean/jmx/MBeanExporter.java create mode 100644 jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx create mode 100644 jmx/src/test/org/xbean/jmx/JMXService.java create mode 100644 jmx/src/test/org/xbean/jmx/JMXStrategyFinderTest.java create mode 100644 jmx/src/test/org/xbean/jmx/JMXTest.java create mode 100644 jmx/src/test/org/xbean/jmx/jmx-simple.xml create mode 100644 jmx/src/test/org/xbean/jmx/jmx.xml diff --git a/jmx/project.xml b/jmx/project.xml index 454cb500..569037f2 100644 --- a/jmx/project.xml +++ b/jmx/project.xml @@ -80,11 +80,13 @@ 2.1_2 test + mx4j mx4j @@ -122,6 +124,14 @@ src/test + + + src/test + + **/*.xml + + + **/*Test.java diff --git a/jmx/src/java/org/xbean/jmx/EventAdapter.java b/jmx/src/java/org/xbean/jmx/EventAdapter.java new file mode 100644 index 00000000..61954d49 --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/EventAdapter.java @@ -0,0 +1,103 @@ +package org.xbean.jmx; + +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; + +/** + * $Rev$ + */ +public class EventAdapter +{ + private Object source; + private Class targetClass; + private String addMethodName; + private String removeMethodName; + private Object listener; + + public void setSource(Object source) + { + this.source = source; + } + + public void setTargetClass(Class targetClass) + { + this.targetClass = targetClass; + } + + public void setAddMethodName(String addMethodName) + { + this.addMethodName = addMethodName; + } + + public void setRemoveMethodName(String removeMethodName) + { + this.removeMethodName = removeMethodName; + } + + public void start() + { + try + { + listener = targetClass.newInstance(); + Class[] interfaces = targetClass.getInterfaces(); + boolean found = false; + for (int i = 0; i < interfaces.length; ++i) + { + try + { + Method addMethod = source.getClass().getMethod(addMethodName, new Class[]{interfaces[i]}); + addMethod.invoke(source, new Object[]{listener}); + found = true; + break; + } + catch (NoSuchMethodException ignored) + { + } + } + if (!found) throw new JMXException("Could not find " + addMethodName + " in class " + targetClass.getName()); + } + catch (InstantiationException x) + { + throw new JMXException(x); + } + catch (IllegalAccessException x) + { + throw new JMXException(x); + } + catch (InvocationTargetException x) + { + throw new JMXException(x.getCause()); + } + } + + public void stop() + { + try + { + Class[] interfaces = targetClass.getInterfaces(); + boolean found = false; + for (int i = 0; i < interfaces.length; ++i) + { + try + { + Method removeMethod = source.getClass().getMethod(removeMethodName, new Class[]{interfaces[i]}); + removeMethod.invoke(source, new Object[]{listener}); + found = true; + break; + } + catch (NoSuchMethodException ignored) + { + } + } + if (!found) throw new JMXException("Could not find " + removeMethodName + " in class " + targetClass.getName()); + } + catch (IllegalAccessException x) + { + throw new JMXException(x); + } + catch (InvocationTargetException x) + { + throw new JMXException(x.getCause()); + } + } +} diff --git a/jmx/src/java/org/xbean/jmx/JMXException.java b/jmx/src/java/org/xbean/jmx/JMXException.java new file mode 100644 index 00000000..70f4704c --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/JMXException.java @@ -0,0 +1,29 @@ +/* + * © Copyright 2004 Hewlett-Packard + */ +package org.xbean.jmx; + +/** + * $Rev$ + */ +public class JMXException extends RuntimeException +{ + public JMXException() + { + } + + public JMXException(String message) + { + super(message); + } + + public JMXException(String message, Throwable cause) + { + super(message, cause); + } + + public JMXException(Throwable cause) + { + super(cause); + } +} diff --git a/jmx/src/java/org/xbean/jmx/MBean.java b/jmx/src/java/org/xbean/jmx/MBean.java new file mode 100644 index 00000000..51d97d4e --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/MBean.java @@ -0,0 +1,32 @@ +package org.xbean.jmx; + +/** + * $Rev$ + */ +public class MBean +{ + private Object bean; + private String objectName; + private Class mbeanClass; + private EventAdapter eventAdapter; + + public void setBean(Object bean) + { + this.bean = bean; + } + + public void setObjectName(String objectName) + { + this.objectName = objectName; + } + + public void setMBeanClass(Class mbeanClass) + { + this.mbeanClass = mbeanClass; + } + + public void setEventAdapter(EventAdapter eventAdapter) + { + this.eventAdapter = eventAdapter; + } +} diff --git a/jmx/src/java/org/xbean/jmx/MBeanExporter.java b/jmx/src/java/org/xbean/jmx/MBeanExporter.java new file mode 100644 index 00000000..506118e5 --- /dev/null +++ b/jmx/src/java/org/xbean/jmx/MBeanExporter.java @@ -0,0 +1,39 @@ +package org.xbean.jmx; + +import java.util.List; +import javax.management.MBeanServer; + +/** + * $Rev$ + */ +public class MBeanExporter +{ + private MBeanServer mbeanServer; + private List mbeans; + private List connectors; + + public void setMBeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public void setMBean(List mbeans) + { + this.mbeans = mbeans; + } + + public void setConnector(List connectors) + { + this.connectors = connectors; + } + + public void start() + { + System.out.println("start"); + } + + public void stop() + { + System.out.println("stop"); + } +} diff --git a/jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx b/jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx new file mode 100644 index 00000000..0188233e --- /dev/null +++ b/jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx @@ -0,0 +1,21 @@ +# the default package that POJOs are in +package = org.xbean.jmx + +# Mapping of XML Element localNames to classes +export = org.xbean.jmx.MBeanExporter +mbean = org.xbean.jmx.MBean +listen = org.xbean.jmx.EventAdapter + +# Mapping of XML Attributes to property names +listen.initMethod = start +listen.destroyMethod = stop +listen.listener = targetClassName +listen.add-method = addMethodName +listen.remove-method = removeMethodName + +mbean.objectname = objectName +mbean.mbean = mBeanClass + +export.initMethod = start +export.destroyMethod = stop +export.mbeanserver = mBeanServer; diff --git a/jmx/src/test/org/xbean/jmx/JMXService.java b/jmx/src/test/org/xbean/jmx/JMXService.java new file mode 100644 index 00000000..18ff6455 --- /dev/null +++ b/jmx/src/test/org/xbean/jmx/JMXService.java @@ -0,0 +1,8 @@ +package org.xbean.jmx; + +/** + * $Rev$ + */ +public class JMXService +{ +} diff --git a/jmx/src/test/org/xbean/jmx/JMXStrategyFinderTest.java b/jmx/src/test/org/xbean/jmx/JMXStrategyFinderTest.java new file mode 100644 index 00000000..90c26e8b --- /dev/null +++ b/jmx/src/test/org/xbean/jmx/JMXStrategyFinderTest.java @@ -0,0 +1,33 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import junit.framework.TestCase; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JMXStrategyFinderTest extends TestCase { + + public void testJavaBean() throws Exception { + JMXStrategyFinder finder = new JMXStrategyFinder("META-INF/org.xbean.jmx.StrategyFinder/"); + + JMXWrappingStrategy strategy = finder.newInstance("javabean"); + assertNotNull(strategy); + } +} diff --git a/jmx/src/test/org/xbean/jmx/JMXTest.java b/jmx/src/test/org/xbean/jmx/JMXTest.java new file mode 100644 index 00000000..b2790a6b --- /dev/null +++ b/jmx/src/test/org/xbean/jmx/JMXTest.java @@ -0,0 +1,27 @@ +package org.xbean.jmx; + +import junit.framework.TestCase; +import org.xbean.spring.context.ClassPathXmlApplicationContext; + +/** + * $Rev$ + */ +public class JMXTest extends TestCase +{ + public void testSimple() throws Exception + { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple.xml"); + try + { + Object jmxService = context.getBean("jmxService"); + assertNotNull(jmxService); + + Object jmxExporter = context.getBean("jmxExporter"); + assertNotNull(jmxExporter); + } + finally + { + context.destroy(); + } + } +} diff --git a/jmx/src/test/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/org/xbean/jmx/jmx-simple.xml new file mode 100644 index 00000000..7b6b99fd --- /dev/null +++ b/jmx/src/test/org/xbean/jmx/jmx-simple.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/jmx/src/test/org/xbean/jmx/jmx.xml b/jmx/src/test/org/xbean/jmx/jmx.xml new file mode 100644 index 00000000..654db7dd --- /dev/null +++ b/jmx/src/test/org/xbean/jmx/jmx.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + From 3fd1f9a016bbe418b9b601b1963fcb9052d03239 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 17 Oct 2005 01:06:47 +0000 Subject: [PATCH 016/736] moved config file to correct place git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380435 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/spring/http/xbean.org/schemas/jmx | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx diff --git a/jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx b/jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx new file mode 100644 index 00000000..0188233e --- /dev/null +++ b/jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx @@ -0,0 +1,21 @@ +# the default package that POJOs are in +package = org.xbean.jmx + +# Mapping of XML Element localNames to classes +export = org.xbean.jmx.MBeanExporter +mbean = org.xbean.jmx.MBean +listen = org.xbean.jmx.EventAdapter + +# Mapping of XML Attributes to property names +listen.initMethod = start +listen.destroyMethod = stop +listen.listener = targetClassName +listen.add-method = addMethodName +listen.remove-method = removeMethodName + +mbean.objectname = objectName +mbean.mbean = mBeanClass + +export.initMethod = start +export.destroyMethod = stop +export.mbeanserver = mBeanServer; From 5e0e827ba951623f7e75f864a76a70e17e76f203 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Mon, 17 Oct 2005 01:11:14 +0000 Subject: [PATCH 017/736] Should use the spring "version" git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380436 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/jmx/http/xbean.org/schemas/jmx | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx diff --git a/jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx b/jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx deleted file mode 100644 index 0188233e..00000000 --- a/jmx/src/resources/META-INF/services/org/xbean/jmx/http/xbean.org/schemas/jmx +++ /dev/null @@ -1,21 +0,0 @@ -# the default package that POJOs are in -package = org.xbean.jmx - -# Mapping of XML Element localNames to classes -export = org.xbean.jmx.MBeanExporter -mbean = org.xbean.jmx.MBean -listen = org.xbean.jmx.EventAdapter - -# Mapping of XML Attributes to property names -listen.initMethod = start -listen.destroyMethod = stop -listen.listener = targetClassName -listen.add-method = addMethodName -listen.remove-method = removeMethodName - -mbean.objectname = objectName -mbean.mbean = mBeanClass - -export.initMethod = start -export.destroyMethod = stop -export.mbeanserver = mBeanServer; From 17b410bd7c1fcbaff18704c040637986fcca0b5e Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 17 Oct 2005 13:27:21 +0000 Subject: [PATCH 018/736] * added support for elements which use its text content as a property using the contentProperty annotation field. * small refactoring of the names used in the META-INF/... properties file to avoid possible naming collisions with aliases git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380437 13f79535-47bb-0310-9956-ffa450edef68 --- .../spring/context/impl/MappingMetaData.java | 10 ++- .../impl/XBeanXmlBeanDefinitionParser.java | 82 ++++++++++++------- .../xbean/spring/task/SchemaGenerator.java | 13 ++- .../xbean/spring/http/xbean.org/schemas/salad | 2 +- .../spring/context/GinUsingSpringTest.java | 38 +++++++++ .../src/test/org/xbean/spring/context/gin.xml | 9 ++ .../org/xbean/spring/example/GinService.java | 37 +++++++++ 7 files changed, 157 insertions(+), 34 deletions(-) create mode 100644 spring/src/test/org/xbean/spring/context/GinUsingSpringTest.java create mode 100644 spring/src/test/org/xbean/spring/context/gin.xml create mode 100644 spring/src/test/org/xbean/spring/example/GinService.java diff --git a/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java b/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java index c4263849..2d2d27d4 100644 --- a/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java +++ b/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java @@ -78,7 +78,7 @@ public String getClassName(String localName) { * @return the property name to use or null if the attribute is not a valid property */ public String getPropertyName(String elementName, String attributeName) { - return properties.getProperty(elementName + "." + attributeName, attributeName); + return properties.getProperty(elementName + ".alias." + attributeName, attributeName); } /** @@ -89,7 +89,7 @@ public String getPropertyName(String elementName, String attributeName) { * @return the property name if available or null if it is not applicable */ public String getNestedListProperty(String elementName, String childElementName) { - return properties.getProperty(elementName + "." + childElementName + ".list"); + return properties.getProperty(elementName + ".list." + childElementName); } /** @@ -100,7 +100,7 @@ public String getNestedListProperty(String elementName, String childElementName) * @return the property name if available or null if it is not applicable */ public String getNestedProperty(String elementName, String childElementName) { - return properties.getProperty(elementName + "." + childElementName); + return properties.getProperty(elementName + ".alias." + childElementName); } public boolean isDefaultConstructor(Constructor constructor) { @@ -179,4 +179,8 @@ public String getDestroyMethodName(String elementName) { public String getFactoryMethodName(String elementName) { return properties.getProperty(elementName + ".factoryMethod"); } + + public String getContentProperty(String elementName) { + return properties.getProperty(elementName + ".contentProperty"); + } } diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index af314202..6ae1b16e 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -128,8 +128,8 @@ protected BeanDefinitionHolder parseBeanFromExtensionElement(Element element) { addSpringAttributeValues(className, element); BeanDefinitionHolder definition = parseBeanDefinitionElement(element, false); addAttributeProperties(definition, metadata, className, original); + addContentProperty(definition, metadata, element); addNestedPropertyElements(definition, metadata, className, element); - addInlinedPropertiesFile(definition, metadata, className, element); coerceNamespaceAwarePropertyValues(definition, element); declareLifecycleMethods(definition, metadata, element); namedConstructorArgs.processParameters(definition, metadata); @@ -195,12 +195,47 @@ protected void addAttributeProperties(BeanDefinitionHolder definition, MappingMe } } } + + } + + protected void addContentProperty(BeanDefinitionHolder definition, MappingMetaData metadata, Element element) { + String name = metadata.getContentProperty(getLocalName(element)); + if (name != null) { + String value = getElementText(element); + addAttributeProperty(definition, metadata, element, name, value); + } + else { + // lets stry parse a nested properties file + NodeList childNodes = element.getChildNodes(); + if (childNodes.getLength() == 1 && childNodes.item(0) instanceof Text) { + Text text = (Text) childNodes.item(0); + ByteArrayInputStream in = new ByteArrayInputStream(text.getData().getBytes()); + Properties properties = new Properties(); + try { + properties.load(in); + } + catch (IOException e) { + return; + } + Enumeration enumeration = properties.propertyNames(); + while (enumeration.hasMoreElements()) { + name = (String) enumeration.nextElement(); + Object value = properties.getProperty(name); + definition.getBeanDefinition().getPropertyValues().addPropertyValue(name, value); + } + } + } } protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMetaData metadata, Element element, Attr attribute) { String localName = attribute.getName(); String value = attribute.getValue(); + addAttributeProperty(definition, metadata, element, localName, value); + } + + protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMetaData metadata, Element element, + String localName, String value) { if (value != null) { boolean reference = false; if (value.startsWith(BEAN_REFERENCE_PREFIX)) { @@ -294,33 +329,6 @@ protected Object tryParseNestedPropertyViaIntrospection(MappingMetaData metadata return null; } - /** - * Parses a Properties file from the text node inside an element and adds - * the contents as properties of this bean. Only valid for elements - * containing a single text node and no sub-elements - */ - protected void addInlinedPropertiesFile(BeanDefinitionHolder definition, MappingMetaData metadata, - String className, Element element) { - NodeList childNodes = element.getChildNodes(); - if (childNodes.getLength() == 1 && childNodes.item(0) instanceof Text) { - Text text = (Text) childNodes.item(0); - ByteArrayInputStream in = new ByteArrayInputStream(text.getData().getBytes()); - Properties properties = new Properties(); - try { - properties.load(in); - } - catch (IOException e) { - return; - } - Enumeration enumeration = properties.propertyNames(); - while (enumeration.hasMoreElements()) { - String name = (String) enumeration.nextElement(); - Object value = properties.getProperty(name); - definition.getBeanDefinition().getPropertyValues().addPropertyValue(name, value); - } - } - } - /** * 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 - @@ -462,7 +470,8 @@ protected MappingMetaData findNamespaceProperties(String namespaceURI, String lo InputStream in = loadResource(uri); if (in == null) { if (namespaceURI != null && namespaceURI.length() > 0) { - in = loadResource(NamespaceHelper.createDiscoveryPathName(namespaceURI)); + uri = NamespaceHelper.createDiscoveryPathName(namespaceURI); + in = loadResource(uri); } } @@ -587,4 +596,19 @@ protected Object parsePropertySubElement(Element element, String beanName) throw } return super.parsePropertySubElement(element, beanName); } + + /** + * Returns the text of the 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(); + } } diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java index 7e2dd7fb..4e486bb7 100644 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java +++ b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java @@ -118,11 +118,22 @@ protected void generatePropertiesFile(PrintWriter out, String namespace, List el SchemaElement element = (SchemaElement) iter.next(); out.println(element.getLocalName() + " = " + element.getType().getQualifiedName()); + generatePropertiesFileContent(out, namespace, element); generatePropertiesFileConstructors(out, namespace, element); generatePropertiesFilePropertyAliases(out, namespace, element); } } + protected void generatePropertiesFileContent(PrintWriter out, String namespace, SchemaElement element) { + JAnnotation annotation = element.getType().getAnnotation(XBEAN_ANNOTATION); + if (annotation != null) { + String value = getStringValue(annotation, "contentProperty"); + if (value != null) { + out.println(element.getLocalName() + ".contentProperty = " + value); + } + } + } + protected void generatePropertiesFileConstructors(PrintWriter out, String namespace, SchemaElement element) { JClass type = element.getType(); JConstructor[] constructors = type.getConstructors(); @@ -169,7 +180,7 @@ protected void generatePropertiesFilePropertyAlias(PrintWriter out, String names String text = getStringValue(annotation, "alias"); if (text != null) { String name = decapitalise(property.getSimpleName()); - out.println(element.getLocalName() + "." + text + " = " +name); + out.println(element.getLocalName() + ".alias." + text + " = " +name); } } } diff --git a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad b/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad index 3c0fd292..f4f2a1e6 100644 --- a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad +++ b/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad @@ -7,7 +7,7 @@ package = org.xbean.spring.example salad = org.xbean.spring.example.SaladService # Mapping of XML Attributes to property names -salad.addCroutons = crouton +salad.alias.addCroutons = crouton # Mapping of constructor argument names org.xbean.spring.example.SaladService(java.lang.String,java.lang.String,boolean).parameterNames=dressing size crouton diff --git a/spring/src/test/org/xbean/spring/context/GinUsingSpringTest.java b/spring/src/test/org/xbean/spring/context/GinUsingSpringTest.java new file mode 100644 index 00000000..3e516fb3 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/GinUsingSpringTest.java @@ -0,0 +1,38 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.GinService; + +/** + * @author James Strachan + * @version $Id$ + * @since 1.0 + */ +public class GinUsingSpringTest extends SpringTestSupport { + + public void testWine() throws Exception { + GinService service = (GinService) getBean("ginService"); + + assertEquals("name", "Bombay Sapphire", service.getName()); + } + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/gin.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/gin.xml b/spring/src/test/org/xbean/spring/context/gin.xml new file mode 100644 index 00000000..d25a7383 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/gin.xml @@ -0,0 +1,9 @@ + + + + + Bombay Sapphire + + + + diff --git a/spring/src/test/org/xbean/spring/example/GinService.java b/spring/src/test/org/xbean/spring/example/GinService.java new file mode 100644 index 00000000..97749993 --- /dev/null +++ b/spring/src/test/org/xbean/spring/example/GinService.java @@ -0,0 +1,37 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.example; + +/** + * @org.xbean.XBean element="gin" contentProperty="name" + * + * @version $Revision: 1.1 $ + */ +public class GinService { + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} From 742a5dcf99bc65e913f60736f5b6bf4409140148 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Tue, 18 Oct 2005 00:35:56 +0000 Subject: [PATCH 019/736] git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380438 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java b/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java index 57f1059a..475c09ad 100644 --- a/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java +++ b/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java @@ -16,6 +16,7 @@ */ package org.xbean.jmx.strategies; +import org.xbean.jmx.JMXException; import org.xbean.jmx.JMXWrappingStrategy; import org.xbean.jmx.config.JMXServiceConfig; @@ -25,7 +26,7 @@ */ public class JavaBeanWrappingStrategy implements JMXWrappingStrategy { - public Object wrapService(Object service, JMXServiceConfig config) { + public Object wrapService(Object service, JMXServiceConfig config) throws JMXException { return null; //TODO: change body of implemented methods use File | Settings | File Templates. } From 46b14d4a5f20788278d4468760f5d3889815b4ce Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 18 Oct 2005 19:21:37 +0000 Subject: [PATCH 020/736] Add qname parsing on regular spring beans and parsing of root elements git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380439 13f79535-47bb-0310-9956-ffa450edef68 --- .../impl/XBeanXmlBeanDefinitionParser.java | 71 ++++++++++++------- .../xbean.org/schemas/{pizza => restaurant} | 2 +- .../RestaurantUsingSpringExtendedTest.java | 36 ++++++++++ .../context/RestaurantUsingSpringTest.java | 5 ++ .../spring/context/restaurant-normal.xml | 8 ++- .../context/restaurant-spring-extended.xml | 42 +++++++++++ .../spring/context/restaurant-xbean-root.xml | 17 +++++ 7 files changed, 155 insertions(+), 26 deletions(-) rename spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/{pizza => restaurant} (93%) create mode 100644 spring/src/test/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java create mode 100644 spring/src/test/org/xbean/spring/context/restaurant-spring-extended.xml create mode 100644 spring/src/test/org/xbean/spring/context/restaurant-xbean-root.xml diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 6ae1b16e..763166dd 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -37,6 +37,11 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; +import org.xbean.spring.context.impl.MappingMetaData; +import org.xbean.spring.context.impl.NamedConstructorArgs; +import org.xbean.spring.context.impl.NamespaceHelper; +import org.xbean.spring.context.impl.PropertyEditorHelper; +import org.xbean.spring.context.impl.QNameHelper; import javax.xml.namespace.QName; @@ -548,42 +553,60 @@ protected void declareLifecycleMethods(BeanDefinitionHolder definitionHolder, Ma // ------------------------------------------------------------------------- protected int parseBeanDefinitions(Element root) throws BeanDefinitionStoreException { int beanDefinitionCount = 0; - NodeList nl = root.getChildNodes(); - for (int i = 0; i < nl.getLength(); i++) { - Node node = nl.item(i); - if (node instanceof Element) { - Element ele = (Element) node; - if (IMPORT_ELEMENT.equals(node.getNodeName())) { - importBeanDefinitionResource(ele); - } - else if (ALIAS_ELEMENT.equals(node.getNodeName())) { - String name = ele.getAttribute(NAME_ATTRIBUTE); - String alias = ele.getAttribute(ALIAS_ATTRIBUTE); - getBeanDefinitionReader().getBeanFactory().registerAlias(name, alias); - } - else if (BEAN_ELEMENT.equals(node.getNodeName())) { - beanDefinitionCount++; - BeanDefinitionHolder bdHolder = parseBeanDefinitionElement(ele, false); - BeanDefinitionReaderUtils.registerBeanDefinition(bdHolder, getBeanDefinitionReader() - .getBeanFactory()); - } - else { - BeanDefinitionHolder bdHolder = parseBeanFromExtensionElement(ele); - if (bdHolder != null) { + if (isEmpty(root.getNamespaceURI()) || root.getLocalName().equals("beans")) { + NodeList nl = root.getChildNodes(); + for (int i = 0; i < nl.getLength(); i++) { + Node node = nl.item(i); + if (node instanceof Element) { + Element ele = (Element) node; + if (IMPORT_ELEMENT.equals(node.getNodeName())) { + importBeanDefinitionResource(ele); + } + else if (ALIAS_ELEMENT.equals(node.getNodeName())) { + String name = ele.getAttribute(NAME_ATTRIBUTE); + String alias = ele.getAttribute(ALIAS_ATTRIBUTE); + getBeanDefinitionReader().getBeanFactory().registerAlias(name, alias); + } + else if (BEAN_ELEMENT.equals(node.getNodeName())) { beanDefinitionCount++; + BeanDefinitionHolder bdHolder = parseBeanDefinitionElement(ele, false); BeanDefinitionReaderUtils.registerBeanDefinition(bdHolder, getBeanDefinitionReader() .getBeanFactory()); } else { - log.debug("Ignoring unknown element namespace: " + ele.getNamespaceURI() + " localName: " - + ele.getLocalName()); + BeanDefinitionHolder bdHolder = parseBeanFromExtensionElement(ele); + if (bdHolder != null) { + beanDefinitionCount++; + BeanDefinitionReaderUtils.registerBeanDefinition(bdHolder, getBeanDefinitionReader() + .getBeanFactory()); + } + else { + log.debug("Ignoring unknown element namespace: " + ele.getNamespaceURI() + " localName: " + + ele.getLocalName()); + } } } } + } else { + BeanDefinitionHolder bdHolder = parseBeanFromExtensionElement(root); + if (bdHolder != null) { + beanDefinitionCount++; + BeanDefinitionReaderUtils.registerBeanDefinition(bdHolder, getBeanDefinitionReader() + .getBeanFactory()); + } + else { + log.debug("Ignoring unknown element namespace: " + root.getNamespaceURI() + " localName: " + root.getLocalName()); + } } return beanDefinitionCount; } + protected BeanDefinitionHolder parseBeanDefinitionElement(Element ele, boolean isInnerBean) throws BeanDefinitionStoreException { + BeanDefinitionHolder bdh = super.parseBeanDefinitionElement(ele, isInnerBean); + coerceNamespaceAwarePropertyValues(bdh, ele); + return bdh; + } + protected Object parsePropertySubElement(Element element, String beanName) throws BeanDefinitionStoreException { String uri = element.getNamespaceURI(); String localName = getLocalName(element); diff --git a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza b/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant similarity index 93% rename from spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza rename to spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant index 303e519d..59f8a6e0 100644 --- a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza +++ b/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant @@ -8,7 +8,7 @@ pizza = org.xbean.spring.example.PizzaService restaurant = org.xbean.spring.example.RestaurantService # Mapping of XML Attributes to property names -pizza.myTopping = topping +pizza.alias.myTopping = topping # Mapping of nested bean properties restaurant.dinnerMenu.list = dinnerMenu diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java b/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java new file mode 100644 index 00000000..5512ba15 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java @@ -0,0 +1,36 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.PizzaService; +import org.xbean.spring.example.RestaurantService; + +import java.util.List; + +/** + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ +public class RestaurantUsingSpringExtendedTest extends RestaurantUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/restaurant-spring-extended.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringTest.java b/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringTest.java index a76fe46d..1f23b0e3 100644 --- a/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringTest.java +++ b/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringTest.java @@ -23,6 +23,8 @@ import java.util.List; +import javax.xml.namespace.QName; + /** * @author James Strachan * @version $Id$ @@ -33,6 +35,9 @@ public class RestaurantUsingSpringTest extends SpringTestSupport { public void testPizza() throws Exception { RestaurantService restaurant = (RestaurantService) getBean("restaurant"); + QName service = restaurant.getServiceName(); + assertEquals(new QName("http://acme.com", "xyz"), service); + // dinners (1-many using list) List dinners = restaurant.getDinnerMenu(); assertNotNull("dinners is null!", dinners); diff --git a/spring/src/test/org/xbean/spring/context/restaurant-normal.xml b/spring/src/test/org/xbean/spring/context/restaurant-normal.xml index d1a65490..93d10958 100644 --- a/spring/src/test/org/xbean/spring/context/restaurant-normal.xml +++ b/spring/src/test/org/xbean/spring/context/restaurant-normal.xml @@ -5,7 +5,13 @@ + class="org.xbean.spring.example.RestaurantService"> + + + + + + diff --git a/spring/src/test/org/xbean/spring/context/restaurant-spring-extended.xml b/spring/src/test/org/xbean/spring/context/restaurant-spring-extended.xml new file mode 100644 index 00000000..709de33e --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/restaurant-spring-extended.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring/src/test/org/xbean/spring/context/restaurant-xbean-root.xml b/spring/src/test/org/xbean/spring/context/restaurant-xbean-root.xml new file mode 100644 index 00000000..a37c5922 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/restaurant-xbean-root.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + From 0f765a7bedde7f59bcd721b233ad6b3b7425a5cb Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 19 Oct 2005 21:01:35 +0000 Subject: [PATCH 021/736] Fix class loader problem git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380440 13f79535-47bb-0310-9956-ffa450edef68 --- .../spring/context/impl/XBeanXmlBeanDefinitionParser.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 763166dd..008ecfc8 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -513,6 +513,14 @@ protected InputStream loadResource(String uri) { * the class loader which loaded us */ protected Class loadClass(String name) throws ClassNotFoundException { + ClassLoader beanClassLoader = getBeanDefinitionReader().getBeanClassLoader(); + if (beanClassLoader != null) { + try { + return beanClassLoader.loadClass(name); + } + catch (ClassNotFoundException e) { + } + } ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); if (contextClassLoader != null) { try { From c18b59440e62f0fe8899c55e726b67ec935838b6 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Wed, 19 Oct 2005 22:19:03 +0000 Subject: [PATCH 022/736] ignore git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380441 13f79535-47bb-0310-9956-ffa450edef68 From 438aa707be746e2381b40041b37ebd6b00c23429 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Fri, 21 Oct 2005 21:58:00 +0000 Subject: [PATCH 023/736] Fixed build errors Removed osgi until it actually works Converted some of the bootstrap xml file to the new cleaner format git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380442 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/classpath/SystemClassPathTest.java | 18 +-- jmx/maven.xml | 13 ++ jmx/project.xml | 13 +- .../java/org/xbean/kernel/KernelFactory.java | 3 + osgi/maven.xml | 30 ----- osgi/project.properties | 35 ------ osgi/project.xml | 113 ------------------ server/maven.xml | 33 +++-- server/project.xml | 19 +++ .../org/xbean/server/loader/LoadAllMain.java | 4 + .../org/xbean/server/main/KernelMain.java | 4 + .../repository/FileSystemRepository.java | 3 + .../ClassLoaderXmlPreprocessor.java | 4 + .../server/spring/loader/SpringLoader.java | 3 + .../resources/META-INF/xbean-bootstrap.xml | 40 +++---- .../impl/XBeanXmlBeanDefinitionParser.java | 10 +- 16 files changed, 108 insertions(+), 237 deletions(-) delete mode 100644 osgi/maven.xml delete mode 100644 osgi/project.properties delete mode 100644 osgi/project.xml diff --git a/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java b/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java index 2082c584..8a8ecafe 100644 --- a/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java +++ b/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java @@ -24,14 +24,14 @@ public void testAddJarToPath() throws Exception { } - URL groovyJar = new URL("http://www.ibiblio.org/maven/groovy/jars/groovy-SNAPSHOT.jar"); - systemClassPath.addJarToPath(groovyJar); - - try { - systemClassLoader.loadClass("groovy.lang.GroovyShell"); - } catch (ClassNotFoundException e) { - // this should fail pass - fail("Class already exists"); - } +// URL groovyJar = new URL("http://www.ibiblio.org/maven/groovy/jars/groovy-SNAPSHOT.jar"); +// systemClassPath.addJarToPath(groovyJar); +// +// try { +// systemClassLoader.loadClass("groovy.lang.GroovyShell"); +// } catch (ClassNotFoundException e) { +// // this should fail pass +// fail("Class already exists"); +// } } } \ No newline at end of file diff --git a/jmx/maven.xml b/jmx/maven.xml index 4c4bc418..2cfe9a05 100644 --- a/jmx/maven.xml +++ b/jmx/maven.xml @@ -32,4 +32,17 @@ + + + + + + + + + + + + diff --git a/jmx/project.xml b/jmx/project.xml index 569037f2..8d1536dd 100644 --- a/jmx/project.xml +++ b/jmx/project.xml @@ -80,13 +80,6 @@ 2.1_2 test - mx4j mx4j @@ -97,6 +90,12 @@ spring 1.2.4 + + stax + stax-api + 1.0 + test + xbean xbean-kernel diff --git a/kernel/src/java/org/xbean/kernel/KernelFactory.java b/kernel/src/java/org/xbean/kernel/KernelFactory.java index b8f04fa0..258d9c3d 100644 --- a/kernel/src/java/org/xbean/kernel/KernelFactory.java +++ b/kernel/src/java/org/xbean/kernel/KernelFactory.java @@ -33,6 +33,9 @@ * Kernel kernel = KernelFactory.newInstance().createKernel(name); * * + * @org.xbean.XBean namespace="http://xbean.org/schemas/kernel" element="load-all-main" + * description="Creates kernels" + * * @author Dain Sundstrom * @version $Id$ * @since 2.0 diff --git a/osgi/maven.xml b/osgi/maven.xml deleted file mode 100644 index 48775ddb..00000000 --- a/osgi/maven.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/osgi/project.properties b/osgi/project.properties deleted file mode 100644 index d8a8fc95..00000000 --- a/osgi/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/osgi/project.xml b/osgi/project.xml deleted file mode 100644 index 44ecb921..00000000 --- a/osgi/project.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - 3 - - XBean :: OSGi - xbean-osgi - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: OSGi Adaptor - - - XBean OSGi Adaptor is a bidirectional OSGi integration. - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - org.eclipse - org.eclipse.osgi - 3.1.0 - - - - - src/java - - - src/resources - - - - src/test - - - - src/test - - META-INF/**/* - **/*.x* - - - - - **/*Test.java - - - - - - - - - - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - - - - diff --git a/server/maven.xml b/server/maven.xml index 25a1ee95..4df0c809 100644 --- a/server/maven.xml +++ b/server/maven.xml @@ -19,6 +19,10 @@ xmlns:ant="jelly:ant" > + + + + @@ -32,17 +36,24 @@ - - - - - + + + + + + + + + + + + + + + + + - - - - - diff --git a/server/project.xml b/server/project.xml index c26d7a42..753c675e 100644 --- a/server/project.xml +++ b/server/project.xml @@ -90,6 +90,12 @@ spring 1.2.4 + + stax + stax-api + 1.0 + test + xbean xbean-kernel @@ -100,6 +106,19 @@ xbean-spring 2.0-SNAPSHOT + + + + annogen + annogen + 0.1.0 + + + ant + ant + 1.6.2 + + emma maven-emma-plugin diff --git a/server/src/java/org/xbean/server/loader/LoadAllMain.java b/server/src/java/org/xbean/server/loader/LoadAllMain.java index 5044af03..a84bfe50 100644 --- a/server/src/java/org/xbean/server/loader/LoadAllMain.java +++ b/server/src/java/org/xbean/server/loader/LoadAllMain.java @@ -26,6 +26,10 @@ /** * LoadAllMain loads all configurations specified in the arguments passed to main. + * + * @org.xbean.XBean namespace="http://xbean.org/schemas/server" element="load-all-main" + * description="Loads all configurations specified in the arguments passed to main" + * * @author Dain Sundstrom * @version $Id$ * @since 2.0 diff --git a/server/src/java/org/xbean/server/main/KernelMain.java b/server/src/java/org/xbean/server/main/KernelMain.java index 7dc5621b..da5ad080 100644 --- a/server/src/java/org/xbean/server/main/KernelMain.java +++ b/server/src/java/org/xbean/server/main/KernelMain.java @@ -29,6 +29,10 @@ /** * KernelMain is the standard entry point class used for a server. It will initalize a kernel with a set of services * and can optional hold the thread of execution until the kernel or virtual machine is destroyed. + * + * @org.xbean.XBean namespace="http://xbean.org/schemas/server" element="kernel-main" + * description="Standard entry point for a kernel based server." + * * @author Dain Sundstrom * @version $Id$ * @since 2.0 diff --git a/server/src/java/org/xbean/server/repository/FileSystemRepository.java b/server/src/java/org/xbean/server/repository/FileSystemRepository.java index 1db1efbf..c234743f 100644 --- a/server/src/java/org/xbean/server/repository/FileSystemRepository.java +++ b/server/src/java/org/xbean/server/repository/FileSystemRepository.java @@ -24,6 +24,9 @@ /** * FileSystemRepository maps resource ids to a directory on the local file system. * + * @org.xbean.XBean namespace="http://xbean.org/schemas/server" element="file-system-repository" + * description="Maps resource ids to a directory on the local file system." + * * @author Dain Sundstrom * @version $Id$ * @since 2.0 diff --git a/server/src/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java b/server/src/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java index cad4bed8..5a2db339 100644 --- a/server/src/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java +++ b/server/src/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java @@ -35,6 +35,10 @@ /** * ClassLoaderXmlPreprocessor extracts a ClassLoader definition from the xml document, builds a class loader, assigns * the class loader to the application context and xml reader, and removes the classpath element from document. + * + * @org.xbean.XBean namespace="http://xbean.org/schemas/server" element="class-loader-xml-preprocessor" + * description="Extracts a ClassLoader definition from the xml document." + * * @author Dain Sundstrom * @version $Id$ * @since 2.0 diff --git a/server/src/java/org/xbean/server/spring/loader/SpringLoader.java b/server/src/java/org/xbean/server/spring/loader/SpringLoader.java index c4c6153c..8a1225a4 100644 --- a/server/src/java/org/xbean/server/spring/loader/SpringLoader.java +++ b/server/src/java/org/xbean/server/spring/loader/SpringLoader.java @@ -35,6 +35,9 @@ * FileSystemXmlApplicationContext so custom XML extensions are available. This loader also support the specification * of SpringXmlPreprocessors and BeanFactoryPostProcessors to apply to the configuration. * + * @org.xbean.XBean namespace="http://xbean.org/schemas/server" element="spring-loader" + * description="Loads Spring xml configurations into a Kernel" + * * @author Dain Sundstrom * @version $Id$ * @since 2.0 diff --git a/server/src/resources/META-INF/xbean-bootstrap.xml b/server/src/resources/META-INF/xbean-bootstrap.xml index 5a713e14..2b14fb8a 100644 --- a/server/src/resources/META-INF/xbean-bootstrap.xml +++ b/server/src/resources/META-INF/xbean-bootstrap.xml @@ -15,43 +15,31 @@ * limitations under the License. --> - + - - - + + - - - - - - - + + + + + - - - - + - - - - - - - - - - - + + + + + diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 008ecfc8..c20cc160 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -37,14 +37,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import org.xbean.spring.context.impl.MappingMetaData; -import org.xbean.spring.context.impl.NamedConstructorArgs; -import org.xbean.spring.context.impl.NamespaceHelper; -import org.xbean.spring.context.impl.PropertyEditorHelper; -import org.xbean.spring.context.impl.QNameHelper; import javax.xml.namespace.QName; - import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -369,6 +363,10 @@ protected void coerceNamespaceAwarePropertyValues(BeanDefinitionHolder definitio } protected BeanInfo getBeanInfo(String className) throws BeanDefinitionStoreException { + if (className == null) { + return null; + } + BeanInfo info = null; Class type = null; try { From abf96ea4f9f4fed7c8f3a8a40affcd5b07d3b58c Mon Sep 17 00:00:00 2001 From: James Strachan Date: Sat, 22 Oct 2005 00:02:16 +0000 Subject: [PATCH 024/736] an attempt to remove the runtime dependency on QName to lower the coupling of xbean-spring on Java 1.4 platforms git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380443 13f79535-47bb-0310-9956-ffa450edef68 --- .../context/impl/PropertyEditorHelper.java | 35 ++++++++-- .../spring/context/impl/QNameHelper.java | 25 +++++++ .../context/impl/QNameReflectionHelper.java | 68 +++++++++++++++++++ .../context/impl/QNameReflectionParams.java | 60 ++++++++++++++++ .../impl/XBeanXmlBeanDefinitionParser.java | 33 ++++----- 5 files changed, 199 insertions(+), 22 deletions(-) create mode 100644 spring/src/java/org/xbean/spring/context/impl/QNameReflectionHelper.java create mode 100644 spring/src/java/org/xbean/spring/context/impl/QNameReflectionParams.java diff --git a/spring/src/java/org/xbean/spring/context/impl/PropertyEditorHelper.java b/spring/src/java/org/xbean/spring/context/impl/PropertyEditorHelper.java index 25598a11..fd1d4a19 100644 --- a/spring/src/java/org/xbean/spring/context/impl/PropertyEditorHelper.java +++ b/spring/src/java/org/xbean/spring/context/impl/PropertyEditorHelper.java @@ -17,10 +17,10 @@ **/ package org.xbean.spring.context.impl; -import javax.management.ObjectName; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.beans.PropertyEditorManager; -import java.net.URI; /** * A helper method to register some custom editors @@ -28,10 +28,37 @@ * @version $Revision: 1.1 $ */ public class PropertyEditorHelper { + private static final Log log = LogFactory.getLog(PropertyEditorHelper.class); public static void registerCustomEditors() { - PropertyEditorManager.registerEditor(URI.class, URIEditor.class); - PropertyEditorManager.registerEditor(ObjectName.class, ObjectNameEditor.class); + registerEditor("java.net.URI", "org.xbean.spring.context.impl.URIEditor"); + registerEditor("javax.management.ObjectName", "org.xbean.spring.context.impl.ObjectNameEditor"); + } + + protected static void registerEditor(String typeName, String editorName) { + Class type = loadClass(typeName); + Class editor = loadClass(editorName); + if (type != null && editor != null) { + PropertyEditorManager.registerEditor(type, editor); + } + } + + public static Class loadClass(String name) { + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + if (contextClassLoader != null) { + try { + return contextClassLoader.loadClass(name); + } + catch (ClassNotFoundException e) { + } + } + try { + return PropertyEditorHelper.class.getClassLoader().loadClass(name); + } + catch (ClassNotFoundException e) { + log.debug("Could not find class: " + name + " on the classpath"); + return null; + } } } diff --git a/spring/src/java/org/xbean/spring/context/impl/QNameHelper.java b/spring/src/java/org/xbean/spring/context/impl/QNameHelper.java index ce3d30d0..861587cc 100644 --- a/spring/src/java/org/xbean/spring/context/impl/QNameHelper.java +++ b/spring/src/java/org/xbean/spring/context/impl/QNameHelper.java @@ -19,11 +19,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.MutablePropertyValues; +import org.springframework.beans.PropertyValue; +import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.w3c.dom.Element; import org.w3c.dom.Node; import javax.xml.namespace.QName; +import java.beans.PropertyDescriptor; + /** * * @version $Revision: 1.1 $ @@ -69,4 +74,24 @@ public static String recursiveGetAttributeValue(Element element, String attribut } return answer; } + + public static void coerceQNamePropertyValues(QNameReflectionParams params) { + coerceNamespaceAwarePropertyValues(params.getBeanDefinition(), params.getElement(), params.getDescriptors(), params.getIndex()); + } + + public static void coerceNamespaceAwarePropertyValues(AbstractBeanDefinition bd, Element element, PropertyDescriptor[] descriptors, int i) { + PropertyDescriptor descriptor = descriptors[i]; + if (descriptor.getPropertyType().isAssignableFrom(QName.class)) { + String name = descriptor.getName(); + MutablePropertyValues propertyValues = bd.getPropertyValues(); + PropertyValue propertyValue = propertyValues.getPropertyValue(name); + if (propertyValue != null) { + Object value = propertyValue.getValue(); + if (value instanceof String) { + propertyValues.removePropertyValue(propertyValue); + propertyValues.addPropertyValue(name, createQName(element, (String) value)); + } + } + } + } } diff --git a/spring/src/java/org/xbean/spring/context/impl/QNameReflectionHelper.java b/spring/src/java/org/xbean/spring/context/impl/QNameReflectionHelper.java new file mode 100644 index 00000000..f909b2c7 --- /dev/null +++ b/spring/src/java/org/xbean/spring/context/impl/QNameReflectionHelper.java @@ -0,0 +1,68 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context.impl; + +import org.springframework.beans.factory.BeanDefinitionStoreException; +import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.w3c.dom.Element; + +import java.beans.PropertyDescriptor; +import java.lang.reflect.Method; + +/** + * To avoid a runtime dependency on the QName class lets use reflection to + * process QName instances. + * + * @version $Revision: 1.1 $ + */ +public class QNameReflectionHelper { + + protected static Method method; + + public static void coerceNamespaceAwarePropertyValues(AbstractBeanDefinition beanDefinition, Element element, + PropertyDescriptor[] descriptors, int index) { + QNameReflectionParams params = new QNameReflectionParams(beanDefinition, element, descriptors, index); + if (method == null) { + method = createMethod(); + } + if (method != null) { + try { + method.invoke(null, new Object[] { params }); + } + catch (Exception e) { + throw new BeanDefinitionStoreException("Failed to invoke method: " + method + " via reflection: " + e, + e); + } + } + } + + protected static Method createMethod() { + Class type = PropertyEditorHelper.loadClass("org.xbean.spring.context.impl.QNameHelper"); + if (type != null) { + Method[] methods = type.getMethods(); + for (int i = 0; i < methods.length; i++) { + Method method = methods[i]; + if (method.getName().equals("coerceQNamePropertyValues")) { + return method; + } + } + } + return null; + } + +} diff --git a/spring/src/java/org/xbean/spring/context/impl/QNameReflectionParams.java b/spring/src/java/org/xbean/spring/context/impl/QNameReflectionParams.java new file mode 100644 index 00000000..3c342976 --- /dev/null +++ b/spring/src/java/org/xbean/spring/context/impl/QNameReflectionParams.java @@ -0,0 +1,60 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context.impl; + +import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.w3c.dom.Element; + +import java.beans.PropertyDescriptor; + +/** + * + * @version $Revision: 1.1 $ + */ +public class QNameReflectionParams { + + private final AbstractBeanDefinition beanDefinition; + private final Element element; + private final PropertyDescriptor[] descriptors; + private final int index; + + public QNameReflectionParams(AbstractBeanDefinition beanDefinition, Element element, + PropertyDescriptor[] descriptors, int index) { + this.beanDefinition = beanDefinition; + this.element = element; + this.descriptors = descriptors; + this.index = index; + } + + public AbstractBeanDefinition getBeanDefinition() { + return beanDefinition; + } + + public PropertyDescriptor[] getDescriptors() { + return descriptors; + } + + public Element getElement() { + return element; + } + + public int getIndex() { + return index; + } + +} diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index c20cc160..7ebe8461 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -19,8 +19,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; @@ -38,7 +36,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import javax.xml.namespace.QName; import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -92,6 +89,10 @@ public class XBeanXmlBeanDefinitionParser extends DefaultXmlBeanDefinitionParser private Set reservedBeanAttributeNames = new HashSet(Arrays.asList(RESERVED_BEAN_ATTRIBUTE_NAMES)); protected final NamedConstructorArgs namedConstructorArgs = new NamedConstructorArgs(); + private boolean qnameIsOnClassPath; + + private boolean initQNameOnClassPath; + /** * Configures the XmlBeanDefinitionReader to work nicely with extensible XML * using this reader implementation. @@ -336,32 +337,28 @@ protected Object tryParseNestedPropertyViaIntrospection(MappingMetaData metadata */ protected void coerceNamespaceAwarePropertyValues(BeanDefinitionHolder definitionHolder, Element element) { BeanDefinition definition = definitionHolder.getBeanDefinition(); - if (definition instanceof AbstractBeanDefinition) { + 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++) { - PropertyDescriptor descriptor = descriptors[i]; - if (descriptor.getWriteMethod() != null - && descriptor.getPropertyType().isAssignableFrom(QName.class)) { - String name = descriptor.getName(); - MutablePropertyValues propertyValues = bd.getPropertyValues(); - PropertyValue propertyValue = propertyValues.getPropertyValue(name); - if (propertyValue != null) { - Object value = propertyValue.getValue(); - if (value instanceof String) { - propertyValues.removePropertyValue(propertyValue); - propertyValues.addPropertyValue(name, QNameHelper.createQName(element, (String) value)); - } - } - } + QNameReflectionHelper.coerceNamespaceAwarePropertyValues(bd, element, descriptors, i); } } } } + + protected boolean isQnameIsOnClassPath() { + if (initQNameOnClassPath == false) { + qnameIsOnClassPath = PropertyEditorHelper.loadClass("javax.xml.namespace.QName") != null; + initQNameOnClassPath = true; + } + return qnameIsOnClassPath; + } + protected BeanInfo getBeanInfo(String className) throws BeanDefinitionStoreException { if (className == null) { return null; From 5c7cd29b029f6d5c26dbf6c0aa7fdbf79ad5a6aa Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 24 Oct 2005 00:34:47 +0000 Subject: [PATCH 025/736] Update schema generator to produce a valid schema with reference on other XBeans. Add spring schema with extensions. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380444 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/spring/task/SchemaGenerator.java | 98 ++- spring/src/java/spring-beans.xsd | 693 ++++++++++++++++++ 2 files changed, 754 insertions(+), 37 deletions(-) create mode 100644 spring/src/java/spring-beans.xsd diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java index 4e486bb7..2ac1d925 100644 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java +++ b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java @@ -341,9 +341,10 @@ protected void generateSchema(PrintWriter out, String namespace, List elements) out.println(""); out.println(""); out.println(); - out.println(""); + out.println(""); for (Iterator iter = elements.iterator(); iter.hasNext();) { SchemaElement element = (SchemaElement) iter.next(); @@ -351,7 +352,7 @@ protected void generateSchema(PrintWriter out, String namespace, List elements) } out.println(); - out.println(""); } protected void generateSchemaElement(PrintWriter out, SchemaElement element) { @@ -361,8 +362,8 @@ protected void generateSchemaElement(PrintWriter out, SchemaElement element) { String localName = element.getLocalName(); - out.println(" "); - out.println(" "); + out.println(" "); + out.println(" "); JProperty[] properties = type.getProperties(); int complexCount = 0; @@ -371,15 +372,12 @@ protected void generateSchemaElement(PrintWriter out, SchemaElement element) { if (!isValidProperty(property)) { continue; } - if (isSimpleType(property)) { - generateSchemaElementSimpleProperty(out, element, property); - } - else { + if (!isSimpleType(property)) { complexCount++; } } if (complexCount > 0) { - out.println(" "); + out.println(" "); for (int i = 0; i < properties.length; i++) { JProperty property = properties[i]; if (!isValidProperty(property)) { @@ -389,22 +387,48 @@ protected void generateSchemaElement(PrintWriter out, SchemaElement element) { generateSchemaElementComplexProperty(out, element, property); } } + out.println(" "); + } + for (int i = 0; i < properties.length; i++) { + JProperty property = properties[i]; + if (!isValidProperty(property)) { + continue; + } + if (isSimpleType(property)) { + generateSchemaElementSimpleProperty(out, element, property); + } } - out.println(" "); - out.println(" "); + out.println(" "); + out.println(" "); out.println(); } protected void generateSchemaElementSimpleProperty(PrintWriter out, SchemaElement element, JProperty property) { - out.println(" "); } protected void generateSchemaElementComplexProperty(PrintWriter out, SchemaElement element, JProperty property) { - out.println(" "); - - // TODO expand the element declaration to list possible implementations - // and allow extension via xsd:any + out.println(" "); + // Check if this is an array of known elements + boolean found = false; + if (property.getType().isArrayType()) { + for (Iterator iter = allElements.iterator(); iter.hasNext();) { + SchemaElement elem = (SchemaElement) iter.next(); + if (elem.getNamespace().equals(element.getNamespace()) && + elem.getType().getQualifiedName().equals(property.getType().getArrayComponentType().getQualifiedName())) { + out.println(" "); + found = true; + break; + } + } + + } + // Else, use an xs:any to allow extension + if (!found) { + out.println(" "); + } + out.println(" "); } protected boolean isSimpleType(JProperty property) { @@ -442,7 +466,7 @@ protected boolean isValidProperty(JProperty property) { if (annotation != null) { JAnnotationValue value = annotation.getValue("hide"); if (value != null) { - return value.asBoolean(); + return !value.asBoolean(); } } return true; @@ -509,24 +533,24 @@ protected String getXSDType(JProperty property) { protected void loadXsdTypeMap(Map map) { // TODO check these XSD types are right... - map.put(String.class.getName(), "xsd:string"); - map.put(Boolean.class.getName(), "xsd:boolean"); - map.put(boolean.class.getName(), "xsd:boolean"); - map.put(Byte.class.getName(), "xsd:byte"); - map.put(byte.class.getName(), "xsd:byte"); - map.put(Short.class.getName(), "xsd:short"); - map.put(short.class.getName(), "xsd:short"); - map.put(Integer.class.getName(), "xsd:integer"); - map.put(int.class.getName(), "xsd:integer"); - map.put(Long.class.getName(), "xsd:long"); - map.put(long.class.getName(), "xsd:long"); - map.put(Float.class.getName(), "xsd:float"); - map.put(float.class.getName(), "xsd:float"); - map.put(Double.class.getName(), "xsd:double"); - map.put(double.class.getName(), "xsd:double"); - map.put(java.util.Date.class.getName(), "xsd:date"); - map.put(java.sql.Date.class.getName(), "xsd:date"); - map.put("javax.xml.namespace.QName", "xsd:QName"); + map.put(String.class.getName(), "xs:string"); + map.put(Boolean.class.getName(), "xs:boolean"); + map.put(boolean.class.getName(), "xs:boolean"); + map.put(Byte.class.getName(), "xs:byte"); + map.put(byte.class.getName(), "xs:byte"); + map.put(Short.class.getName(), "xs:short"); + map.put(short.class.getName(), "xs:short"); + map.put(Integer.class.getName(), "xs:integer"); + map.put(int.class.getName(), "xs:integer"); + map.put(Long.class.getName(), "xs:long"); + map.put(long.class.getName(), "xs:long"); + map.put(Float.class.getName(), "xs:float"); + map.put(float.class.getName(), "xs:float"); + map.put(Double.class.getName(), "xs:double"); + map.put(double.class.getName(), "xs:double"); + map.put(java.util.Date.class.getName(), "xs:date"); + map.put(java.sql.Date.class.getName(), "xs:date"); + map.put("javax.xml.namespace.QName", "xs:QName"); } /** diff --git a/spring/src/java/spring-beans.xsd b/spring/src/java/spring-beans.xsd new file mode 100644 index 00000000..348562bb --- /dev/null +++ b/spring/src/java/spring-beans.xsd @@ -0,0 +1,693 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 15b740528121d8c237971ae6690bd19d573256e6 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 27 Oct 2005 10:17:22 +0000 Subject: [PATCH 026/736] Move schema and add lax validation git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380445 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/{ => org/xbean/spring}/spring-beans.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename spring/src/java/{ => org/xbean/spring}/spring-beans.xsd (95%) diff --git a/spring/src/java/spring-beans.xsd b/spring/src/java/org/xbean/spring/spring-beans.xsd similarity index 95% rename from spring/src/java/spring-beans.xsd rename to spring/src/java/org/xbean/spring/spring-beans.xsd index 348562bb..f1648478 100644 --- a/spring/src/java/spring-beans.xsd +++ b/spring/src/java/org/xbean/spring/spring-beans.xsd @@ -41,7 +41,7 @@ The document root. A document can contain bean definitions only, imports only, or a mixture of both (typically with imports first). --> - + @@ -50,7 +50,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -412,7 +412,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -602,7 +602,7 @@ - + @@ -635,7 +635,7 @@ - + @@ -664,7 +664,7 @@ - + From e3e77e34324a35b4e0ceb96616c120691c6abf3a Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 27 Oct 2005 16:05:09 +0000 Subject: [PATCH 027/736] Fix problem when parsing a child bean defined with spring schema namespace. Add testcase for root bean parsing. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380446 13f79535-47bb-0310-9956-ffa450edef68 --- .../impl/XBeanXmlBeanDefinitionParser.java | 11 +++---- .../RestaurantUsingXBeanAsRootTest.java | 10 ++++++ .../RestaurantUsingXBeanMixedTest.java | 32 ++++++++++++++++++ .../spring/context/restaurant-xbean-mixed.xml | 33 +++++++++++++++++++ 4 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java create mode 100644 spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java create mode 100644 spring/src/test/org/xbean/spring/context/restaurant-xbean-mixed.xml diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index 7ebe8461..b479aa28 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -432,17 +432,16 @@ protected Object parseChildExtensionBean(Element element) { String uri = childElement.getNamespaceURI(); String localName = childElement.getLocalName(); - if (!isEmpty(uri) || !reservedElementNames.contains(localName)) { + if (uri == null || uri.equals(SPRING_SCHEMA)) { + if (BEAN_ELEMENT.equals(localName)) { + return parseBeanDefinitionElement(childElement, true); + } + } else { Object value = parseBeanFromExtensionElement(childElement); if (value != null) { return value; } } - else if (isEmpty(uri)) { - if (BEAN_ELEMENT.equals(localName)) { - return parseBeanDefinitionElement(childElement, true); - } - } } } return null; diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java b/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java new file mode 100644 index 00000000..163c352b --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java @@ -0,0 +1,10 @@ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; + +public class RestaurantUsingXBeanAsRootTest extends RestaurantUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/restaurant-xbean-root.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java b/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java new file mode 100644 index 00000000..cb7ffebc --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java @@ -0,0 +1,32 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; + +/** + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ +public class RestaurantUsingXBeanMixedTest extends RestaurantUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/restaurant-xbean-mixed.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/restaurant-xbean-mixed.xml b/spring/src/test/org/xbean/spring/context/restaurant-xbean-mixed.xml new file mode 100644 index 00000000..34dc322c --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/restaurant-xbean-mixed.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 34aa926271cfb76e0018d60eb440c06ce975562b Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 27 Oct 2005 16:08:08 +0000 Subject: [PATCH 028/736] Fix a xsd:string to xs:string, as xsd namespace is not bound in schema git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380447 13f79535-47bb-0310-9956-ffa450edef68 --- spring/src/java/org/xbean/spring/task/SchemaGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java index 2ac1d925..8a1c6097 100644 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java +++ b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java @@ -526,7 +526,7 @@ protected String getXSDType(JProperty property) { String typeName = property.getType().getQualifiedName(); String answer = (String) xsdTypeMap.get(typeName); if (answer == null) { - answer = "xsd:string"; + answer = "xs:string"; } return answer; } From e1e04f7b6c425147d21fe57f57f5d3133e4784e7 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 27 Oct 2005 20:21:30 +0000 Subject: [PATCH 029/736] New mapping metadata generator based on QDox. * Split source parsing and generation phases. * Added a datamodel to represent the source tags. No source artifacts are present in generation phase. * Currently support both QDoc and JAM but JAM support will be removed soon. * Added support for tagging init, destroy and factory methods git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380448 13f79535-47bb-0310-9956-ffa450edef68 --- spring/maven.xml | 2 +- spring/project.xml | 5 + .../spring/generator/AttributeMapping.java | 112 ++++++ .../generator/DocumentationGenerator.java | 167 ++++++++ .../spring/generator/ElementMapping.java | 135 +++++++ .../spring/generator/GeneratorPlugin.java | 28 ++ .../spring/generator/JamMappingLoader.java | 363 ++++++++++++++++++ .../generator/MappingGeneratorTask.java | 149 +++++++ .../xbean/spring/generator/MappingLoader.java | 29 ++ .../spring/generator/NamespaceMapping.java | 80 ++++ .../spring/generator/QdoxMappingLoader.java | 347 +++++++++++++++++ .../spring/generator/SchemaGenerator.java | 50 +++ .../org/xbean/spring/generator/Utils.java | 120 ++++++ .../generator/XmlMetadataGenerator.java | 140 +++++++ .../org/xbean/spring/generator/XmlWriter.java | 215 +++++++++++ .../xbean/spring/generator/XsdGenerator.java | 131 +++++++ .../org/xbean/spring/example/SoupService.java | 11 +- 17 files changed, 2082 insertions(+), 2 deletions(-) create mode 100644 spring/src/java/org/xbean/spring/generator/AttributeMapping.java create mode 100644 spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java create mode 100644 spring/src/java/org/xbean/spring/generator/ElementMapping.java create mode 100644 spring/src/java/org/xbean/spring/generator/GeneratorPlugin.java create mode 100644 spring/src/java/org/xbean/spring/generator/JamMappingLoader.java create mode 100644 spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java create mode 100644 spring/src/java/org/xbean/spring/generator/MappingLoader.java create mode 100644 spring/src/java/org/xbean/spring/generator/NamespaceMapping.java create mode 100644 spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java create mode 100644 spring/src/java/org/xbean/spring/generator/SchemaGenerator.java create mode 100644 spring/src/java/org/xbean/spring/generator/Utils.java create mode 100644 spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java create mode 100644 spring/src/java/org/xbean/spring/generator/XmlWriter.java create mode 100644 spring/src/java/org/xbean/spring/generator/XsdGenerator.java diff --git a/spring/maven.xml b/spring/maven.xml index f0b95cf1..abd278c8 100644 --- a/spring/maven.xml +++ b/spring/maven.xml @@ -35,7 +35,7 @@ - + ant 1.6.2 + + qdox + qdox + 1.5 + diff --git a/spring/src/java/org/xbean/spring/generator/AttributeMapping.java b/spring/src/java/org/xbean/spring/generator/AttributeMapping.java new file mode 100644 index 00000000..629ccfab --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/AttributeMapping.java @@ -0,0 +1,112 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class AttributeMapping implements Comparable { + private final String attributeName; + private final String propertyName; + private final String description; + private final String type; + private final boolean primitive; + private final boolean array; + private final String arrayType; + private final boolean list; + private final String value; + private final boolean fixed; + private final boolean required; + + public AttributeMapping(String attributeName, String propertyName, String description, String type, boolean primitive, boolean array, String arrayType, boolean list, String value, boolean fixed, boolean required) { + if (attributeName == null) throw new NullPointerException("attributeName"); + if (propertyName == null) throw new NullPointerException("propertyName"); + if (type == null) throw new NullPointerException("type"); + this.attributeName = attributeName; + this.propertyName = propertyName; + this.description = description; + this.type = type; + this.primitive = primitive; + this.array = array; + this.arrayType = arrayType; + this.list = list; + this.value = value; + this.fixed = fixed; + this.required = required; + } + + public String getAttributeName() { + return attributeName; + } + + public String getPropertyName() { + return propertyName; + } + + public String getDescription() { + return description; + } + + public String getType() { + return type; + } + + public boolean isPrimitive() { + return primitive; + } + + public boolean isArray() { + return array; + } + + public String getArrayType() { + return arrayType; + } + + public boolean isList() { + return list; + } + + public String getValue() { + return value; + } + + public boolean isFixed() { + return fixed; + } + + public boolean isRequired() { + return required; + } + + public int hashCode() { + return attributeName.hashCode(); + } + + public boolean equals(Object obj) { + if (obj instanceof AttributeMapping) { + return attributeName.equals(((AttributeMapping) obj).attributeName); + } + return false; + } + + public int compareTo(Object obj) { + return attributeName.compareTo(((AttributeMapping) obj).attributeName); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java b/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java new file mode 100644 index 00000000..bc48bd0c --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java @@ -0,0 +1,167 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class DocumentationGenerator implements GeneratorPlugin { + private final File destFile; + + public DocumentationGenerator(File destFile) { + this.destFile = destFile; + } + + public void generate(NamespaceMapping namespaceMapping) throws IOException { + String namespace = namespaceMapping.getNamespace(); + + // TODO can only handle 1 schema document so far... + File file = new File(destFile.getParentFile(), destFile.getName() + ".html"); + System.out.println("Generating HTML documentation file: " + file + " for namespace: " + namespace); + PrintWriter out = new PrintWriter(new FileWriter(file)); + try { + generateDocumentation(out, namespace, namespaceMapping.getElements(), namespaceMapping.getRootElement()); + } finally { + out.close(); + } + } + + private void generateDocumentation(PrintWriter out, String namespace, Set elements, ElementMapping rootElement) { + out.println(""); + out.println(""); + out.println(""); + out.println("Schema for namespace: " + namespace + ""); + out.println(""); + out.println(""); + out.println(""); + out.println(""); + out.println(); + out.println(""); + out.println(); + + if (rootElement != null) { + out.println("

Root Element

"); + out.println(""); + out.println(" "); + generateHtmlElementSummary(out, rootElement); + out.println("
ElementDescriptionClass
"); + out.println(); + } + + out.println("

Element Summary

"); + out.println(""); + out.println(" "); + for (Iterator iter = elements.iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + generateHtmlElementSummary(out, element); + } + out.println("
ElementDescriptionClass
"); + out.println(); + out.println(); + + out.println("

Element Detail

"); + for (Iterator iter = elements.iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + generateHtmlElementDetail(out, element); + } + + out.println(); + out.println(""); + out.println(""); + } + + private void generateHtmlElementSummary(PrintWriter out, ElementMapping element) { + out.println(" " + + "" + element.getElementName() + "" + + "" + element.getDescription() + "" + + "" + element.getClassName() + ""); + } + + private void generateHtmlElementDetail(PrintWriter out, ElementMapping element) { + String localName = element.getElementName(); + out.println("

Element: " + localName + "

"); + + out.println(""); + out.println(" "); + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + if (Utils.isSimpleType(attributeMapping)) { + out.println(" "); + } + + } + out.println("
AttributeTypeDescription
" + attributeMapping.getAttributeName() + "" + Utils.getXsdType(attributeMapping) + + "" + attributeMapping.getDescription() + "
"); + + out.println(""); + out.println(" "); + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + if (!Utils.isSimpleType(attributeMapping)) { + out.print(" "); + } + } + out.println("
ElementTypeDescription
" + attributeMapping.getAttributeName() + ""); + printComplexPropertyTypeDocumentation(out, attributeMapping); + out.println("" + attributeMapping.getDescription() + "
"); + } + + private void printComplexPropertyTypeDocumentation(PrintWriter out, AttributeMapping attributeMapping) { + if (attributeMapping.isList()) { + out.print(""); + } else { + int counter = 0; + // lets find all the implementations of the type + List types = Collections.EMPTY_LIST; +// List types = findImplementationsOf(type); + for (Iterator iter = types.iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + if (counter++ > 0) { + out.print(" | "); + } + out.print("<" + element.getElementName() + "/>"); + } + if (counter > 0) { + out.print(" | "); + } + out.print(""); + } + } + +// todo this method does nothing +// private List findImplementationsOf(JClass type) { +// List answer = new ArrayList(); +// for (Iterator iter = answer.iterator(); iter.hasNext();) { +// ElementMapping element = (ElementMapping) iter.next(); +// if (Utils.isImplementationOf(type, element.getType())) { +// answer.add(element); +// } +// } +// return answer; +// } +} diff --git a/spring/src/java/org/xbean/spring/generator/ElementMapping.java b/spring/src/java/org/xbean/spring/generator/ElementMapping.java new file mode 100644 index 00000000..82d5295c --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/ElementMapping.java @@ -0,0 +1,135 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class ElementMapping implements Comparable { + private final String namespace; + private final String elementName; + private final String className; + private final String description; + private final boolean rootElement; + private final String initMethod; + private final String destroyMethod; + private final String factoryMethod; + private final String contentProperty; + private final Set attributes; + private final Map attributesByName; + private final List constructors; + + public ElementMapping(String namespace, String elementName, String className, String description, boolean rootElement, String initMethod, String destroyMethod, String factoryMethod, String contentProperty, Set attributes, List constructors) { + if (namespace == null) throw new NullPointerException("namespace"); + if (elementName == null) throw new NullPointerException("elementName"); + if (className == null) throw new NullPointerException("className"); + if (attributes == null) throw new NullPointerException("attributes"); + if (constructors == null) throw new NullPointerException("constructors"); + + this.namespace = namespace; + this.elementName = elementName; + this.className = className; + this.description = description; + this.rootElement = rootElement; + this.initMethod = initMethod; + this.destroyMethod = destroyMethod; + this.factoryMethod = factoryMethod; + this.contentProperty = contentProperty; + this.constructors = constructors; + this.attributes = Collections.unmodifiableSet(new TreeSet(attributes)); + + Map attributesByName = new HashMap(); + for (Iterator iterator = attributes.iterator(); iterator.hasNext();) { + AttributeMapping attribute = (AttributeMapping) iterator.next(); + attributesByName.put(attribute.getAttributeName(), attribute); + } + this.attributesByName = Collections.unmodifiableMap(attributesByName); + } + + public String getNamespace() { + return namespace; + } + + public String getElementName() { + return elementName; + } + + public String getClassName() { + return className; + } + + public String getDescription() { + return description; + } + + public boolean isRootElement() { + return rootElement; + } + + public String getInitMethod() { + return initMethod; + } + + public String getDestroyMethod() { + return destroyMethod; + } + + public String getFactoryMethod() { + return factoryMethod; + } + + public String getContentProperty() { + return contentProperty; + } + + public Set getAttributes() { + return attributes; + } + + public AttributeMapping getAttribute(String attributeName) { + return (AttributeMapping) attributesByName.get(attributeName); + } + + public List getConstructors() { + return constructors; + } + + public int hashCode() { + return elementName.hashCode(); + } + + public boolean equals(Object obj) { + if (obj instanceof ElementMapping) { + return elementName.equals(((ElementMapping) obj).elementName); + } + return false; + } + + public int compareTo(Object obj) { + return elementName.compareTo(((ElementMapping) obj).elementName); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/GeneratorPlugin.java b/spring/src/java/org/xbean/spring/generator/GeneratorPlugin.java new file mode 100644 index 00000000..861e86c4 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/GeneratorPlugin.java @@ -0,0 +1,28 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.io.IOException; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public interface GeneratorPlugin { + void generate(NamespaceMapping namespaceMapping) throws IOException; +} diff --git a/spring/src/java/org/xbean/spring/generator/JamMappingLoader.java b/spring/src/java/org/xbean/spring/generator/JamMappingLoader.java new file mode 100644 index 00000000..0a477a45 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/JamMappingLoader.java @@ -0,0 +1,363 @@ +package org.xbean.spring.generator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codehaus.jam.JAnnotatedElement; +import org.codehaus.jam.JAnnotation; +import org.codehaus.jam.JAnnotationValue; +import org.codehaus.jam.JClass; +import org.codehaus.jam.JComment; +import org.codehaus.jam.JConstructor; +import org.codehaus.jam.JMethod; +import org.codehaus.jam.JParameter; +import org.codehaus.jam.JProperty; +import org.codehaus.jam.JamService; +import org.codehaus.jam.JamServiceFactory; +import org.codehaus.jam.JamServiceParams; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +/** + * An Ant task for executing Gram scripts, which are Groovy scripts executed on + * the JAM context. + * + * @version $Revision$ + */ +public class JamMappingLoader implements MappingLoader { + private static final Log log = LogFactory.getLog(JamMappingLoader.class); + private String defaultNamespace; + private File[] toolClasspath; + private File[] classpath; + private File[] srcDirs; + private String includes = "**/*.java"; + + public JamMappingLoader() { + } + + public JamMappingLoader(String defaultNamespace, File[] toolClasspath, File[] classpath, File[] srcDirs, String includes) { + this.defaultNamespace = defaultNamespace; + this.toolClasspath = toolClasspath; + this.classpath = classpath; + this.srcDirs = srcDirs; + this.includes = includes; + } + + public String getDefaultNamespace() { + return defaultNamespace; + } + + public void setDefaultNamespace(String defaultNamespace) { + this.defaultNamespace = defaultNamespace; + } + + public File[] getToolClasspath() { + return toolClasspath; + } + + public void setToolClasspath(File[] toolClasspath) { + this.toolClasspath = toolClasspath; + } + + public File[] getClasspath() { + return classpath; + } + + public void setClasspath(File[] classpath) { + this.classpath = classpath; + } + + public File[] getSrcDirs() { + return srcDirs; + } + + public void setSrcDirs(File[] srcDirs) { + this.srcDirs = srcDirs; + } + + public String getIncludes() { + return includes; + } + + public void setIncludes(String includes) { + this.includes = includes; + } + + public Set loadNamespaces() throws IOException { + if (defaultNamespace == null) { + throw new IllegalArgumentException("defaultNamespace must be specified"); + } + if (srcDirs == null || srcDirs.length == 0) { + throw new IllegalArgumentException("srcDirs must be specified"); + } + + JamServiceFactory jamServiceFactory = JamServiceFactory.getInstance(); + JamServiceParams serviceParams = jamServiceFactory.createServiceParams(); + if (toolClasspath != null) { + for (int i = 0; i < toolClasspath.length; i++) { + File file = toolClasspath[i]; + serviceParams.addToolClasspath(file); + } + } + if (classpath != null) { + for (int i = 0; i < classpath.length; i++) { + File file = classpath[i]; + serviceParams.addClasspath(file); + } + } + + serviceParams.includeSourcePattern(srcDirs, includes); + JamService jam = jamServiceFactory.createService(serviceParams); + JClass[] classes = jam.getAllClasses(); + Set namespaces = loadNamespaces(classes, defaultNamespace); + return namespaces; + } + + private Set loadNamespaces(JClass[] classes, String defaultNamespace) { + Map namespaceElements = new HashMap(); + Map namespaceRoots = new HashMap(); + for (int i = 0; i < classes.length; i++) { + JClass type = classes[i]; + JAnnotation annotation = type.getAnnotation(Utils.XBEAN_ANNOTATION); + if (annotation != null) { + String localName = getStringValue(annotation, "element", getElementName(type)); + String namespace = getStringValue(annotation, "namespace", defaultNamespace); + + ElementMapping element = loadElement(type, localName, namespace); + Set elements = (Set) namespaceElements.get(namespace); + if (elements == null) { + elements = new HashSet(); + namespaceElements.put(namespace, elements); + } + elements.add(element); + if (element.isRootElement()) { + if (namespaceRoots.containsKey(namespace)) { + log.warn("Multiple root elements found for namespace " + namespace); + } + namespaceRoots.put(namespace, element); + } + } else { + log.debug("No XML annotation found for type: " + type.getQualifiedName()); + } + } + + Set namespaces = new TreeSet(); + for (Iterator iterator = namespaceElements.entrySet().iterator(); iterator.hasNext();) { + Map.Entry entry = (Map.Entry) iterator.next(); + String namespace = (String) entry.getKey(); + Set elements = (Set) entry.getValue(); + ElementMapping rootElement = (ElementMapping) namespaceRoots.get(namespace); + NamespaceMapping namespaceMapping = new NamespaceMapping(namespace, elements, rootElement); + namespaces.add(namespaceMapping); + } + return Collections.unmodifiableSet(namespaces); + } + + public ElementMapping loadElement(JClass type, String elementName, String namespace) { + String className = type.getQualifiedName(); + String description = getDescription(type); + + JAnnotation annotation = type.getAnnotation(Utils.XBEAN_ANNOTATION); + String contentProperty = getStringValue(annotation, "contentProperty"); + boolean root = getBooleanValue(annotation, "rootElement"); + + Set attributes = new HashSet(); + Map attributesByPropertyName = new HashMap(); + JProperty[] properties = type.getProperties(); + for (int i = 0; i < properties.length; i++) { + JProperty property = properties[i]; + if (isVisibleProperty(property)) { + String attributeName = getAttributeName(property); + String propertyName = Utils.decapitalise(property.getSimpleName()); + String attributeType = property.getType().getQualifiedName(); + boolean list = false; + String value = null; + boolean fixed = false; + boolean required = false; + boolean primitive = property.getType().isPrimitiveType(); + boolean array = property.getType().isArrayType(); + String arrayType = null; + if (array) { + arrayType = property.getType().getArrayComponentType().getQualifiedName(); + } + String attributeDescription = getDescription(property); + AttributeMapping attributeMapping = new AttributeMapping(attributeName, + propertyName, + attributeDescription, + attributeType, + primitive, + array, + arrayType, + list, + value, + fixed, + required); + attributes.add(attributeMapping); + attributesByPropertyName.put(propertyName, attributeMapping); + } + } + + JConstructor[] constructors = type.getConstructors(); + List constructorArgs = new ArrayList(constructors.length); + for (int i = 0; i < constructors.length; i++) { + JConstructor constructor = constructors[i]; + JParameter[] parameters = constructor.getParameters(); + if (parameters.length > 0) { + List args = new ArrayList(parameters.length); + for (int j = 0; j < parameters.length; j++) { + JParameter parameter = parameters[j]; + String parameterName = Utils.decapitalise(parameter.getSimpleName()); + String parameterType = parameter.getType().getQualifiedName(); + AttributeMapping attributeMapping = (AttributeMapping) attributesByPropertyName.get(parameterName); + if (attributeMapping != null && parameterType.equals(attributeMapping.getType())) { + // todo this is a bad bean... what should we do? + } + if (attributeMapping == null) { + String attributeName = parameterName; + String propertyName = parameterName; + String attributeType = parameter.getType().getQualifiedName(); + boolean list = false; + String value = null; + boolean fixed = false; + boolean required = false; + boolean primitive = parameter.getType().isPrimitiveType(); + boolean array = parameter.getType().isArrayType(); + String arrayType = null; + if (array) { + arrayType = parameter.getType().getArrayComponentType().getQualifiedName(); + } + String attributeDescription = null; + attributeMapping = new AttributeMapping(attributeName, + propertyName, + attributeDescription, + attributeType, + primitive, + array, + arrayType, + list, + value, + fixed, + required); + attributes.add(attributeMapping); + attributesByPropertyName.put(propertyName, attributeMapping); + } + args.add(attributeMapping); + } + constructorArgs.add(Collections.unmodifiableList(args)); + } + } + List constructorList = Collections.unmodifiableList(constructorArgs); + + String initMethod = null; + String destroyMethod = null; + String factoryMethod = null; + + return new ElementMapping(namespace, + elementName, + className, + description, + root, + initMethod, + destroyMethod, + factoryMethod, + contentProperty, + attributes, + constructorList); + } + + private static String getStringValue(JAnnotation annotation, String name) { + return getStringValue(annotation, name, null); + } + + private static String getStringValue(JAnnotation annotation, String name, String defaultValue) { + if (annotation != null) { + JAnnotationValue value = annotation.getValue(name); + if (value != null) { + return value.asString(); + } + } + return defaultValue; + } + + private static boolean getBooleanValue(JAnnotation annotation, String name) { + if (annotation != null) { + JAnnotationValue value = annotation.getValue(name); + if (value != null) { + return value.asBoolean(); + } + } + return false; + } + + private static String getElementName(JClass element) { + String answer = element.getSimpleName(); + if (answer.length() > 0) { + answer = Utils.decapitalise(answer); + } + + // lets strip off the trailing Bean for *FactoryBean types by default + if (element instanceof JClass && answer.endsWith("FactoryBean")) { + answer = answer.substring(0, answer.length() - 4); + } + return answer; + } + + private static String getDescription(JClass type) { + return getCommentText(type); + } + + private static String getDescription(JProperty property) { + JMethod setter = property.getSetter(); + if (setter != null) { + return getCommentText(setter); + } + return ""; + } + + private static String getCommentText(JAnnotatedElement element) { + JAnnotation annotation = element.getAnnotation(Utils.XBEAN_ANNOTATION); + if (annotation != null) { + JAnnotationValue value = annotation.getValue("description"); + if (value != null) { + return value.asString(); + } + } + JComment comment = element.getComment(); + if (comment != null) { + return comment.getText(); + } + return ""; + } + + private static boolean isVisibleProperty(JProperty property) { + if (!property.getSimpleName().equals("Class")) { + JMethod setter = property.getSetter(); + if (setter == null) { + return false; + } + JAnnotation annotation = setter.getAnnotation(Utils.XBEAN_ANNOTATION); + if (annotation != null) { + JAnnotationValue value = annotation.getValue("hide"); + if (value != null) { + return !value.asBoolean(); + } + } + return true; + } + return false; + } + + private static String getAttributeName(JProperty property) { + String attributeName = getStringValue(property.getAnnotation(Utils.PROPERTY_ANNOTATION), "alias", property.getSimpleName()); + return Utils.decapitalise(attributeName); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java b/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java new file mode 100644 index 00000000..fddd3277 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java @@ -0,0 +1,149 @@ +package org.xbean.spring.generator; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; + +import java.io.File; +import java.util.Iterator; +import java.util.Set; + +/** + * An Ant task for executing Gram scripts, which are Groovy scripts executed on + * the JAM context. + * + * @version $Revision$ + */ +public class MappingGeneratorTask extends MatchingTask { + private String namespace; + private Path srcDir = null; + private Path toolpath = null; + private Path classpath = null; + private String includes = "**/*.java"; + private File destFile = new File("target/classes/activemq.xsd"); + private String metaInfDir = "target/classes/"; + + public File getDestFile() { + return destFile; + } + + public void setDestFile(File scenariosFile) { + this.destFile = scenariosFile; + } + + public String getMetaInfDir() { + return metaInfDir; + } + + public void setMetaInfDir(String metaInfDir) { + this.metaInfDir = metaInfDir; + } + + public String getNamespace() { + return namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + public void setSrcDir(Path srcDir) { + this.srcDir = srcDir; + } + + public void setToolpath(Path path) { + if (toolpath == null) { + toolpath = path; + } else { + toolpath.append(path); + } + } + + public void setToolpathRef(Reference r) { + createToolpath().setRefid(r); + } + + public Path createToolpath() { + if (toolpath == null) { + toolpath = new Path(getProject()); + } + return toolpath.createPath(); + } + + public void setClasspath(Path path) { + if (classpath == null) { + classpath = path; + } else { + classpath.append(path); + } + } + + public void setClasspathRef(Reference r) { + createClasspath().setRefid(r); + } + + public Path createClasspath() { + if (classpath == null) { + classpath = new Path(getProject()); + } + return classpath.createPath(); + } + + public void execute() throws BuildException { + if (namespace == null) { + throw new BuildException("'namespace' must be specified"); + } + if (srcDir == null) { + throw new BuildException("'srcDir' must be specified"); + } + if (destFile == null) { + throw new BuildException("'destFile' must be specified"); + } + + try { + MappingLoader mappingLoader = new JamMappingLoader(namespace, + getFiles(toolpath), + getFiles(classpath), + getFiles(srcDir), + includes); + + GeneratorPlugin[] plugins = new GeneratorPlugin[]{ + new XmlMetadataGenerator(metaInfDir), + new DocumentationGenerator(destFile), + new XsdGenerator(destFile) + }; + + // load the mappings + Set namespaces = mappingLoader.loadNamespaces(); + if (namespaces.isEmpty()) { + System.out.println("Warning: no namespaces found!"); + } + + // generate the files + for (Iterator iterator = namespaces.iterator(); iterator.hasNext();) { + NamespaceMapping namespaceMapping = (NamespaceMapping) iterator.next(); + for (int i = 0; i < plugins.length; i++) { + GeneratorPlugin plugin = plugins[i]; + plugin.generate(namespaceMapping); + } + } + + log("...done."); + } catch (Exception e) { + throw new BuildException(e); + } + } + + private File[] getFiles(Path path) { + if (path == null) { + return null; + } + String[] paths = path.list(); + File[] files = new File[paths.length]; + for (int i = 0; i < files.length; i++) { + files[i] = new File(paths[i]).getAbsoluteFile(); + } + return files; + } +} diff --git a/spring/src/java/org/xbean/spring/generator/MappingLoader.java b/spring/src/java/org/xbean/spring/generator/MappingLoader.java new file mode 100644 index 00000000..502a3da3 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/MappingLoader.java @@ -0,0 +1,29 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.io.IOException; +import java.util.Set; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public interface MappingLoader { + Set loadNamespaces() throws IOException; +} diff --git a/spring/src/java/org/xbean/spring/generator/NamespaceMapping.java b/spring/src/java/org/xbean/spring/generator/NamespaceMapping.java new file mode 100644 index 00000000..27c5e81e --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/NamespaceMapping.java @@ -0,0 +1,80 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class NamespaceMapping implements Comparable { + private final String namespace; + private final Set elements; + private final Map elementsByName; + private final ElementMapping rootElement; + + public NamespaceMapping(String namespace, Set elements, ElementMapping rootElement) { + this.namespace = namespace; + this.elements = Collections.unmodifiableSet(new TreeSet(elements)); + this.rootElement = rootElement; + + Map elementsByName = new HashMap(); + for (Iterator iterator = elements.iterator(); iterator.hasNext();) { + ElementMapping elementMapping = (ElementMapping) iterator.next(); + elementsByName.put(elementMapping.getElementName(), elementMapping); + } + this.elementsByName = Collections.unmodifiableMap(elementsByName); + } + + public String getNamespace() { + return namespace; + } + + public Set getElements() { + return elements; + } + + public ElementMapping getElement(String elementName) { + return (ElementMapping) elementsByName.get(elementName); + } + + public ElementMapping getRootElement() { + return rootElement; + } + + public int hashCode() { + return namespace.hashCode(); + } + + public boolean equals(Object obj) { + if (obj instanceof NamespaceMapping) { + return namespace.equals(((NamespaceMapping) obj).namespace); + } + return false; + } + + public int compareTo(Object obj) { + return namespace.compareTo(((NamespaceMapping) obj).namespace); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java b/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java new file mode 100644 index 00000000..43a7877a --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java @@ -0,0 +1,347 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import com.thoughtworks.qdox.JavaDocBuilder; +import com.thoughtworks.qdox.model.BeanProperty; +import com.thoughtworks.qdox.model.DocletTag; +import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.JavaMethod; +import com.thoughtworks.qdox.model.JavaParameter; +import com.thoughtworks.qdox.model.JavaSource; +import com.thoughtworks.qdox.model.Type; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class QdoxMappingLoader implements MappingLoader { + public static final String XBEAN_ANNOTATION = "org.xbean.XBean"; + public static final String PROPERTY_ANNOTATION = "org.xbean.Property"; + public static final String INIT_METHOD_ANNOTATION = "org.xbean.InitMethod"; + public static final String DESTROY_METHOD_ANNOTATION = "org.xbean.DestroyMethod"; + public static final String FACTORY_METHOD_ANNOTATION = "org.xbean.FactoryMethod"; + + private static final Log log = LogFactory.getLog(QdoxMappingLoader.class); + private String defaultNamespace; + private File[] srcDirs; + + public QdoxMappingLoader() { + } + + public QdoxMappingLoader(String defaultNamespace, File[] srcDirs) { + this.defaultNamespace = defaultNamespace; + this.srcDirs = srcDirs; + } + + public String getDefaultNamespace() { + return defaultNamespace; + } + + public void setDefaultNamespace(String defaultNamespace) { + this.defaultNamespace = defaultNamespace; + } + + public File[] getSrcDirs() { + return srcDirs; + } + + public void setSrcDirs(File[] srcDirs) { + this.srcDirs = srcDirs; + } + + public Set loadNamespaces() throws IOException { + JavaDocBuilder builder = new JavaDocBuilder(); + + log.debug("Source directories: "); + + for (int it = 0; it < srcDirs.length; it++) { + File sourceDirectory = srcDirs[it]; + + if (!sourceDirectory.isDirectory()) { + log.warn("Specified source directory isn't a directory: '" + sourceDirectory.getAbsolutePath() + "'."); + } + log.debug(" - " + sourceDirectory.getAbsolutePath()); + + builder.addSourceTree(sourceDirectory); + } + + Set namespaces = loadNamespaces(builder); + return namespaces; + } + + private Set loadNamespaces(JavaDocBuilder builder) { + // load all of the elements + List elements = loadElements(builder); + + + // index the elements by namespace and find the root element of each namespace + Map elementsByNamespace = new HashMap(); + Map namespaceRoots = new HashMap(); + for (Iterator iterator = elements.iterator(); iterator.hasNext();) { + ElementMapping element = (ElementMapping) iterator.next(); + String namespace = element.getNamespace(); + Set namespaceElements = (Set) elementsByNamespace.get(namespace); + if (namespaceElements == null) { + namespaceElements = new HashSet(); + elementsByNamespace.put(namespace, namespaceElements); + } + namespaceElements.add(element); + if (element.isRootElement()) { + if (namespaceRoots.containsKey(namespace)) { + log.warn("Multiple root elements found for namespace " + namespace); + } + namespaceRoots.put(namespace, element); + } + } + + // build the NamespaceMapping objects + Set namespaces = new TreeSet(); + for (Iterator iterator = elementsByNamespace.entrySet().iterator(); iterator.hasNext();) { + Map.Entry entry = (Map.Entry) iterator.next(); + String namespace = (String) entry.getKey(); + Set namespaceElements = (Set) entry.getValue(); + ElementMapping rootElement = (ElementMapping) namespaceRoots.get(namespace); + NamespaceMapping namespaceMapping = new NamespaceMapping(namespace, namespaceElements, rootElement); + namespaces.add(namespaceMapping); + } + return Collections.unmodifiableSet(namespaces); + } + + private List loadElements(JavaDocBuilder builder) { + JavaSource[] javaSources = builder.getSources(); + List elements = new ArrayList(); + for (int i = 0; i < javaSources.length; i++) { + JavaClass javaClass = javaSources[i].getClasses()[0]; + + ElementMapping element = loadElement(builder, javaClass); + if (element != null && !javaClass.isAbstract()) { + elements.add(element); + } else { + log.debug("No XML annotation found for type: " + javaClass.getFullyQualifiedName()); + } + } + return elements; + } + + private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) { + DocletTag tag = javaClass.getTagByName(XBEAN_ANNOTATION); + if (tag == null) { + return null; + } + + String element = getElementName(javaClass, tag); + String description = getProperty(tag, "description"); + String namespace = getProperty(tag, "namespace", defaultNamespace); + boolean root = getBooleanProperty(tag, "rootElement"); + String contentProperty = getProperty(tag, "contentProperty"); + + Set attributes = new HashSet(); + Map attributesByPropertyName = new HashMap(); + BeanProperty[] beanProperties = javaClass.getBeanProperties(); + for (int i = 0; i < beanProperties.length; i++) { + BeanProperty beanProperty = beanProperties[i]; + + AttributeMapping attributeMapping = loadAttribute(builder, beanProperty); + if (attributeMapping != null) { + attributes.add(attributeMapping); + attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); + } + } + + String initMethod = null; + String destroyMethod = null; + String factoryMethod = null; + JavaMethod[] methods = javaClass.getMethods(); + for (int i = 0; i < methods.length; i++) { + JavaMethod method = methods[i]; + if (method.isPublic() && !method.isConstructor()) { + if (method.getTagByName(INIT_METHOD_ANNOTATION) != null) { + initMethod = method.getName(); + } + if (method.getTagByName(DESTROY_METHOD_ANNOTATION) != null) { + destroyMethod = method.getName(); + } + if (method.getTagByName(FACTORY_METHOD_ANNOTATION) != null) { + factoryMethod = method.getName(); + } + } + } + + Type listType = builder.getClassByName("java.util.List").asType(); + List constructorArgs = new ArrayList(); + for (int i = 0; i < methods.length; i++) { + JavaMethod method = methods[i]; + JavaParameter[] parameters = method.getParameters(); + if (isValidConstructor(factoryMethod, method, parameters)) { + List args = new ArrayList(parameters.length); + for (int j = 0; j < parameters.length; j++) { + JavaParameter parameter = parameters[j]; + String parameterName = parameter.getName(); + String parameterType = parameter.getType().toString(); + AttributeMapping attributeMapping = (AttributeMapping) attributesByPropertyName.get(parameterName); + if (attributeMapping != null && parameterType.equals(attributeMapping.getType())) { + // todo this is a bad bean... what should we do? + } + if (attributeMapping == null) { + boolean list = parameter.getType().isA(listType); + attributeMapping = new AttributeMapping(parameterName, + parameterName, + null, + parameterType, + primitives.contains(parameterType), + parameter.getType().isArray(), + parameter.getType().getValue(), + list, + null, + false, + false); + attributes.add(attributeMapping); + attributesByPropertyName.put(parameterName, attributeMapping); + } + args.add(attributeMapping); + } + constructorArgs.add(Collections.unmodifiableList(args)); + } + } + + return new ElementMapping(namespace, + element, + javaClass.getFullyQualifiedName(), + description, + root, + initMethod, + destroyMethod, + factoryMethod, + contentProperty, + attributes, + constructorArgs); + } + + private boolean isValidConstructor(String factoryMethod, JavaMethod method, JavaParameter[] parameters) { + if (!method.isPublic() || parameters.length == 0) { + return false; + } + + if (factoryMethod == null) { + return method.isConstructor(); + } else { + return method.getName().equals(factoryMethod); + } + } + + private String getElementName(JavaClass javaClass, DocletTag tag) { + String elementName = getProperty(tag, "element"); + if (elementName == null) { + String className = javaClass.getFullyQualifiedName(); + int index = className.lastIndexOf("."); + if (index > 0) { + className = className.substring(index + 1); + } + // strip off "Bean" from a spring factory bean + if (className.endsWith("FactoryBean")) { + className = className.substring(0, className.length() - 4); + } + elementName = Utils.decapitalise(className); + } + return elementName; + } + + private AttributeMapping loadAttribute(JavaDocBuilder builder, BeanProperty beanProperty) { + Type listType = builder.getClassByName("java.util.List").asType(); + AttributeMapping attributeMapping = null; + JavaMethod accessor = beanProperty.getAccessor(); + DocletTag propertyTag = accessor.getTagByName(PROPERTY_ANNOTATION); + boolean hidden = getBooleanProperty(propertyTag, "hidden"); + if (!hidden) { + String attribute = getProperty(propertyTag, "alias", beanProperty.getName()); + String attributeDescription = getProperty(propertyTag, "description"); + String defaultValue = getProperty(propertyTag, "default"); + boolean fixed = getBooleanProperty(propertyTag, "fixed"); + boolean required = getBooleanProperty(propertyTag, "required"); + boolean list = beanProperty.getType().isA(listType); + attributeMapping = new AttributeMapping(attribute, + beanProperty.getName(), + attributeDescription, + beanProperty.getType().toString(), + primitives.contains(beanProperty.getType().toString()), + beanProperty.getType().isArray(), + beanProperty.getType().getValue(), + list, + defaultValue, + fixed, + required); + } + return attributeMapping; + } + + private static String getProperty(DocletTag propertyTag, String propertyName) { + return getProperty(propertyTag, propertyName, null); + } + + private static String getProperty(DocletTag propertyTag, String propertyName, String defaultValue) { + String value = null; + if (propertyTag != null) { + value = propertyTag.getNamedParameter(propertyName); + } + if (value == null) { + return defaultValue; + } + return value; + } + + private boolean getBooleanProperty(DocletTag propertyTag, String propertyName) { + return toBoolean(getProperty(propertyTag, propertyName)); + } + + private static boolean toBoolean(String value) { + if (value != null) { + return new Boolean(value).booleanValue(); + } + return false; + } + + private static final Set primitives; + + static { + Set set = new HashSet(); + set.add("boolean"); + set.add("byte"); + set.add("char"); + set.add("short"); + set.add("int"); + set.add("long"); + set.add("float"); + set.add("double"); + primitives = Collections.unmodifiableSet(set); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java b/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java new file mode 100644 index 00000000..90608849 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java @@ -0,0 +1,50 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.generator; + +import java.io.IOException; +import java.util.Iterator; +import java.util.Set; + +/** + * @version $Revision$ + */ +public class SchemaGenerator { + private final MappingLoader mappingLoader; + private final GeneratorPlugin[] plugins; + + public SchemaGenerator(MappingLoader mappingLoader, GeneratorPlugin[] plugins) { + this.mappingLoader = mappingLoader; + this.plugins = plugins; + } + + public void generate() throws IOException { + Set namespaces = mappingLoader.loadNamespaces(); + if (namespaces.isEmpty()) { + System.out.println("Warning: no namespaces found!"); + } + + for (Iterator iterator = namespaces.iterator(); iterator.hasNext();) { + NamespaceMapping namespaceMapping = (NamespaceMapping) iterator.next(); + for (int i = 0; i < plugins.length; i++) { + GeneratorPlugin plugin = plugins[i]; + plugin.generate(namespaceMapping); + } + } + } +} diff --git a/spring/src/java/org/xbean/spring/generator/Utils.java b/spring/src/java/org/xbean/spring/generator/Utils.java new file mode 100644 index 00000000..02cb6e0d --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/Utils.java @@ -0,0 +1,120 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.beans.PropertyEditor; +import java.beans.PropertyEditorManager; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public final class Utils { + public static final String XBEAN_ANNOTATION = "org.xbean.XBean"; + public static final String PROPERTY_ANNOTATION = "org.xbean.Property"; + + private Utils() { + } + + public static String decapitalise(String value) { + if (value == null || value.length() == 0) { + return value; + } + return value.substring(0, 1).toLowerCase() + value.substring(1); + } + + public static boolean isSimpleType(AttributeMapping attributeMapping) { + if (attributeMapping.isPrimitive()) { + return true; + } + String type = attributeMapping.getType(); + if (type.equals("javax.xml.namespace.QName")) { + return true; + } + if (attributeMapping.isArray()) { + return false; + } + return hasPropertyEditor(type); + } + + private static boolean hasPropertyEditor(String type) { + Class theClass; + try { + theClass = loadClass(type); + } catch (ClassNotFoundException e) { + System.out.println("Warning, could not load class: " + type); + return false; + } + // lets see if we can find a property editor for this type + PropertyEditor editor = PropertyEditorManager.findEditor(theClass); + return editor != null; + } + + /** + * Attempts to load the class on the current thread context class loader or + * the class loader which loaded us + */ + private static Class loadClass(String name) throws ClassNotFoundException { + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + if (contextClassLoader != null) { + try { + return contextClassLoader.loadClass(name); + } catch (ClassNotFoundException e) { + } + } + return Utils.class.getClassLoader().loadClass(name); + } + + public static String getXsdType(AttributeMapping attributeMapping) { + String typeName = attributeMapping.getType(); + String xsdType = (String) XSD_TYPES.get(typeName); + if (xsdType == null) { + xsdType = "xsd:string"; + } + return xsdType; + } + + public static final Map XSD_TYPES; + + static { + // TODO check these XSD types are right... + Map map = new HashMap(); + map.put(String.class.getName(), "xs:string"); + map.put(Boolean.class.getName(), "xs:boolean"); + map.put(boolean.class.getName(), "xs:boolean"); + map.put(Byte.class.getName(), "xs:byte"); + map.put(byte.class.getName(), "xs:byte"); + map.put(Short.class.getName(), "xs:short"); + map.put(short.class.getName(), "xs:short"); + map.put(Integer.class.getName(), "xs:integer"); + map.put(int.class.getName(), "xs:integer"); + map.put(Long.class.getName(), "xs:long"); + map.put(long.class.getName(), "xs:long"); + map.put(Float.class.getName(), "xs:float"); + map.put(float.class.getName(), "xs:float"); + map.put(Double.class.getName(), "xs:double"); + map.put(double.class.getName(), "xs:double"); + map.put(java.util.Date.class.getName(), "xs:date"); + map.put(java.sql.Date.class.getName(), "xs:date"); + map.put("javax.xml.namespace.QName", "xs:QName"); + XSD_TYPES = Collections.unmodifiableMap(map); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java b/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java new file mode 100644 index 00000000..abb89c98 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java @@ -0,0 +1,140 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import org.xbean.spring.context.impl.NamespaceHelper; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class XmlMetadataGenerator implements GeneratorPlugin { + private final String metaInfDir; + + public XmlMetadataGenerator() { + metaInfDir = "target/classes/"; + } + + public XmlMetadataGenerator(String metaInfDir) { + this.metaInfDir = metaInfDir; + } + + public void generate(NamespaceMapping namespaceMapping) throws IOException { + String namespace = namespaceMapping.getNamespace(); + if (namespace == null) { + return; + } + + File file = new File(metaInfDir + NamespaceHelper.createDiscoveryPathName(namespace)); + file.getParentFile().mkdirs(); + System.out.println("Generating META-INF properties file: " + file + " for namespace: " + namespace); + PrintWriter out = new PrintWriter(new FileWriter(file)); + try { + generatePropertiesFile(out, namespaceMapping.getElements()); + } finally { + out.close(); + } + } + + private void generatePropertiesFile(PrintWriter out, Set elements) { + out.println("# NOTE: this file is autogenerated by XBeans"); + out.println(); + out.println("# beans"); + + for (Iterator iter = elements.iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + out.println(element.getElementName() + " = " + element.getClassName()); + + generatePropertiesFileContent(out, element); + generatePropertiesFilePropertyAliases(out, element); + generatePropertiesFileConstructors(out, element); + out.println(); + } + } + + private void generatePropertiesFileContent(PrintWriter out, ElementMapping element) { + String contentProperty = element.getContentProperty(); + if (contentProperty != null) { + out.println(element.getElementName() + ".contentProperty = " + contentProperty); + } + String initMethod = element.getInitMethod(); + if (initMethod != null) { + out.println(element.getElementName() + ".initMethod = " + initMethod); + } + + String destroyMethod = element.getDestroyMethod(); + if (destroyMethod != null) { + out.println(element.getElementName() + ".destroyMethod = " + destroyMethod); + } + + String factoryMethod = element.getFactoryMethod(); + if (factoryMethod != null) { + out.println(element.getElementName() + ".factoryMethod = " + factoryMethod); + } + } + + private void generatePropertiesFileConstructors(PrintWriter out, ElementMapping element) { + List constructors = element.getConstructors(); + for (Iterator iterator = constructors.iterator(); iterator.hasNext();) { + List args = (List) iterator.next(); + generatePropertiesFileConstructor(out, element, args); + + } + } + + private void generatePropertiesFileConstructor(PrintWriter out, ElementMapping element, List args) { + out.print(element.getClassName()); + if (element.getFactoryMethod() != null) { + out.print("." + element.getFactoryMethod()); + } + out.print("("); + for (Iterator iterator = args.iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + out.print(attributeMapping.getType()); + if (iterator.hasNext()) { + out.print(","); + } + } + out.print(").parameterNames ="); + for (Iterator iterator = args.iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + out.print(" "); + out.print(attributeMapping.getPropertyName()); + } + out.println(); + } + + private void generatePropertiesFilePropertyAliases(PrintWriter out, ElementMapping element) { + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + String propertyName = attributeMapping.getPropertyName(); + String attributeName = attributeMapping.getAttributeName(); + if (!propertyName.equals(attributeName)) { + out.println(element.getElementName() + ".alias." + attributeName + " = " + propertyName); + } + } + } +} diff --git a/spring/src/java/org/xbean/spring/generator/XmlWriter.java b/spring/src/java/org/xbean/spring/generator/XmlWriter.java new file mode 100644 index 00000000..9f4de7a5 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/XmlWriter.java @@ -0,0 +1,215 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.io.PrintWriter; +import java.io.Writer; +import java.util.LinkedList; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class XmlWriter { + private PrintWriter writer; + + private LinkedList elementStack = new LinkedList(); + + private boolean tagInProgress; + + private int depth; + + private String lineIndenter; + + private String encoding; + + private String docType; + + private boolean readyForNewLine; + + private boolean tagIsEmpty; + + public XmlWriter(PrintWriter writer, String lineIndenter) { + this(writer, lineIndenter, null, null); + } + + public XmlWriter(Writer writer, String lineIndenter) { + this(new PrintWriter(writer), lineIndenter); + } + + public XmlWriter(PrintWriter writer) { + this(writer, null, null); + } + + public XmlWriter(Writer writer) { + this(new PrintWriter(writer)); + } + + public XmlWriter(PrintWriter writer, String lineIndenter, String encoding, String doctype) { + this.writer = writer; + + this.lineIndenter = lineIndenter; + + this.encoding = encoding; + + this.docType = doctype; + + if (docType != null || encoding != null) { + writeDocumentHeaders(); + } + } + + public XmlWriter(Writer writer, String lineIndenter, String encoding, String doctype) { + this(new PrintWriter(writer), lineIndenter, encoding, doctype); + } + + public XmlWriter(PrintWriter writer, String encoding, String doctype) { + this(writer, " ", encoding, doctype); + } + + public XmlWriter(Writer writer, String encoding, String doctype) { + this(new PrintWriter(writer), encoding, doctype); + } + + public void startElement(String name) { + tagIsEmpty = false; + + finishTag(); + + write("<"); + + write(name); + + elementStack.addLast(name); + + tagInProgress = true; + + depth++; + + readyForNewLine = true; + + tagIsEmpty = true; + } + + public void writeText(String text) { + writeText(text, true); + } + + public void writeMarkup(String text) { + writeText(text, false); + } + + private void writeText(String text, boolean escapeHtml) { + readyForNewLine = false; + + tagIsEmpty = false; + + finishTag(); + + if (escapeHtml) { + text = text.replaceAll("&", "&"); + + text = text.replaceAll("<", "<"); + + text = text.replaceAll(">", ">"); + } + + write(text); + } + + public void addAttribute(String key, String value) { + write(" "); + + write(key); + + write("=\""); + + write(value); + + write("\""); + } + + public void endElement() { + depth--; + + if (tagIsEmpty) { + write("/"); + + readyForNewLine = false; + + finishTag(); + + elementStack.removeLast(); + } else { + finishTag(); + + write(""); + } + + readyForNewLine = true; + } + + private void write(String str) { + writer.write(str); + } + + private void finishTag() { + if (tagInProgress) { + write(">"); + } + + tagInProgress = false; + + if (readyForNewLine) { + endOfLine(); + } + readyForNewLine = false; + + tagIsEmpty = false; + } + + protected void endOfLine() { + write("\n"); + + for (int i = 0; i < depth; i++) { + write(lineIndenter); + } + } + + private void writeDocumentHeaders() { + write(""); + + endOfLine(); + + if (docType != null) { + write(""); + + endOfLine(); + } + } +} diff --git a/spring/src/java/org/xbean/spring/generator/XsdGenerator.java b/spring/src/java/org/xbean/spring/generator/XsdGenerator.java new file mode 100644 index 00000000..fa439b02 --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/XsdGenerator.java @@ -0,0 +1,131 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class XsdGenerator implements GeneratorPlugin { + private final File destFile; + + public XsdGenerator(File destFile) { + this.destFile = destFile; + } + + public void generate(NamespaceMapping namespaceMapping) throws IOException { + // TODO can only handle 1 schema document so far... + File file = destFile; + System.out.println("Generating XSD file: " + file + " for namespace: " + namespaceMapping.getNamespace()); + PrintWriter out = new PrintWriter(new FileWriter(file)); + try { + generateSchema(out, namespaceMapping); + } finally { + out.close(); + } + } + + private void generateSchema(PrintWriter out, NamespaceMapping namespaceMapping) { + out.println(""); + out.println(""); + out.println(); + out.println(""); + + for (Iterator iter = namespaceMapping.getElements().iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + generateElementMapping(out, namespaceMapping, element); + } + + out.println(); + out.println(""); + } + + private void generateElementMapping(PrintWriter out, NamespaceMapping namespaceMapping, ElementMapping element) { + out.println(); + out.println(" "); + + String localName = element.getElementName(); + + out.println(" "); + out.println(" "); + + int complexCount = 0; + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + if (!Utils.isSimpleType(attributeMapping)) { + complexCount++; + } + } + if (complexCount > 0) { + out.println(" "); + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + if (!Utils.isSimpleType(attributeMapping)) { + generateElementMappingComplexProperty(out, namespaceMapping, attributeMapping); + } + } + out.println(" "); + } + + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + if (Utils.isSimpleType(attributeMapping)) { + generateElementMappingSimpleProperty(out, attributeMapping); + } + } + out.println(" "); + out.println(" "); + out.println(); + } + + private void generateElementMappingSimpleProperty(PrintWriter out, AttributeMapping attributeMapping) { + out.println(" "); + } + + private void generateElementMappingComplexProperty(PrintWriter out, NamespaceMapping namespaceMapping, AttributeMapping attributeMapping) { + out.println(" "); + // Check if this is an array of known elements + boolean found = false; + if (attributeMapping.isArray()) { + for (Iterator iter = namespaceMapping.getElements().iterator(); iter.hasNext();) { + ElementMapping elem = (ElementMapping) iter.next(); + if (elem.getClassName().equals(attributeMapping.getArrayType())) { + out.println(" "); + found = true; + break; + } + } + + } + // Else, use an xs:any to allow extension + if (!found) { + out.println(" "); + } + out.println(" "); + } + +} diff --git a/spring/src/test/org/xbean/spring/example/SoupService.java b/spring/src/test/org/xbean/spring/example/SoupService.java index 7699d16e..73ec0b1c 100644 --- a/spring/src/test/org/xbean/spring/example/SoupService.java +++ b/spring/src/test/org/xbean/spring/example/SoupService.java @@ -27,12 +27,15 @@ * @author Dain Sundstrom * @version $Id$ * @since 2.0 - */ + */ // START SNIPPET: bean public class SoupService { private static final Log log = LogFactory.getLog(SoupService.class); + /** + * @org.xbean.FactoryMethod + */ public static SoupService newSoup(String type) { return new SoupService(type, System.currentTimeMillis()); } @@ -46,11 +49,17 @@ private SoupService(String type, long createTime) { this.createTime = createTime; } + /** + * @org.xbean.InitMethod + */ public void make() { log.info("Making " + type + "soup"); exists = true; } + /** + * @org.xbean.DestroyMethod + */ public void eat() { log.info("Mummmm " + type + "soup is yummie!"); exists = false; From 32efd2886462d5e4c66fd4de704a76932723dedf Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 27 Oct 2005 21:52:25 +0000 Subject: [PATCH 030/736] Improve xsd generator to add any attributes and properties ref attributes. Remove old tasks, and improve logging. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380449 13f79535-47bb-0310-9956-ffa450edef68 --- .../generator/DocumentationGenerator.java | 6 +- .../org/xbean/spring/generator/LogFacade.java | 8 + .../generator/MappingGeneratorTask.java | 8 +- .../spring/generator/SchemaGenerator.java | 6 +- .../generator/XmlMetadataGenerator.java | 10 +- .../xbean/spring/generator/XsdGenerator.java | 13 +- .../org/xbean/spring/task/SchemaElement.java | 58 -- .../xbean/spring/task/SchemaGenerateTask.java | 145 ---- .../xbean/spring/task/SchemaGenerator.java | 657 ------------------ 9 files changed, 35 insertions(+), 876 deletions(-) create mode 100644 spring/src/java/org/xbean/spring/generator/LogFacade.java delete mode 100644 spring/src/java/org/xbean/spring/task/SchemaElement.java delete mode 100644 spring/src/java/org/xbean/spring/task/SchemaGenerateTask.java delete mode 100644 spring/src/java/org/xbean/spring/task/SchemaGenerator.java diff --git a/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java b/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java index bc48bd0c..a134caf2 100644 --- a/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java @@ -32,9 +32,11 @@ */ public class DocumentationGenerator implements GeneratorPlugin { private final File destFile; + private final LogFacade log; - public DocumentationGenerator(File destFile) { + public DocumentationGenerator(LogFacade log, File destFile) { this.destFile = destFile; + this.log = log; } public void generate(NamespaceMapping namespaceMapping) throws IOException { @@ -42,7 +44,7 @@ public void generate(NamespaceMapping namespaceMapping) throws IOException { // TODO can only handle 1 schema document so far... File file = new File(destFile.getParentFile(), destFile.getName() + ".html"); - System.out.println("Generating HTML documentation file: " + file + " for namespace: " + namespace); + log.log("Generating HTML documentation file: " + file + " for namespace: " + namespace); PrintWriter out = new PrintWriter(new FileWriter(file)); try { generateDocumentation(out, namespace, namespaceMapping.getElements(), namespaceMapping.getRootElement()); diff --git a/spring/src/java/org/xbean/spring/generator/LogFacade.java b/spring/src/java/org/xbean/spring/generator/LogFacade.java new file mode 100644 index 00000000..5db0021a --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/LogFacade.java @@ -0,0 +1,8 @@ +package org.xbean.spring.generator; + +public interface LogFacade { + + void log(String message); + + void log(String message, int level); +} diff --git a/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java b/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java index fddd3277..777d75f2 100644 --- a/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java +++ b/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java @@ -15,7 +15,7 @@ * * @version $Revision$ */ -public class MappingGeneratorTask extends MatchingTask { +public class MappingGeneratorTask extends MatchingTask implements LogFacade { private String namespace; private Path srcDir = null; private Path toolpath = null; @@ -109,9 +109,9 @@ public void execute() throws BuildException { includes); GeneratorPlugin[] plugins = new GeneratorPlugin[]{ - new XmlMetadataGenerator(metaInfDir), - new DocumentationGenerator(destFile), - new XsdGenerator(destFile) + new XmlMetadataGenerator(this, metaInfDir), + new DocumentationGenerator(this, destFile), + new XsdGenerator(this, destFile) }; // load the mappings diff --git a/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java b/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java index 90608849..9610a565 100644 --- a/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java @@ -27,8 +27,10 @@ public class SchemaGenerator { private final MappingLoader mappingLoader; private final GeneratorPlugin[] plugins; + private final LogFacade log; - public SchemaGenerator(MappingLoader mappingLoader, GeneratorPlugin[] plugins) { + public SchemaGenerator(LogFacade log, MappingLoader mappingLoader, GeneratorPlugin[] plugins) { + this.log = log; this.mappingLoader = mappingLoader; this.plugins = plugins; } @@ -36,7 +38,7 @@ public SchemaGenerator(MappingLoader mappingLoader, GeneratorPlugin[] plugins) { public void generate() throws IOException { Set namespaces = mappingLoader.loadNamespaces(); if (namespaces.isEmpty()) { - System.out.println("Warning: no namespaces found!"); + log.log("Warning: no namespaces found!"); } for (Iterator iterator = namespaces.iterator(); iterator.hasNext();) { diff --git a/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java b/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java index abb89c98..ca5e142e 100644 --- a/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java @@ -33,13 +33,11 @@ */ public class XmlMetadataGenerator implements GeneratorPlugin { private final String metaInfDir; + private final LogFacade log; - public XmlMetadataGenerator() { - metaInfDir = "target/classes/"; - } - - public XmlMetadataGenerator(String metaInfDir) { + public XmlMetadataGenerator(LogFacade log, String metaInfDir) { this.metaInfDir = metaInfDir; + this.log = log; } public void generate(NamespaceMapping namespaceMapping) throws IOException { @@ -50,7 +48,7 @@ public void generate(NamespaceMapping namespaceMapping) throws IOException { File file = new File(metaInfDir + NamespaceHelper.createDiscoveryPathName(namespace)); file.getParentFile().mkdirs(); - System.out.println("Generating META-INF properties file: " + file + " for namespace: " + namespace); + log.log("Generating META-INF properties file: " + file + " for namespace: " + namespace); PrintWriter out = new PrintWriter(new FileWriter(file)); try { generatePropertiesFile(out, namespaceMapping.getElements()); diff --git a/spring/src/java/org/xbean/spring/generator/XsdGenerator.java b/spring/src/java/org/xbean/spring/generator/XsdGenerator.java index fa439b02..92daabdf 100644 --- a/spring/src/java/org/xbean/spring/generator/XsdGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/XsdGenerator.java @@ -29,15 +29,17 @@ */ public class XsdGenerator implements GeneratorPlugin { private final File destFile; + private final LogFacade log; - public XsdGenerator(File destFile) { + public XsdGenerator(LogFacade log, File destFile) { this.destFile = destFile; + this.log = log; } public void generate(NamespaceMapping namespaceMapping) throws IOException { // TODO can only handle 1 schema document so far... File file = destFile; - System.out.println("Generating XSD file: " + file + " for namespace: " + namespaceMapping.getNamespace()); + log.log("Generating XSD file: " + file + " for namespace: " + namespaceMapping.getNamespace()); PrintWriter out = new PrintWriter(new FileWriter(file)); try { generateSchema(out, namespaceMapping); @@ -95,8 +97,11 @@ private void generateElementMapping(PrintWriter out, NamespaceMapping namespaceM AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); if (Utils.isSimpleType(attributeMapping)) { generateElementMappingSimpleProperty(out, attributeMapping); + } else { + generateElementMappingComplexPropertyAsRef(out, attributeMapping); } } + out.println(" "); out.println(" "); out.println(" "); out.println(); @@ -106,6 +111,10 @@ private void generateElementMappingSimpleProperty(PrintWriter out, AttributeMapp out.println(" "); } + private void generateElementMappingComplexPropertyAsRef(PrintWriter out, AttributeMapping attributeMapping) { + out.println(" "); + } + private void generateElementMappingComplexProperty(PrintWriter out, NamespaceMapping namespaceMapping, AttributeMapping attributeMapping) { out.println(" "); // Check if this is an array of known elements diff --git a/spring/src/java/org/xbean/spring/task/SchemaElement.java b/spring/src/java/org/xbean/spring/task/SchemaElement.java deleted file mode 100644 index 21b9e4cb..00000000 --- a/spring/src/java/org/xbean/spring/task/SchemaElement.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * - * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com - * - * 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. - * - **/ -package org.xbean.spring.task; - -import org.codehaus.jam.JClass; - -/** - * Represents an element in the schema - * - * @version $Revision: 1.1 $ - */ -public class SchemaElement implements Comparable { - - private final JClass type; - private final String localName; - private final String namespace; - - public SchemaElement(JClass type, String localName, String namespace) { - this.type = type; - this.localName = localName; - this.namespace = namespace; - } - - public String getLocalName() { - return localName; - } - - public String getNamespace() { - return namespace; - } - - public JClass getType() { - return type; - } - - public int compareTo(Object that) { - if (that instanceof SchemaElement) { - SchemaElement thatElement = (SchemaElement) that; - return localName.compareTo(thatElement.localName); - } - return getClass().getName().compareTo(that.getClass().getName()); - } -} diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerateTask.java b/spring/src/java/org/xbean/spring/task/SchemaGenerateTask.java deleted file mode 100644 index 88a71684..00000000 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerateTask.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.xbean.spring.task; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; -import org.codehaus.jam.JClass; -import org.codehaus.jam.JamService; -import org.codehaus.jam.JamServiceFactory; -import org.codehaus.jam.JamServiceParams; - -import java.io.File; - -/** - * An Ant task for executing Gram scripts, which are Groovy scripts executed on - * the JAM context. - * - * @version $Revision: 1.2 $ - */ -public class SchemaGenerateTask extends MatchingTask { - - private String namespace; - private Path srcDir = null; - private Path mToolpath = null; - private Path mClasspath = null; - private String mIncludes = "**/*.java"; - private File destFile = new File("target/classes/activemq.xsd"); - private String metaInfDir = "target/classes/"; - - public File getDestFile() { - return destFile; - } - - public void setDestFile(File scenariosFile) { - this.destFile = scenariosFile; - } - - public String getMetaInfDir() { - return metaInfDir; - } - - public void setMetaInfDir(String metaInfDir) { - this.metaInfDir = metaInfDir; - } - - public String getNamespace() { - return namespace; - } - - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - public void setSrcDir(Path srcDir) { - this.srcDir = srcDir; - } - - public void setToolpath(Path path) { - if (mToolpath == null) { - mToolpath = path; - } - else { - mToolpath.append(path); - } - } - - public void setToolpathRef(Reference r) { - createToolpath().setRefid(r); - } - - public Path createToolpath() { - if (mToolpath == null) { - mToolpath = new Path(getProject()); - } - return mToolpath.createPath(); - } - - public void setClasspath(Path path) { - if (mClasspath == null) { - mClasspath = path; - } - else { - mClasspath.append(path); - } - } - - public void setClasspathRef(Reference r) { - createClasspath().setRefid(r); - } - - public Path createClasspath() { - if (mClasspath == null) { - mClasspath = new Path(getProject()); - } - return mClasspath.createPath(); - } - - public void execute() throws BuildException { - if (namespace == null) { - throw new BuildException("'namespace' must be specified"); - } - if (srcDir == null) { - throw new BuildException("'srcDir' must be specified"); - } - if (destFile == null) { - throw new BuildException("'destFile' must be specified"); - } - JamServiceFactory jamServiceFactory = JamServiceFactory.getInstance(); - JamServiceParams serviceParams = jamServiceFactory.createServiceParams(); - if (mToolpath != null) { - File[] tcp = path2files(mToolpath); - for (int i = 0; i < tcp.length; i++) { - serviceParams.addToolClasspath(tcp[i]); - } - } - if (mClasspath != null) { - File[] cp = path2files(mClasspath); - for (int i = 0; i < cp.length; i++) { - serviceParams.addClasspath(cp[i]); - } - } - - try { - serviceParams.includeSourcePattern(path2files(srcDir), mIncludes); - JamService jam = jamServiceFactory.createService(serviceParams); - JClass[] classes = jam.getAllClasses(); - SchemaGenerator generator = new SchemaGenerator(classes, destFile, namespace, metaInfDir); - generator.generate(); - - log("...done."); - } - catch (Exception e) { - throw new BuildException(e); - } - } - - protected File[] path2files(Path path) { - String[] list = path.list(); - File[] out = new File[list.length]; - for (int i = 0; i < out.length; i++) { - out[i] = new File(list[i]).getAbsoluteFile(); - } - return out; - } -} diff --git a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java b/spring/src/java/org/xbean/spring/task/SchemaGenerator.java deleted file mode 100644 index 8a1c6097..00000000 --- a/spring/src/java/org/xbean/spring/task/SchemaGenerator.java +++ /dev/null @@ -1,657 +0,0 @@ -/** - * - * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com - * - * 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. - * - **/ -package org.xbean.spring.task; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.jam.JAnnotatedElement; -import org.codehaus.jam.JAnnotation; -import org.codehaus.jam.JAnnotationValue; -import org.codehaus.jam.JClass; -import org.codehaus.jam.JComment; -import org.codehaus.jam.JConstructor; -import org.codehaus.jam.JMethod; -import org.codehaus.jam.JParameter; -import org.codehaus.jam.JProperty; -import org.xbean.spring.context.impl.NamespaceHelper; -import org.xbean.spring.context.impl.PropertyEditorHelper; - -import java.beans.PropertyEditor; -import java.beans.PropertyEditorManager; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * - * @version $Revision: 1.1 $ - */ -public class SchemaGenerator { - public static final String XBEAN_ANNOTATION = "org.xbean.XBean"; - public static final String PROPERTY_ANNOTATION = "org.xbean.Property"; - - private static final Log log = LogFactory.getLog(SchemaGenerator.class); - - private final JClass[] classes; - private final File destFile; - private final String defaultNamespace; - private String metaInfDir = "target/classes/"; - - private Map namespaces = new HashMap(); - private List allElements = new ArrayList(); - private SchemaElement rootElement; - private Map xsdTypeMap; - - public SchemaGenerator(JClass[] classes, File destFile, String defaultNamespace, String metaInfDir) { - this.classes = classes; - this.destFile = destFile; - this.defaultNamespace = defaultNamespace; - this.metaInfDir = metaInfDir; - - PropertyEditorHelper.registerCustomEditors(); - } - - public void generate() throws IOException { - loadModel(); - - for (Iterator iter = namespaces.entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Map.Entry) iter.next(); - String namespace = (String) entry.getKey(); - List elements = (List) entry.getValue(); - Collections.sort(elements); - if (namespace != null) { - generatePropertiesFile(namespace, elements); - } - generateDocumentation(namespace, elements); - generateSchema(namespace, elements); - } - - if (namespaces.isEmpty()) { - System.out.println("Warning: no namespaces found!"); - } - } - - // Documentation generation - // ------------------------------------------------------------------------- - protected void generatePropertiesFile(String namespace, List elements) throws IOException { - File file = new File(metaInfDir + NamespaceHelper.createDiscoveryPathName(namespace)); - file.getParentFile().mkdirs(); - System.out.println("Generating META-INF properties file: " + file + " for namespace: " + namespace); - PrintWriter out = new PrintWriter(new FileWriter(file)); - try { - generatePropertiesFile(out, namespace, elements); - } - finally { - out.close(); - } - } - - protected void generatePropertiesFile(PrintWriter out, String namespace, List elements) { - out.println("# NOTE: this file is autogenerated by XBeans"); - out.println(); - out.println("# beans"); - - for (Iterator iter = elements.iterator(); iter.hasNext();) { - SchemaElement element = (SchemaElement) iter.next(); - out.println(element.getLocalName() + " = " + element.getType().getQualifiedName()); - - generatePropertiesFileContent(out, namespace, element); - generatePropertiesFileConstructors(out, namespace, element); - generatePropertiesFilePropertyAliases(out, namespace, element); - } - } - - protected void generatePropertiesFileContent(PrintWriter out, String namespace, SchemaElement element) { - JAnnotation annotation = element.getType().getAnnotation(XBEAN_ANNOTATION); - if (annotation != null) { - String value = getStringValue(annotation, "contentProperty"); - if (value != null) { - out.println(element.getLocalName() + ".contentProperty = " + value); - } - } - } - - protected void generatePropertiesFileConstructors(PrintWriter out, String namespace, SchemaElement element) { - JClass type = element.getType(); - JConstructor[] constructors = type.getConstructors(); - for (int i = 0; i < constructors.length; i++) { - JConstructor constructor = constructors[i]; - generatePropertiesFileConstructor(out, namespace, element, constructor); - } - } - - protected void generatePropertiesFileConstructor(PrintWriter out, String namespace, SchemaElement element, JConstructor constructor) { - JParameter[] parameters = constructor.getParameters(); - if (parameters.length == 0) { - return; - } - out.print(element.getType().getQualifiedName()); - out.print("("); - for (int i = 0; i < parameters.length; i++) { - JParameter parameter = parameters[i]; - if (i > 0) { - out.print(","); - } - out.print(parameter.getType().getQualifiedName()); - } - out.print(").parameterNames ="); - for (int i = 0; i < parameters.length; i++) { - JParameter parameter = parameters[i]; - out.print(" "); - out.print(parameter.getSimpleName()); - } - out.println(); - } - - protected void generatePropertiesFilePropertyAliases(PrintWriter out, String namespace, SchemaElement element) { - JClass type = element.getType(); - JProperty[] properties = type.getProperties(); - for (int i = 0; i < properties.length; i++) { - generatePropertiesFilePropertyAlias(out, namespace, element, properties[i]); - } - } - - protected void generatePropertiesFilePropertyAlias(PrintWriter out, String namespace, SchemaElement element, JProperty property) { - JAnnotation annotation = property.getAnnotation(PROPERTY_ANNOTATION); - if (annotation != null) { - String text = getStringValue(annotation, "alias"); - if (text != null) { - String name = decapitalise(property.getSimpleName()); - out.println(element.getLocalName() + ".alias." + text + " = " +name); - } - } - } - - // Documentation generation - // ------------------------------------------------------------------------- - protected void generateDocumentation(String namespace, List elements) throws IOException { - // TODO can only handle 1 schema document so far... - File file = new File(destFile.getParentFile(), destFile.getName() + ".html"); - System.out.println("Generating HTML documentation file: " + file + " for namespace: " + namespace); - PrintWriter out = new PrintWriter(new FileWriter(file)); - try { - generateDocumentation(out, namespace, elements); - } - finally { - out.close(); - } - } - - private void generateDocumentation(PrintWriter out, String namespace, List elements) { - out.println(""); - out.println(""); - out.println(""); - out.println("Schema for namespace: " + namespace + ""); - out.println(""); - out.println(""); - out.println(""); - out.println(""); - out.println(); - out.println(""); - out.println(); - - if (rootElement != null) { - out.println("

Root Element

"); - out.println(""); - out.println(" "); - generateHtmlElementSummary(out, rootElement); - out.println("
ElementDescriptionClass
"); - out.println(); - } - - out.println("

Element Summary

"); - out.println(""); - out.println(" "); - for (Iterator iter = elements.iterator(); iter.hasNext();) { - SchemaElement element = (SchemaElement) iter.next(); - generateHtmlElementSummary(out, element); - } - out.println("
ElementDescriptionClass
"); - out.println(); - out.println(); - - out.println("

Element Detail

"); - for (Iterator iter = elements.iterator(); iter.hasNext();) { - SchemaElement element = (SchemaElement) iter.next(); - generateHtmlElementDetail(out, element); - } - - out.println(); - out.println(""); - out.println(""); - } - - protected void generateHtmlElementSummary(PrintWriter out, SchemaElement element) { - String localName = element.getLocalName(); - JClass type = element.getType(); - out.println(" " + localName + "" + getDescription(type) - + "" + type.getQualifiedName() + ""); - } - - protected void generateHtmlElementDetail(PrintWriter out, SchemaElement element) { - String localName = element.getLocalName(); - out.println("

Element: " + localName + "

"); - - out.println(""); - out.println(" "); - JClass type = element.getType(); - JProperty[] properties = type.getProperties(); - for (int i = 0; i < properties.length; i++) { - JProperty property = properties[i]; - if (!isValidProperty(property)) { - continue; - } - if (isSimpleType(property)) { - out.println(" "); - } - } - out.println("
AttributeTypeDescription
" + getPropertyXmlName(property) + "" + getXSDType(property) - + "" + getDescription(property) + "
"); - - out.println(""); - out.println(" "); - for (int i = 0; i < properties.length; i++) { - JProperty property = properties[i]; - if (!isValidProperty(property)) { - continue; - } - if (!isSimpleType(property)) { - out.print(" "); - } - } - out.println("
ElementTypeDescription
" + getPropertyXmlName(property) + ""); - printComplexPropertyTypeDocumentation(out, property); - out.println("" + getDescription(property) + "
"); - } - - protected void printComplexPropertyTypeDocumentation(PrintWriter out, JProperty property) { - JClass type = property.getType(); - String typeName = type.getQualifiedName(); - if (isCollection(type)) { - out.print(""); - } - else { - int counter = 0; - // lets find all the implementations of the type - List types = findImplementationsOf(type); - for (Iterator iter = types.iterator(); iter.hasNext();) { - SchemaElement element = (SchemaElement) iter.next(); - if (counter++ > 0) { - out.print(" | "); - } - out.print("<" + element.getLocalName() + "/>"); - } - if (counter > 0) { - out.print(" | "); - } - out.print(""); - } - } - - protected List findImplementationsOf(JClass type) { - List answer = new ArrayList(); - for (Iterator iter = answer.iterator(); iter.hasNext();) { - SchemaElement element = (SchemaElement) iter.next(); - if (isImplementationOf(type, element.getType())) { - answer.add(element); - } - } - return answer; - } - - // XSD generation - // ------------------------------------------------------------------------- - protected void generateSchema(String namespace, List elements) throws IOException { - // TODO can only handle 1 schema document so far... - File file = destFile; - System.out.println("Generating XSD file: " + file + " for namespace: " + namespace); - PrintWriter out = new PrintWriter(new FileWriter(file)); - try { - generateSchema(out, namespace, elements); - } - finally { - out.close(); - } - } - - protected void generateSchema(PrintWriter out, String namespace, List elements) { - out.println(""); - out.println(""); - out.println(); - out.println(""); - - for (Iterator iter = elements.iterator(); iter.hasNext();) { - SchemaElement element = (SchemaElement) iter.next(); - generateSchemaElement(out, element); - } - - out.println(); - out.println(""); - } - - protected void generateSchemaElement(PrintWriter out, SchemaElement element) { - out.println(); - JClass type = element.getType(); - out.println(" "); - - String localName = element.getLocalName(); - - out.println(" "); - out.println(" "); - - JProperty[] properties = type.getProperties(); - int complexCount = 0; - for (int i = 0; i < properties.length; i++) { - JProperty property = properties[i]; - if (!isValidProperty(property)) { - continue; - } - if (!isSimpleType(property)) { - complexCount++; - } - } - if (complexCount > 0) { - out.println(" "); - for (int i = 0; i < properties.length; i++) { - JProperty property = properties[i]; - if (!isValidProperty(property)) { - continue; - } - if (!isSimpleType(property)) { - generateSchemaElementComplexProperty(out, element, property); - } - } - out.println(" "); - } - for (int i = 0; i < properties.length; i++) { - JProperty property = properties[i]; - if (!isValidProperty(property)) { - continue; - } - if (isSimpleType(property)) { - generateSchemaElementSimpleProperty(out, element, property); - } - } - out.println(" "); - out.println(" "); - out.println(); - } - - protected void generateSchemaElementSimpleProperty(PrintWriter out, SchemaElement element, JProperty property) { - out.println(" "); - } - - protected void generateSchemaElementComplexProperty(PrintWriter out, SchemaElement element, JProperty property) { - out.println(" "); - // Check if this is an array of known elements - boolean found = false; - if (property.getType().isArrayType()) { - for (Iterator iter = allElements.iterator(); iter.hasNext();) { - SchemaElement elem = (SchemaElement) iter.next(); - if (elem.getNamespace().equals(element.getNamespace()) && - elem.getType().getQualifiedName().equals(property.getType().getArrayComponentType().getQualifiedName())) { - out.println(" "); - found = true; - break; - } - } - - } - // Else, use an xs:any to allow extension - if (!found) { - out.println(" "); - } - out.println(" "); - } - - protected boolean isSimpleType(JProperty property) { - JClass type = property.getType(); - String name = type.getQualifiedName(); - if (type.isPrimitiveType()) { - return true; - } - if (name.equals("javax.xml.namespace.QName")) { - return true; - } - if (name.endsWith("]")) { - return false; - } - Class theClass; - try { - theClass = loadClass(name); - } - catch (ClassNotFoundException e) { - System.out.println("Warning, could not load class: " + name); - return false; - } - // lets see if we can find a property editor for this type - PropertyEditor editor = PropertyEditorManager.findEditor(theClass); - return editor != null; - } - - protected boolean isValidProperty(JProperty property) { - if ( !property.getSimpleName().equals("Class")) { - JMethod setter = property.getSetter(); - if (setter == null) { - return false; - } - JAnnotation annotation = setter.getAnnotation(XBEAN_ANNOTATION); - if (annotation != null) { - JAnnotationValue value = annotation.getValue("hide"); - if (value != null) { - return !value.asBoolean(); - } - } - return true; - } - return false; - } - - protected String getPropertyXmlName(JAnnotatedElement element) { - String answer = element.getSimpleName(); - if (answer.length() > 0) { - answer = decapitalise(answer); - } - - // lets strip off the trailing Bean for *FactoryBean types by default - if (element instanceof JClass && answer.endsWith("FactoryBean")) { - answer = answer.substring(0, answer.length() - 4); - } - return answer; - } - - protected String decapitalise(String answer) { - return answer.substring(0, 1).toLowerCase() + answer.substring(1); - } - - protected String getDescription(JClass type) { - return getCommentText(type); - } - - protected String getDescription(JProperty property) { - JMethod setter = property.getSetter(); - if (setter != null) { - return getCommentText(setter); - } - return ""; - } - - protected String getCommentText(JAnnotatedElement element) { - JAnnotation annotation = element.getAnnotation(XBEAN_ANNOTATION); - if (annotation != null) { - JAnnotationValue value = annotation.getValue("description"); - if (value != null) { - return value.asString(); - } - } - JComment comment = element.getComment(); - if (comment != null) { - return comment.getText(); - } - return ""; - } - - protected String getXSDType(JProperty property) { - if (xsdTypeMap == null) { - xsdTypeMap = new HashMap(); - loadXsdTypeMap(xsdTypeMap); - } - String typeName = property.getType().getQualifiedName(); - String answer = (String) xsdTypeMap.get(typeName); - if (answer == null) { - answer = "xs:string"; - } - return answer; - } - - protected void loadXsdTypeMap(Map map) { - // TODO check these XSD types are right... - map.put(String.class.getName(), "xs:string"); - map.put(Boolean.class.getName(), "xs:boolean"); - map.put(boolean.class.getName(), "xs:boolean"); - map.put(Byte.class.getName(), "xs:byte"); - map.put(byte.class.getName(), "xs:byte"); - map.put(Short.class.getName(), "xs:short"); - map.put(short.class.getName(), "xs:short"); - map.put(Integer.class.getName(), "xs:integer"); - map.put(int.class.getName(), "xs:integer"); - map.put(Long.class.getName(), "xs:long"); - map.put(long.class.getName(), "xs:long"); - map.put(Float.class.getName(), "xs:float"); - map.put(float.class.getName(), "xs:float"); - map.put(Double.class.getName(), "xs:double"); - map.put(double.class.getName(), "xs:double"); - map.put(java.util.Date.class.getName(), "xs:date"); - map.put(java.sql.Date.class.getName(), "xs:date"); - map.put("javax.xml.namespace.QName", "xs:QName"); - } - - /** - * 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 contextClassLoader = Thread.currentThread().getContextClassLoader(); - if (contextClassLoader != null) { - try { - return contextClassLoader.loadClass(name); - } - catch (ClassNotFoundException e) { - } - } - return getClass().getClassLoader().loadClass(name); - } - - protected void loadModel() { - for (int i = 0; i < classes.length; i++) { - JClass type = classes[i]; - JAnnotation annotation = type.getAnnotation(XBEAN_ANNOTATION); - if (annotation != null) { - String localName = getStringValue(annotation, "element"); - if (localName == null) { - localName = getPropertyXmlName(type); - } - String namespace = getStringValue(annotation, "namespace"); - if (namespace == null) { - namespace = defaultNamespace; - } - boolean root = getBooleanValue(annotation, "rootElement"); - addXmlType(type, localName, namespace, root); - } - else { - log.debug("No XML annotation found for type: " + type.getQualifiedName()); - } - } - } - - protected void addXmlType(JClass type, String localName, String namespace, boolean root) { - List list = (List) namespaces.get(namespace); - if (list == null) { - list = new ArrayList(); - namespaces.put(namespace, list); - } - SchemaElement element = new SchemaElement(type, localName, namespace); - list.add(element); - allElements.add(element); - if (root) { - rootElement = element; - } - } - - protected boolean isCollection(JClass type) { - return type.isArrayType() || implementsInterface(type, Collection.class.getName()); - } - - protected boolean implementsInterface(JClass type, String interfaceClass) { - JClass[] interfaces = type.getInterfaces(); - for (int i = 0; i < interfaces.length; i++) { - JClass anInterface = interfaces[i]; - if (anInterface.getQualifiedName().equals(interfaceClass)) { - return true; - } - } - JClass superclass = type.getSuperclass(); - if (superclass == null || superclass == type) { - return false; - } - else { - return implementsInterface(superclass, interfaceClass); - } - } - - protected boolean isImplementationOf(JClass type, JClass interfaceOrBaseClass) { - if (interfaceOrBaseClass.isInterface()) { - return implementsInterface(type, interfaceOrBaseClass.getQualifiedName()); - } - while (type != null) { - type = type.getSuperclass(); - if (type != null && type.getQualifiedName().equals(interfaceOrBaseClass.getQualifiedName())) { - return true; - } - } - return false; - } - - protected String getStringValue(JAnnotation annotation, String name) { - JAnnotationValue value = annotation.getValue(name); - if (value != null) { - return value.asString(); - } - return null; - } - - protected boolean getBooleanValue(JAnnotation annotation, String name) { - JAnnotationValue value = annotation.getValue(name); - if (value != null) { - return value.asBoolean(); - } - return false; - } -} From f2d596517a9527ee1249651e89e6a54f843d867e Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 27 Oct 2005 21:57:16 +0000 Subject: [PATCH 031/736] Remove the eclipse project files from svn git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380450 13f79535-47bb-0310-9956-ffa450edef68 --- spring/.classpath | 15 --------------- spring/.project | 18 ------------------ 2 files changed, 33 deletions(-) delete mode 100644 spring/.classpath delete mode 100644 spring/.project diff --git a/spring/.classpath b/spring/.classpath deleted file mode 100644 index 954e8ed9..00000000 --- a/spring/.classpath +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/spring/.project b/spring/.project deleted file mode 100644 index 523480a9..00000000 --- a/spring/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - - xbean-spring - XBean Spring Adaptor adds some enhancements to Spring such as custom XML languages. - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file From f8fb612dcea832ffeff5040c88236db9804a3871 Mon Sep 17 00:00:00 2001 From: Daniel Diephouse Date: Fri, 28 Oct 2005 18:19:07 +0000 Subject: [PATCH 032/736] Allow bean properties to be set via child elements. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380451 13f79535-47bb-0310-9956-ffa450edef68 --- .../impl/XBeanXmlBeanDefinitionParser.java | 24 ++++++- .../spring/context/VodkaUsingSpringTest.java | 42 ++++++++++++ .../spring/context/VodkaUsingXBeanTest.java | 33 ++++++++++ .../org/xbean/spring/context/vodka-normal.xml | 11 ++++ .../org/xbean/spring/context/vodka-xbean.xml | 12 ++++ .../xbean/spring/example/VodkaService.java | 64 +++++++++++++++++++ 6 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 spring/src/test/org/xbean/spring/context/VodkaUsingSpringTest.java create mode 100644 spring/src/test/org/xbean/spring/context/VodkaUsingXBeanTest.java create mode 100644 spring/src/test/org/xbean/spring/context/vodka-normal.xml create mode 100644 spring/src/test/org/xbean/spring/context/vodka-xbean.xml create mode 100644 spring/src/test/org/xbean/spring/example/VodkaService.java diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index b479aa28..b3d082d2 100644 --- a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -202,7 +202,7 @@ protected void addContentProperty(BeanDefinitionHolder definition, MappingMetaDa String name = metadata.getContentProperty(getLocalName(element)); if (name != null) { String value = getElementText(element); - addAttributeProperty(definition, metadata, element, name, value); + addProperty(definition, metadata, element, name, value); } else { // lets stry parse a nested properties file @@ -231,10 +231,13 @@ protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMeta Attr attribute) { String localName = attribute.getName(); String value = attribute.getValue(); - addAttributeProperty(definition, metadata, element, localName, value); + addProperty(definition, metadata, element, localName, value); } - protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMetaData metadata, Element element, + /** + * Add a property onto the current BeanDefinition. + */ + protected void addProperty(BeanDefinitionHolder definition, MappingMetaData metadata, Element element, String localName, String value) { if (value != null) { boolean reference = false; @@ -293,6 +296,8 @@ protected void addNestedPropertyElements(BeanDefinitionHolder definition, Mappin // inner tags being the contents of the list // * the child element maps to a tag and is the // bean tag too + // * the child element maps to a tag and is a simple + // type (String, Class, int, etc). Object value = null; String propertyName = metadata.getNestedListProperty(getLocalName(element), localName); if (propertyName != null) { @@ -309,9 +314,22 @@ protected void addNestedPropertyElements(BeanDefinitionHolder definition, Mappin value = tryParseNestedPropertyViaIntrospection(metadata, className, childElement); propertyName = localName; } + if (value != null) { definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, value); } + else + { + /** + * In this case ther is no nested property, so just do a normal + * addProperty like we do with attributes. + */ + String text = getElementText(childElement); + + if (text != null) { + addProperty(definition, metadata, element, localName, text); + } + } } } } diff --git a/spring/src/test/org/xbean/spring/context/VodkaUsingSpringTest.java b/spring/src/test/org/xbean/spring/context/VodkaUsingSpringTest.java new file mode 100644 index 00000000..abfc36a1 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/VodkaUsingSpringTest.java @@ -0,0 +1,42 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.VodkaService; + +/** + * @author Dan Diephouse + * @version $Id$ + * @since 1.0 + */ +public class VodkaUsingSpringTest extends SpringTestSupport { + + public void testWine() throws Exception { + VodkaService vodka = (VodkaService) getBean("vodkaService"); + + assertEquals("name", "Grey Goose", vodka.getName()); + assertEquals("id", "vodkaService", vodka.getId()); + + // Test more complex classes + assertEquals("class", VodkaService.class, vodka.getClass()); + } + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/vodka-normal.xml"); + } +} diff --git a/spring/src/test/org/xbean/spring/context/VodkaUsingXBeanTest.java b/spring/src/test/org/xbean/spring/context/VodkaUsingXBeanTest.java new file mode 100644 index 00000000..a95e6d84 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/VodkaUsingXBeanTest.java @@ -0,0 +1,33 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; + +/** + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ +public class VodkaUsingXBeanTest extends VodkaUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/vodka-xbean.xml"); + } + +} diff --git a/spring/src/test/org/xbean/spring/context/vodka-normal.xml b/spring/src/test/org/xbean/spring/context/vodka-normal.xml new file mode 100644 index 00000000..5ee92e13 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/vodka-normal.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/spring/src/test/org/xbean/spring/context/vodka-xbean.xml b/spring/src/test/org/xbean/spring/context/vodka-xbean.xml new file mode 100644 index 00000000..33aca904 --- /dev/null +++ b/spring/src/test/org/xbean/spring/context/vodka-xbean.xml @@ -0,0 +1,12 @@ + + + + + + Grey Goose + org.xbean.spring.example.VodkaService + + + + + diff --git a/spring/src/test/org/xbean/spring/example/VodkaService.java b/spring/src/test/org/xbean/spring/example/VodkaService.java new file mode 100644 index 00000000..80d99591 --- /dev/null +++ b/spring/src/test/org/xbean/spring/example/VodkaService.java @@ -0,0 +1,64 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.example; + +/** + * It comes from a potatoe, it must be good. + * + * @org.xbean.XBean element="vodka" + * + * @author Dan Diephouse + * @version $Id$ + * @since 2.0 + */ + +// START SNIPPET: bean +public class VodkaService { + private String id; + private String name; + private Class vodkaClass; + + public VodkaService() { + } + + public String getId() { + return id; + } + + public String getName() { + return name; + } + + public void setId(String id) { + this.id = id; + } + + public void setName(String name) { + this.name = name; + } + + public Class getVodkaClass() { + return vodkaClass; + } + + public void setVodkaClass(Class vodkaClass) { + this.vodkaClass = vodkaClass; + } +} +// END SNIPPET: bean + From 0e03afb4c3f8db37f32dd259f837b7ef8c6d6b53 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Mon, 31 Oct 2005 17:40:30 +0000 Subject: [PATCH 033/736] Completed metadata generator rewrite o Added tagging for nested type declaraion on lists to support better xsd and documentation o Added tagging for init, destroy, and facotory methods o Simplified model created from tagged source o Documentation generator now links between nested elements o Schema generator creates choices for nested complex elements and nested lists o Started conversion of jmx and server modules to use tagged code exclusively 0 Remove all remaining references to Annogen, JAM and backport175 as all of these have been replaced with QDox git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380452 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/maven.xml | 29 +- jmx/project.xml | 19 +- jmx/src/java/org/xbean/jmx/EventAdapter.java | 155 ++++---- jmx/src/java/org/xbean/jmx/MBean.java | 68 ++-- jmx/src/java/org/xbean/jmx/MBeanExporter.java | 83 ++-- .../xbean/spring/http/xbean.org/schemas/jmx | 21 - jmx/src/test/org/xbean/jmx/JMXTest.java | 29 +- jmx/src/test/org/xbean/jmx/jmx-simple.xml | 9 +- server/maven.xml | 25 +- server/project.xml | 24 +- .../resources/META-INF/xbean-bootstrap.xml | 4 +- spring/maven.xml | 32 +- spring/project.xml | 8 +- .../spring/generator/AttributeMapping.java | 31 +- .../generator/DocumentationGenerator.java | 158 ++++---- .../generator/InvalidModelException.java | 28 ++ .../spring/generator/JamMappingLoader.java | 363 ------------------ .../generator/MappingGeneratorTask.java | 81 ++-- .../spring/generator/QdoxMappingLoader.java | 274 ++++++++----- .../java/org/xbean/spring/generator/Type.java | 102 +++++ .../org/xbean/spring/generator/Utils.java | 39 +- .../generator/XmlMetadataGenerator.java | 2 +- .../xbean/spring/generator/XsdGenerator.java | 54 +-- .../org/xbean/spring/example/GinService.java | 1 + .../spring/example/RestaurantService.java | 3 + .../xbean/spring/example/SaladService.java | 11 + .../org/xbean/spring/example/SoupService.java | 3 + .../org/xbean/spring/generator/ModelTest.java | 77 ++++ 28 files changed, 840 insertions(+), 893 deletions(-) delete mode 100644 jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx create mode 100644 spring/src/java/org/xbean/spring/generator/InvalidModelException.java delete mode 100644 spring/src/java/org/xbean/spring/generator/JamMappingLoader.java create mode 100644 spring/src/java/org/xbean/spring/generator/Type.java create mode 100644 spring/src/test/org/xbean/spring/generator/ModelTest.java diff --git a/jmx/maven.xml b/jmx/maven.xml index 2cfe9a05..b92e359c 100644 --- a/jmx/maven.xml +++ b/jmx/maven.xml @@ -19,6 +19,11 @@ xmlns:ant="jelly:ant" > + + + + + @@ -32,17 +37,21 @@ - - + + - + + - - - - - - + + + + + + + \ No newline at end of file diff --git a/jmx/project.xml b/jmx/project.xml index 8d1536dd..6c7f72b2 100644 --- a/jmx/project.xml +++ b/jmx/project.xml @@ -64,11 +64,6 @@ commons-logging 1.0.3 - - backport175 - backport175 - 1.0 - backport-util-concurrent backport-util-concurrent @@ -106,12 +101,26 @@ xbean-spring 2.0-SNAPSHOT + + emma maven-emma-plugin 0.6 plugin + + + + ant + ant + 1.6.2 + + + qdox + qdox + 1.5 + diff --git a/jmx/src/java/org/xbean/jmx/EventAdapter.java b/jmx/src/java/org/xbean/jmx/EventAdapter.java index 61954d49..8569b5a2 100644 --- a/jmx/src/java/org/xbean/jmx/EventAdapter.java +++ b/jmx/src/java/org/xbean/jmx/EventAdapter.java @@ -1,103 +1,82 @@ package org.xbean.jmx; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; /** - * $Rev$ + * @org.xbean.XBean element="listen" */ -public class EventAdapter -{ - private Object source; - private Class targetClass; - private String addMethodName; - private String removeMethodName; - private Object listener; +public class EventAdapter { + private Object source; + private Class targetClass; + private String addMethodName; + private String removeMethodName; + private Object listener; - public void setSource(Object source) - { - this.source = source; - } + public void setSource(Object source) { + this.source = source; + } - public void setTargetClass(Class targetClass) - { - this.targetClass = targetClass; - } + public void setTargetClass(Class targetClass) { + this.targetClass = targetClass; + } - public void setAddMethodName(String addMethodName) - { - this.addMethodName = addMethodName; - } + public void setAddMethodName(String addMethodName) { + this.addMethodName = addMethodName; + } - public void setRemoveMethodName(String removeMethodName) - { - this.removeMethodName = removeMethodName; - } + public void setRemoveMethodName(String removeMethodName) { + this.removeMethodName = removeMethodName; + } - public void start() - { - try - { - listener = targetClass.newInstance(); - Class[] interfaces = targetClass.getInterfaces(); - boolean found = false; - for (int i = 0; i < interfaces.length; ++i) - { - try - { - Method addMethod = source.getClass().getMethod(addMethodName, new Class[]{interfaces[i]}); - addMethod.invoke(source, new Object[]{listener}); - found = true; - break; + /** + * @org.xbean.InitMethod + */ + public void start() { + try { + listener = targetClass.newInstance(); + Class[] interfaces = targetClass.getInterfaces(); + boolean found = false; + for (int i = 0; i < interfaces.length; ++i) { + try { + Method addMethod = source.getClass().getMethod(addMethodName, new Class[]{interfaces[i]}); + addMethod.invoke(source, new Object[]{listener}); + found = true; + break; + } catch (NoSuchMethodException ignored) { + } } - catch (NoSuchMethodException ignored) - { - } - } - if (!found) throw new JMXException("Could not find " + addMethodName + " in class " + targetClass.getName()); - } - catch (InstantiationException x) - { - throw new JMXException(x); - } - catch (IllegalAccessException x) - { - throw new JMXException(x); - } - catch (InvocationTargetException x) - { - throw new JMXException(x.getCause()); - } - } + if (!found) throw new JMXException("Could not find " + addMethodName + " in class " + targetClass.getName()); + } catch (InstantiationException x) { + throw new JMXException(x); + } catch (IllegalAccessException x) { + throw new JMXException(x); + } catch (InvocationTargetException x) { + throw new JMXException(x.getCause()); + } + } - public void stop() - { - try - { - Class[] interfaces = targetClass.getInterfaces(); - boolean found = false; - for (int i = 0; i < interfaces.length; ++i) - { - try - { - Method removeMethod = source.getClass().getMethod(removeMethodName, new Class[]{interfaces[i]}); - removeMethod.invoke(source, new Object[]{listener}); - found = true; - break; - } - catch (NoSuchMethodException ignored) - { + /** + * @org.xbean.DestroyMethod + */ + public void stop() { + try { + Class[] interfaces = targetClass.getInterfaces(); + boolean found = false; + for (int i = 0; i < interfaces.length; ++i) { + try { + Method removeMethod = source.getClass().getMethod(removeMethodName, new Class[]{interfaces[i]}); + removeMethod.invoke(source, new Object[]{listener}); + found = true; + break; + } catch (NoSuchMethodException ignored) { + } } - } - if (!found) throw new JMXException("Could not find " + removeMethodName + " in class " + targetClass.getName()); - } - catch (IllegalAccessException x) - { - throw new JMXException(x); - } - catch (InvocationTargetException x) - { - throw new JMXException(x.getCause()); - } - } + if (!found) throw new JMXException("Could not find " + removeMethodName + " in class " + targetClass.getName()); + } catch (IllegalAccessException x) { + throw new JMXException(x); + } catch (InvocationTargetException x) { + throw new JMXException(x.getCause()); + } + } } diff --git a/jmx/src/java/org/xbean/jmx/MBean.java b/jmx/src/java/org/xbean/jmx/MBean.java index 51d97d4e..8797e4eb 100644 --- a/jmx/src/java/org/xbean/jmx/MBean.java +++ b/jmx/src/java/org/xbean/jmx/MBean.java @@ -1,32 +1,46 @@ package org.xbean.jmx; /** - * $Rev$ + * @org.xbean.XBean element="mbean" */ -public class MBean -{ - private Object bean; - private String objectName; - private Class mbeanClass; - private EventAdapter eventAdapter; - - public void setBean(Object bean) - { - this.bean = bean; - } - - public void setObjectName(String objectName) - { - this.objectName = objectName; - } - - public void setMBeanClass(Class mbeanClass) - { - this.mbeanClass = mbeanClass; - } - - public void setEventAdapter(EventAdapter eventAdapter) - { - this.eventAdapter = eventAdapter; - } +public class MBean { + private Object bean; + private String objectName; + private Class mbeanClass; + private EventAdapter eventAdapter; + + public Object getBean() { + return bean; + } + + public void setBean(Object bean) { + this.bean = bean; + } + + public String getObjectName() { + return objectName; + } + + public void setObjectName(String objectName) { + this.objectName = objectName; + } + + /** + * @org.xbean.Property alias="mbean" + */ + public Class getMBeanClass() { + return mbeanClass; + } + + public void setMBeanClass(Class mbeanClass) { + this.mbeanClass = mbeanClass; + } + + public EventAdapter getEventAdapter() { + return eventAdapter; + } + + public void setEventAdapter(EventAdapter eventAdapter) { + this.eventAdapter = eventAdapter; + } } diff --git a/jmx/src/java/org/xbean/jmx/MBeanExporter.java b/jmx/src/java/org/xbean/jmx/MBeanExporter.java index 506118e5..9dbe3f64 100644 --- a/jmx/src/java/org/xbean/jmx/MBeanExporter.java +++ b/jmx/src/java/org/xbean/jmx/MBeanExporter.java @@ -1,39 +1,58 @@ package org.xbean.jmx; -import java.util.List; import javax.management.MBeanServer; +import java.util.List; /** - * $Rev$ + * Exports services to an MBeanServer for management. + * @org.xbean.XBean element="export" */ -public class MBeanExporter -{ - private MBeanServer mbeanServer; - private List mbeans; - private List connectors; - - public void setMBeanServer(MBeanServer mbeanServer) - { - this.mbeanServer = mbeanServer; - } - - public void setMBean(List mbeans) - { - this.mbeans = mbeans; - } - - public void setConnector(List connectors) - { - this.connectors = connectors; - } - - public void start() - { - System.out.println("start"); - } - - public void stop() - { - System.out.println("stop"); - } +public class MBeanExporter { + private MBeanServer mbeanServer; + private List mbeans; + private List connectors; + + /** + * @org.xbean.Property alias="mbeanServer" + */ + public MBeanServer getMBeanServer() { + return mbeanServer; + } + + public void setMBeanServer(MBeanServer mbeanServer) { + this.mbeanServer = mbeanServer; + } + + /** + * @org.xbean.Property alias="mbeans" + */ + public List getMBeans() { + return mbeans; + } + + public void setMBeans(List mbeans) { + this.mbeans = mbeans; + } + + public List getConnectors() { + return connectors; + } + + public void setConnectors(List connectors) { + this.connectors = connectors; + } + + /** + * @org.xbean.InitMethod + */ + public void start() { + System.out.println("start"); + } + + /** + * @org.xbean.DestroyMethod + */ + public void stop() { + System.out.println("stop"); + } } diff --git a/jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx b/jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx deleted file mode 100644 index 0188233e..00000000 --- a/jmx/src/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/jmx +++ /dev/null @@ -1,21 +0,0 @@ -# the default package that POJOs are in -package = org.xbean.jmx - -# Mapping of XML Element localNames to classes -export = org.xbean.jmx.MBeanExporter -mbean = org.xbean.jmx.MBean -listen = org.xbean.jmx.EventAdapter - -# Mapping of XML Attributes to property names -listen.initMethod = start -listen.destroyMethod = stop -listen.listener = targetClassName -listen.add-method = addMethodName -listen.remove-method = removeMethodName - -mbean.objectname = objectName -mbean.mbean = mBeanClass - -export.initMethod = start -export.destroyMethod = stop -export.mbeanserver = mBeanServer; diff --git a/jmx/src/test/org/xbean/jmx/JMXTest.java b/jmx/src/test/org/xbean/jmx/JMXTest.java index b2790a6b..78d74574 100644 --- a/jmx/src/test/org/xbean/jmx/JMXTest.java +++ b/jmx/src/test/org/xbean/jmx/JMXTest.java @@ -6,22 +6,17 @@ /** * $Rev$ */ -public class JMXTest extends TestCase -{ - public void testSimple() throws Exception - { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple.xml"); - try - { - Object jmxService = context.getBean("jmxService"); - assertNotNull(jmxService); +public class JMXTest extends TestCase { + public void testSimple() throws Exception { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple.xml"); + try { + Object jmxService = context.getBean("jmxService"); + assertNotNull(jmxService); - Object jmxExporter = context.getBean("jmxExporter"); - assertNotNull(jmxExporter); - } - finally - { - context.destroy(); - } - } + Object jmxExporter = context.getBean("jmxExporter"); + assertNotNull(jmxExporter); + } finally { + context.destroy(); + } + } } diff --git a/jmx/src/test/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/org/xbean/jmx/jmx-simple.xml index 7b6b99fd..55215a79 100644 --- a/jmx/src/test/org/xbean/jmx/jmx-simple.xml +++ b/jmx/src/test/org/xbean/jmx/jmx-simple.xml @@ -1,10 +1,11 @@ - - - + + + + + - diff --git a/server/maven.xml b/server/maven.xml index 4df0c809..ef50dfc4 100644 --- a/server/maven.xml +++ b/server/maven.xml @@ -36,24 +36,21 @@ - - - + + + + + + - + + - - - - - - - - - diff --git a/server/project.xml b/server/project.xml index 753c675e..b04153b7 100644 --- a/server/project.xml +++ b/server/project.xml @@ -64,11 +64,6 @@ commons-logging 1.0.3 - - backport175 - backport175 - 1.0 - backport-util-concurrent backport-util-concurrent @@ -107,23 +102,24 @@ 2.0-SNAPSHOT - + - annogen - annogen - 0.1.0 + emma + maven-emma-plugin + 0.6 + plugin + + ant ant 1.6.2 - - emma - maven-emma-plugin - 0.6 - plugin + qdox + qdox + 1.5 diff --git a/server/src/resources/META-INF/xbean-bootstrap.xml b/server/src/resources/META-INF/xbean-bootstrap.xml index 2b14fb8a..4657dcdb 100644 --- a/server/src/resources/META-INF/xbean-bootstrap.xml +++ b/server/src/resources/META-INF/xbean-bootstrap.xml @@ -19,12 +19,12 @@ - + - + diff --git a/spring/maven.xml b/spring/maven.xml index abd278c8..9ee814fa 100644 --- a/spring/maven.xml +++ b/spring/maven.xml @@ -33,24 +33,22 @@ - - - - + + + + + + + - - - - - - - - - - - - + + + + + diff --git a/spring/project.xml b/spring/project.xml index 5b25fe69..ab59f634 100644 --- a/spring/project.xml +++ b/spring/project.xml @@ -86,12 +86,7 @@ 2.1.1 - - - annogen - annogen - 0.1.0 - + ant ant @@ -110,6 +105,7 @@ 3.8.1 + emma maven-emma-plugin diff --git a/spring/src/java/org/xbean/spring/generator/AttributeMapping.java b/spring/src/java/org/xbean/spring/generator/AttributeMapping.java index 629ccfab..4c88e1cd 100644 --- a/spring/src/java/org/xbean/spring/generator/AttributeMapping.java +++ b/spring/src/java/org/xbean/spring/generator/AttributeMapping.java @@ -25,27 +25,20 @@ public class AttributeMapping implements Comparable { private final String attributeName; private final String propertyName; private final String description; - private final String type; - private final boolean primitive; - private final boolean array; - private final String arrayType; - private final boolean list; + private final Type type; private final String value; private final boolean fixed; private final boolean required; - public AttributeMapping(String attributeName, String propertyName, String description, String type, boolean primitive, boolean array, String arrayType, boolean list, String value, boolean fixed, boolean required) { + public AttributeMapping(String attributeName, String propertyName, String description, Type type, String value, boolean fixed, boolean required) { if (attributeName == null) throw new NullPointerException("attributeName"); if (propertyName == null) throw new NullPointerException("propertyName"); if (type == null) throw new NullPointerException("type"); this.attributeName = attributeName; this.propertyName = propertyName; + if (description == null) description = ""; this.description = description; this.type = type; - this.primitive = primitive; - this.array = array; - this.arrayType = arrayType; - this.list = list; this.value = value; this.fixed = fixed; this.required = required; @@ -63,26 +56,10 @@ public String getDescription() { return description; } - public String getType() { + public Type getType() { return type; } - public boolean isPrimitive() { - return primitive; - } - - public boolean isArray() { - return array; - } - - public String getArrayType() { - return arrayType; - } - - public boolean isList() { - return list; - } - public String getValue() { return value; } diff --git a/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java b/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java index a134caf2..96e077cd 100644 --- a/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java @@ -20,10 +20,8 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Set; /** * @author Dain Sundstrom @@ -47,13 +45,15 @@ public void generate(NamespaceMapping namespaceMapping) throws IOException { log.log("Generating HTML documentation file: " + file + " for namespace: " + namespace); PrintWriter out = new PrintWriter(new FileWriter(file)); try { - generateDocumentation(out, namespace, namespaceMapping.getElements(), namespaceMapping.getRootElement()); + generateDocumentation(out, namespaceMapping); } finally { out.close(); } } - private void generateDocumentation(PrintWriter out, String namespace, Set elements, ElementMapping rootElement) { + private void generateDocumentation(PrintWriter out, NamespaceMapping namespaceMapping) { + String namespace = namespaceMapping.getNamespace(); + out.println(""); out.println(""); out.println(""); @@ -66,104 +66,128 @@ private void generateDocumentation(PrintWriter out, String namespace, Set elemen out.println(""); out.println(); + generateRootElement(out, namespaceMapping); + + generateElementsSummary(out, namespaceMapping); + out.println(); + out.println(); + + generateElementsDetail(out, namespaceMapping); + + out.println(); + out.println(""); + out.println(""); + } + + private void generateRootElement(PrintWriter out, NamespaceMapping namespaceMapping) { + ElementMapping rootElement = namespaceMapping.getRootElement(); if (rootElement != null) { out.println("

Root Element

"); out.println(""); out.println(" "); - generateHtmlElementSummary(out, rootElement); + generateElementSummary(out, rootElement); out.println("
ElementDescriptionClass
"); out.println(); } + } + private void generateElementsSummary(PrintWriter out, NamespaceMapping namespaceMapping) { out.println("

Element Summary

"); out.println(""); out.println(" "); - for (Iterator iter = elements.iterator(); iter.hasNext();) { + for (Iterator iter = namespaceMapping.getElements().iterator(); iter.hasNext();) { ElementMapping element = (ElementMapping) iter.next(); - generateHtmlElementSummary(out, element); + generateElementSummary(out, element); } out.println("
ElementDescriptionClass
"); - out.println(); - out.println(); - - out.println("

Element Detail

"); - for (Iterator iter = elements.iterator(); iter.hasNext();) { - ElementMapping element = (ElementMapping) iter.next(); - generateHtmlElementDetail(out, element); - } - - out.println(); - out.println(""); - out.println(""); } - private void generateHtmlElementSummary(PrintWriter out, ElementMapping element) { + private void generateElementSummary(PrintWriter out, ElementMapping element) { out.println(" " + "" + element.getElementName() + "" + "" + element.getDescription() + "" + "" + element.getClassName() + ""); } - private void generateHtmlElementDetail(PrintWriter out, ElementMapping element) { - String localName = element.getElementName(); - out.println("

Element: " + localName + "

"); + private void generateElementsDetail(PrintWriter out, NamespaceMapping namespaceMapping) { + out.println("

Element Detail

"); + for (Iterator iter = namespaceMapping.getElements().iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + generateHtmlElementDetail(out, namespaceMapping, element); + } + } + + private void generateHtmlElementDetail(PrintWriter out, NamespaceMapping namespaceMapping, ElementMapping element) { + out.println("

Element: " + element.getElementName() + "

"); - out.println(""); - out.println(" "); - for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + boolean hasAttributes = false; + boolean hasElements = false; + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext() && (!hasAttributes || !hasElements);) { AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); - if (Utils.isSimpleType(attributeMapping)) { - out.println(" "); + Type type = attributeMapping.getType(); + if (Utils.isSimpleType(type)) { + hasAttributes = true; + } else { + hasElements = true; } + } + + if (hasAttributes) { + out.println("
AttributeTypeDescription
" + attributeMapping.getAttributeName() + "" + Utils.getXsdType(attributeMapping) - + "" + attributeMapping.getDescription() + "
"); + out.println(" "); + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + Type type = attributeMapping.getType(); + if (Utils.isSimpleType(type)) { + out.println(" "); + } + } + out.println("
AttributeTypeDescription
" + attributeMapping.getAttributeName() + "" + Utils.getXsdType(type) + + "" + attributeMapping.getDescription() + "
"); } - out.println(""); - out.println(""); - out.println(" "); - for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { - AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); - if (!Utils.isSimpleType(attributeMapping)) { - out.print(" "); + if (hasElements) { + out.println("
ElementTypeDescription
" + attributeMapping.getAttributeName() + ""); - printComplexPropertyTypeDocumentation(out, attributeMapping); - out.println("" + attributeMapping.getDescription() + "
"); + out.println(" "); + for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { + AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); + Type type = attributeMapping.getType(); + if (!Utils.isSimpleType(type)) { + out.print(" "); + } } + out.println("
ElementTypeDescription
" + attributeMapping.getAttributeName() + ""); + printComplexPropertyTypeDocumentation(out, namespaceMapping, type); + out.println("" + attributeMapping.getDescription() + "
"); } - out.println(""); } - private void printComplexPropertyTypeDocumentation(PrintWriter out, AttributeMapping attributeMapping) { - if (attributeMapping.isList()) { - out.print(""); + private void printComplexPropertyTypeDocumentation(PrintWriter out, NamespaceMapping namespaceMapping, Type type) { + if (type.isCollection()) { + out.print("("); + } + + List types; + if (type.isCollection()) { + types = Utils.findImplementationsOf(namespaceMapping, type.getNestedType()); } else { - int counter = 0; - // lets find all the implementations of the type - List types = Collections.EMPTY_LIST; -// List types = findImplementationsOf(type); - for (Iterator iter = types.iterator(); iter.hasNext();) { - ElementMapping element = (ElementMapping) iter.next(); - if (counter++ > 0) { - out.print(" | "); - } - out.print("<" + element.getElementName() + "/>"); - } - if (counter > 0) { + types = Utils.findImplementationsOf(namespaceMapping, type); + } + + for (Iterator iterator = types.iterator(); iterator.hasNext();) { + ElementMapping element = (ElementMapping) iterator.next(); + out.print("" + element.getElementName() + ""); + if (iterator.hasNext()) { out.print(" | "); } - out.print(""); } - } + if (types.size() == 0) { + out.print("<spring:bean/>"); + } -// todo this method does nothing -// private List findImplementationsOf(JClass type) { -// List answer = new ArrayList(); -// for (Iterator iter = answer.iterator(); iter.hasNext();) { -// ElementMapping element = (ElementMapping) iter.next(); -// if (Utils.isImplementationOf(type, element.getType())) { -// answer.add(element); -// } -// } -// return answer; -// } + if (type.isCollection()) { + out.print(")*"); + } + } } diff --git a/spring/src/java/org/xbean/spring/generator/InvalidModelException.java b/spring/src/java/org/xbean/spring/generator/InvalidModelException.java new file mode 100644 index 00000000..d436b8cb --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/InvalidModelException.java @@ -0,0 +1,28 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class InvalidModelException extends RuntimeException { + public InvalidModelException(String message) { + super(message); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/JamMappingLoader.java b/spring/src/java/org/xbean/spring/generator/JamMappingLoader.java deleted file mode 100644 index 0a477a45..00000000 --- a/spring/src/java/org/xbean/spring/generator/JamMappingLoader.java +++ /dev/null @@ -1,363 +0,0 @@ -package org.xbean.spring.generator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.jam.JAnnotatedElement; -import org.codehaus.jam.JAnnotation; -import org.codehaus.jam.JAnnotationValue; -import org.codehaus.jam.JClass; -import org.codehaus.jam.JComment; -import org.codehaus.jam.JConstructor; -import org.codehaus.jam.JMethod; -import org.codehaus.jam.JParameter; -import org.codehaus.jam.JProperty; -import org.codehaus.jam.JamService; -import org.codehaus.jam.JamServiceFactory; -import org.codehaus.jam.JamServiceParams; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -/** - * An Ant task for executing Gram scripts, which are Groovy scripts executed on - * the JAM context. - * - * @version $Revision$ - */ -public class JamMappingLoader implements MappingLoader { - private static final Log log = LogFactory.getLog(JamMappingLoader.class); - private String defaultNamespace; - private File[] toolClasspath; - private File[] classpath; - private File[] srcDirs; - private String includes = "**/*.java"; - - public JamMappingLoader() { - } - - public JamMappingLoader(String defaultNamespace, File[] toolClasspath, File[] classpath, File[] srcDirs, String includes) { - this.defaultNamespace = defaultNamespace; - this.toolClasspath = toolClasspath; - this.classpath = classpath; - this.srcDirs = srcDirs; - this.includes = includes; - } - - public String getDefaultNamespace() { - return defaultNamespace; - } - - public void setDefaultNamespace(String defaultNamespace) { - this.defaultNamespace = defaultNamespace; - } - - public File[] getToolClasspath() { - return toolClasspath; - } - - public void setToolClasspath(File[] toolClasspath) { - this.toolClasspath = toolClasspath; - } - - public File[] getClasspath() { - return classpath; - } - - public void setClasspath(File[] classpath) { - this.classpath = classpath; - } - - public File[] getSrcDirs() { - return srcDirs; - } - - public void setSrcDirs(File[] srcDirs) { - this.srcDirs = srcDirs; - } - - public String getIncludes() { - return includes; - } - - public void setIncludes(String includes) { - this.includes = includes; - } - - public Set loadNamespaces() throws IOException { - if (defaultNamespace == null) { - throw new IllegalArgumentException("defaultNamespace must be specified"); - } - if (srcDirs == null || srcDirs.length == 0) { - throw new IllegalArgumentException("srcDirs must be specified"); - } - - JamServiceFactory jamServiceFactory = JamServiceFactory.getInstance(); - JamServiceParams serviceParams = jamServiceFactory.createServiceParams(); - if (toolClasspath != null) { - for (int i = 0; i < toolClasspath.length; i++) { - File file = toolClasspath[i]; - serviceParams.addToolClasspath(file); - } - } - if (classpath != null) { - for (int i = 0; i < classpath.length; i++) { - File file = classpath[i]; - serviceParams.addClasspath(file); - } - } - - serviceParams.includeSourcePattern(srcDirs, includes); - JamService jam = jamServiceFactory.createService(serviceParams); - JClass[] classes = jam.getAllClasses(); - Set namespaces = loadNamespaces(classes, defaultNamespace); - return namespaces; - } - - private Set loadNamespaces(JClass[] classes, String defaultNamespace) { - Map namespaceElements = new HashMap(); - Map namespaceRoots = new HashMap(); - for (int i = 0; i < classes.length; i++) { - JClass type = classes[i]; - JAnnotation annotation = type.getAnnotation(Utils.XBEAN_ANNOTATION); - if (annotation != null) { - String localName = getStringValue(annotation, "element", getElementName(type)); - String namespace = getStringValue(annotation, "namespace", defaultNamespace); - - ElementMapping element = loadElement(type, localName, namespace); - Set elements = (Set) namespaceElements.get(namespace); - if (elements == null) { - elements = new HashSet(); - namespaceElements.put(namespace, elements); - } - elements.add(element); - if (element.isRootElement()) { - if (namespaceRoots.containsKey(namespace)) { - log.warn("Multiple root elements found for namespace " + namespace); - } - namespaceRoots.put(namespace, element); - } - } else { - log.debug("No XML annotation found for type: " + type.getQualifiedName()); - } - } - - Set namespaces = new TreeSet(); - for (Iterator iterator = namespaceElements.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - String namespace = (String) entry.getKey(); - Set elements = (Set) entry.getValue(); - ElementMapping rootElement = (ElementMapping) namespaceRoots.get(namespace); - NamespaceMapping namespaceMapping = new NamespaceMapping(namespace, elements, rootElement); - namespaces.add(namespaceMapping); - } - return Collections.unmodifiableSet(namespaces); - } - - public ElementMapping loadElement(JClass type, String elementName, String namespace) { - String className = type.getQualifiedName(); - String description = getDescription(type); - - JAnnotation annotation = type.getAnnotation(Utils.XBEAN_ANNOTATION); - String contentProperty = getStringValue(annotation, "contentProperty"); - boolean root = getBooleanValue(annotation, "rootElement"); - - Set attributes = new HashSet(); - Map attributesByPropertyName = new HashMap(); - JProperty[] properties = type.getProperties(); - for (int i = 0; i < properties.length; i++) { - JProperty property = properties[i]; - if (isVisibleProperty(property)) { - String attributeName = getAttributeName(property); - String propertyName = Utils.decapitalise(property.getSimpleName()); - String attributeType = property.getType().getQualifiedName(); - boolean list = false; - String value = null; - boolean fixed = false; - boolean required = false; - boolean primitive = property.getType().isPrimitiveType(); - boolean array = property.getType().isArrayType(); - String arrayType = null; - if (array) { - arrayType = property.getType().getArrayComponentType().getQualifiedName(); - } - String attributeDescription = getDescription(property); - AttributeMapping attributeMapping = new AttributeMapping(attributeName, - propertyName, - attributeDescription, - attributeType, - primitive, - array, - arrayType, - list, - value, - fixed, - required); - attributes.add(attributeMapping); - attributesByPropertyName.put(propertyName, attributeMapping); - } - } - - JConstructor[] constructors = type.getConstructors(); - List constructorArgs = new ArrayList(constructors.length); - for (int i = 0; i < constructors.length; i++) { - JConstructor constructor = constructors[i]; - JParameter[] parameters = constructor.getParameters(); - if (parameters.length > 0) { - List args = new ArrayList(parameters.length); - for (int j = 0; j < parameters.length; j++) { - JParameter parameter = parameters[j]; - String parameterName = Utils.decapitalise(parameter.getSimpleName()); - String parameterType = parameter.getType().getQualifiedName(); - AttributeMapping attributeMapping = (AttributeMapping) attributesByPropertyName.get(parameterName); - if (attributeMapping != null && parameterType.equals(attributeMapping.getType())) { - // todo this is a bad bean... what should we do? - } - if (attributeMapping == null) { - String attributeName = parameterName; - String propertyName = parameterName; - String attributeType = parameter.getType().getQualifiedName(); - boolean list = false; - String value = null; - boolean fixed = false; - boolean required = false; - boolean primitive = parameter.getType().isPrimitiveType(); - boolean array = parameter.getType().isArrayType(); - String arrayType = null; - if (array) { - arrayType = parameter.getType().getArrayComponentType().getQualifiedName(); - } - String attributeDescription = null; - attributeMapping = new AttributeMapping(attributeName, - propertyName, - attributeDescription, - attributeType, - primitive, - array, - arrayType, - list, - value, - fixed, - required); - attributes.add(attributeMapping); - attributesByPropertyName.put(propertyName, attributeMapping); - } - args.add(attributeMapping); - } - constructorArgs.add(Collections.unmodifiableList(args)); - } - } - List constructorList = Collections.unmodifiableList(constructorArgs); - - String initMethod = null; - String destroyMethod = null; - String factoryMethod = null; - - return new ElementMapping(namespace, - elementName, - className, - description, - root, - initMethod, - destroyMethod, - factoryMethod, - contentProperty, - attributes, - constructorList); - } - - private static String getStringValue(JAnnotation annotation, String name) { - return getStringValue(annotation, name, null); - } - - private static String getStringValue(JAnnotation annotation, String name, String defaultValue) { - if (annotation != null) { - JAnnotationValue value = annotation.getValue(name); - if (value != null) { - return value.asString(); - } - } - return defaultValue; - } - - private static boolean getBooleanValue(JAnnotation annotation, String name) { - if (annotation != null) { - JAnnotationValue value = annotation.getValue(name); - if (value != null) { - return value.asBoolean(); - } - } - return false; - } - - private static String getElementName(JClass element) { - String answer = element.getSimpleName(); - if (answer.length() > 0) { - answer = Utils.decapitalise(answer); - } - - // lets strip off the trailing Bean for *FactoryBean types by default - if (element instanceof JClass && answer.endsWith("FactoryBean")) { - answer = answer.substring(0, answer.length() - 4); - } - return answer; - } - - private static String getDescription(JClass type) { - return getCommentText(type); - } - - private static String getDescription(JProperty property) { - JMethod setter = property.getSetter(); - if (setter != null) { - return getCommentText(setter); - } - return ""; - } - - private static String getCommentText(JAnnotatedElement element) { - JAnnotation annotation = element.getAnnotation(Utils.XBEAN_ANNOTATION); - if (annotation != null) { - JAnnotationValue value = annotation.getValue("description"); - if (value != null) { - return value.asString(); - } - } - JComment comment = element.getComment(); - if (comment != null) { - return comment.getText(); - } - return ""; - } - - private static boolean isVisibleProperty(JProperty property) { - if (!property.getSimpleName().equals("Class")) { - JMethod setter = property.getSetter(); - if (setter == null) { - return false; - } - JAnnotation annotation = setter.getAnnotation(Utils.XBEAN_ANNOTATION); - if (annotation != null) { - JAnnotationValue value = annotation.getValue("hide"); - if (value != null) { - return !value.asBoolean(); - } - } - return true; - } - return false; - } - - private static String getAttributeName(JProperty property) { - String attributeName = getStringValue(property.getAnnotation(Utils.PROPERTY_ANNOTATION), "alias", property.getSimpleName()); - return Utils.decapitalise(attributeName); - } -} diff --git a/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java b/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java index 777d75f2..37070aff 100644 --- a/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java +++ b/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java @@ -3,33 +3,35 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; import java.io.File; import java.util.Iterator; import java.util.Set; +import java.util.List; +import java.util.LinkedList; +import java.util.Arrays; +import java.util.Collections; +import java.util.StringTokenizer; +import java.beans.PropertyEditorManager; /** - * An Ant task for executing Gram scripts, which are Groovy scripts executed on - * the JAM context. + * An Ant task for executing generating mapping metadata. * * @version $Revision$ */ public class MappingGeneratorTask extends MatchingTask implements LogFacade { private String namespace; - private Path srcDir = null; - private Path toolpath = null; - private Path classpath = null; - private String includes = "**/*.java"; - private File destFile = new File("target/classes/activemq.xsd"); + private Path srcDir; + private File destFile = new File("target/classes/schema.xsd"); private String metaInfDir = "target/classes/"; + private String propertyEditorPaths = "org.xbean.spring.context.impl"; public File getDestFile() { return destFile; } - public void setDestFile(File scenariosFile) { - this.destFile = scenariosFile; + public void setDestFile(File destFile) { + this.destFile = destFile; } public String getMetaInfDir() { @@ -48,46 +50,20 @@ public void setNamespace(String namespace) { this.namespace = namespace; } - public void setSrcDir(Path srcDir) { - this.srcDir = srcDir; - } - - public void setToolpath(Path path) { - if (toolpath == null) { - toolpath = path; - } else { - toolpath.append(path); - } - } - - public void setToolpathRef(Reference r) { - createToolpath().setRefid(r); - } - - public Path createToolpath() { - if (toolpath == null) { - toolpath = new Path(getProject()); - } - return toolpath.createPath(); + public Path getSrcDir() { + return srcDir; } - public void setClasspath(Path path) { - if (classpath == null) { - classpath = path; - } else { - classpath.append(path); - } + public void setSrcDir(Path srcDir) { + this.srcDir = srcDir; } - public void setClasspathRef(Reference r) { - createClasspath().setRefid(r); + public String getPropertyEditorPaths() { + return propertyEditorPaths; } - public Path createClasspath() { - if (classpath == null) { - classpath = new Path(getProject()); - } - return classpath.createPath(); + public void setPropertyEditorPaths(String propertyEditorPaths) { + this.propertyEditorPaths = propertyEditorPaths; } public void execute() throws BuildException { @@ -101,12 +77,17 @@ public void execute() throws BuildException { throw new BuildException("'destFile' must be specified"); } + if (propertyEditorPaths != null) { + List editorSearchPath = new LinkedList(Arrays.asList(PropertyEditorManager.getEditorSearchPath())); + StringTokenizer paths = new StringTokenizer(propertyEditorPaths, " ,"); + editorSearchPath.addAll(Collections.list(paths)); + PropertyEditorManager.setEditorSearchPath((String[]) editorSearchPath.toArray(new String[editorSearchPath.size()])); + } + + ClassLoader oldCL = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - MappingLoader mappingLoader = new JamMappingLoader(namespace, - getFiles(toolpath), - getFiles(classpath), - getFiles(srcDir), - includes); + MappingLoader mappingLoader = new QdoxMappingLoader(namespace, getFiles(srcDir)); GeneratorPlugin[] plugins = new GeneratorPlugin[]{ new XmlMetadataGenerator(this, metaInfDir), @@ -132,6 +113,8 @@ public void execute() throws BuildException { log("...done."); } catch (Exception e) { throw new BuildException(e); + } finally { + Thread.currentThread().setContextClassLoader(oldCL); } } diff --git a/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java b/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java index 43a7877a..704e6980 100644 --- a/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java +++ b/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java @@ -52,11 +52,9 @@ public class QdoxMappingLoader implements MappingLoader { public static final String FACTORY_METHOD_ANNOTATION = "org.xbean.FactoryMethod"; private static final Log log = LogFactory.getLog(QdoxMappingLoader.class); - private String defaultNamespace; - private File[] srcDirs; - - public QdoxMappingLoader() { - } + private final String defaultNamespace; + private final File[] srcDirs; + private Type listType; public QdoxMappingLoader(String defaultNamespace, File[] srcDirs) { this.defaultNamespace = defaultNamespace; @@ -67,18 +65,10 @@ public String getDefaultNamespace() { return defaultNamespace; } - public void setDefaultNamespace(String defaultNamespace) { - this.defaultNamespace = defaultNamespace; - } - public File[] getSrcDirs() { return srcDirs; } - public void setSrcDirs(File[] srcDirs) { - this.srcDirs = srcDirs; - } - public Set loadNamespaces() throws IOException { JavaDocBuilder builder = new JavaDocBuilder(); @@ -95,6 +85,7 @@ public Set loadNamespaces() throws IOException { builder.addSourceTree(sourceDirectory); } + listType = builder.getClassByName("java.util.List").asType(); Set namespaces = loadNamespaces(builder); return namespaces; } @@ -143,7 +134,7 @@ private List loadElements(JavaDocBuilder builder) { for (int i = 0; i < javaSources.length; i++) { JavaClass javaClass = javaSources[i].getClasses()[0]; - ElementMapping element = loadElement(builder, javaClass); + ElementMapping element = loadElement(javaClass); if (element != null && !javaClass.isAbstract()) { elements.add(element); } else { @@ -153,17 +144,21 @@ private List loadElements(JavaDocBuilder builder) { return elements; } - private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) { - DocletTag tag = javaClass.getTagByName(XBEAN_ANNOTATION); - if (tag == null) { + private ElementMapping loadElement(JavaClass javaClass) { + DocletTag xbeanTag = javaClass.getTagByName(XBEAN_ANNOTATION); + if (xbeanTag == null) { return null; } - String element = getElementName(javaClass, tag); - String description = getProperty(tag, "description"); - String namespace = getProperty(tag, "namespace", defaultNamespace); - boolean root = getBooleanProperty(tag, "rootElement"); - String contentProperty = getProperty(tag, "contentProperty"); + String element = getElementName(javaClass, xbeanTag); + String description = getProperty(xbeanTag, "description"); + if (description == null) { + description = javaClass.getComment(); + + } + String namespace = getProperty(xbeanTag, "namespace", defaultNamespace); + boolean root = getBooleanProperty(xbeanTag, "rootElement"); + String contentProperty = getProperty(xbeanTag, "contentProperty"); Set attributes = new HashSet(); Map attributesByPropertyName = new HashMap(); @@ -171,10 +166,13 @@ private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) for (int i = 0; i < beanProperties.length; i++) { BeanProperty beanProperty = beanProperties[i]; - AttributeMapping attributeMapping = loadAttribute(builder, beanProperty); - if (attributeMapping != null) { - attributes.add(attributeMapping); - attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); + // we only care about properties with a setter + if (beanProperty.getMutator() != null) { + AttributeMapping attributeMapping = loadAttribute(beanProperty, ""); + if (attributeMapping != null) { + attributes.add(attributeMapping); + attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); + } } } @@ -197,7 +195,6 @@ private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) } } - Type listType = builder.getClassByName("java.util.List").asType(); List constructorArgs = new ArrayList(); for (int i = 0; i < methods.length; i++) { JavaMethod method = methods[i]; @@ -206,27 +203,19 @@ private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) List args = new ArrayList(parameters.length); for (int j = 0; j < parameters.length; j++) { JavaParameter parameter = parameters[j]; - String parameterName = parameter.getName(); String parameterType = parameter.getType().toString(); - AttributeMapping attributeMapping = (AttributeMapping) attributesByPropertyName.get(parameterName); - if (attributeMapping != null && parameterType.equals(attributeMapping.getType())) { - // todo this is a bad bean... what should we do? - } + AttributeMapping attributeMapping = (AttributeMapping) attributesByPropertyName.get(parameter.getName()); if (attributeMapping == null) { - boolean list = parameter.getType().isA(listType); - attributeMapping = new AttributeMapping(parameterName, - parameterName, - null, - parameterType, - primitives.contains(parameterType), - parameter.getType().isArray(), - parameter.getType().getValue(), - list, - null, - false, - false); + attributeMapping = loadParameter(parameter); + attributes.add(attributeMapping); - attributesByPropertyName.put(parameterName, attributeMapping); + attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); + } + if (!parameterType.equals(attributeMapping.getType().getName())) { + throw new InvalidModelException("Type mismatch:" + + " The construction method " + toMethodLocator(parameter.getParentMethod()) + + " declared parameter " + parameter.getName() + " as a " + parameterType + + " but the bean property type is " + attributeMapping.getType().getName()); } args.add(attributeMapping); } @@ -247,18 +236,6 @@ private ElementMapping loadElement(JavaDocBuilder builder, JavaClass javaClass) constructorArgs); } - private boolean isValidConstructor(String factoryMethod, JavaMethod method, JavaParameter[] parameters) { - if (!method.isPublic() || parameters.length == 0) { - return false; - } - - if (factoryMethod == null) { - return method.isConstructor(); - } else { - return method.getName().equals(factoryMethod); - } - } - private String getElementName(JavaClass javaClass, DocletTag tag) { String elementName = getProperty(tag, "element"); if (elementName == null) { @@ -276,32 +253,125 @@ private String getElementName(JavaClass javaClass, DocletTag tag) { return elementName; } - private AttributeMapping loadAttribute(JavaDocBuilder builder, BeanProperty beanProperty) { - Type listType = builder.getClassByName("java.util.List").asType(); - AttributeMapping attributeMapping = null; + private AttributeMapping loadAttribute(BeanProperty beanProperty, String defaultDescription) { + DocletTag propertyTag = getPropertyTag(beanProperty); + + if (getBooleanProperty(propertyTag, "hidden")) { + return null; + } + + String attribute = getProperty(propertyTag, "alias", beanProperty.getName()); + String attributeDescription = getAttributeDescription(beanProperty, propertyTag, defaultDescription); + String defaultValue = getProperty(propertyTag, "default"); + boolean fixed = getBooleanProperty(propertyTag, "fixed"); + boolean required = getBooleanProperty(propertyTag, "required"); + String nestedType = getProperty(propertyTag, "nestedType"); + + return new AttributeMapping(attribute, + beanProperty.getName(), + attributeDescription, + toMappingType(beanProperty.getType(), nestedType), + defaultValue, + fixed, + required); + } + + private static DocletTag getPropertyTag(BeanProperty beanProperty) { + JavaMethod accessor = beanProperty.getAccessor(); + if (accessor != null) { + DocletTag propertyTag = accessor.getTagByName(PROPERTY_ANNOTATION); + if (propertyTag != null) { + return propertyTag; + } + } + JavaMethod mutator = beanProperty.getMutator(); + if (mutator != null) { + DocletTag propertyTag = mutator.getTagByName(PROPERTY_ANNOTATION); + if (propertyTag != null) { + return propertyTag; + } + } + return null; + } + + private String getAttributeDescription(BeanProperty beanProperty, DocletTag propertyTag, String defaultDescription) { + String description = getProperty(propertyTag, "description"); + if (description != null && description.trim().length() > 0) { + return description.trim(); + } + JavaMethod accessor = beanProperty.getAccessor(); - DocletTag propertyTag = accessor.getTagByName(PROPERTY_ANNOTATION); - boolean hidden = getBooleanProperty(propertyTag, "hidden"); - if (!hidden) { - String attribute = getProperty(propertyTag, "alias", beanProperty.getName()); - String attributeDescription = getProperty(propertyTag, "description"); - String defaultValue = getProperty(propertyTag, "default"); - boolean fixed = getBooleanProperty(propertyTag, "fixed"); - boolean required = getBooleanProperty(propertyTag, "required"); - boolean list = beanProperty.getType().isA(listType); - attributeMapping = new AttributeMapping(attribute, - beanProperty.getName(), - attributeDescription, - beanProperty.getType().toString(), - primitives.contains(beanProperty.getType().toString()), - beanProperty.getType().isArray(), - beanProperty.getType().getValue(), - list, - defaultValue, - fixed, - required); + if (accessor != null) { + description = accessor.getComment(); + if (description != null && description.trim().length() > 0) { + return description.trim(); + } + } + + JavaMethod mutator = beanProperty.getMutator(); + if (mutator != null) { + description = mutator.getComment(); + if (description != null && description.trim().length() > 0) { + return description.trim(); + } + } + return defaultDescription; + } + + private AttributeMapping loadParameter(JavaParameter parameter) { + String parameterName = parameter.getName(); + String parameterDescription = getParameterDescription(parameter); + + // first attempt to load the attribute from the java beans accessor methods + JavaClass javaClass = parameter.getParentMethod().getParentClass(); + BeanProperty beanProperty = javaClass.getBeanProperty(parameterName); + if (beanProperty != null) { + AttributeMapping attributeMapping = loadAttribute(beanProperty, parameterDescription); + // if the attribute mapping is null, the property was tagged as hidden and this is an error + if (attributeMapping == null) { + throw new InvalidModelException("Hidden property usage: " + + "The construction method " + toMethodLocator(parameter.getParentMethod()) + + " can not use a hidded property " + parameterName); + } + return attributeMapping; + } + + // create an attribute solely based on the parameter information + return new AttributeMapping(parameterName, + parameterName, + parameterDescription, + toMappingType(parameter.getType(), null), + null, + false, + false); + } + + private String getParameterDescription(JavaParameter parameter) { + String parameterName = parameter.getName(); + DocletTag[] tags = parameter.getParentMethod().getTagsByName("param"); + for (int k = 0; k < tags.length; k++) { + DocletTag tag = tags[k]; + if (tag.getParameters()[0].equals(parameterName)) { + String parameterDescription = tag.getValue().trim(); + if (parameterDescription.startsWith(parameterName)) { + parameterDescription = parameterDescription.substring(parameterName.length()).trim(); + } + return parameterDescription; + } + } + return null; + } + + private boolean isValidConstructor(String factoryMethod, JavaMethod method, JavaParameter[] parameters) { + if (!method.isPublic() || parameters.length == 0) { + return false; + } + + if (factoryMethod == null) { + return method.isConstructor(); + } else { + return method.getName().equals(factoryMethod); } - return attributeMapping; } private static String getProperty(DocletTag propertyTag, String propertyName) { @@ -330,18 +400,34 @@ private static boolean toBoolean(String value) { return false; } - private static final Set primitives; - - static { - Set set = new HashSet(); - set.add("boolean"); - set.add("byte"); - set.add("char"); - set.add("short"); - set.add("int"); - set.add("long"); - set.add("float"); - set.add("double"); - primitives = Collections.unmodifiableSet(set); + private org.xbean.spring.generator.Type toMappingType(Type type, String nestedType) { + if (type.isArray()) { + return org.xbean.spring.generator.Type.newArrayType(type.getValue(), type.getDimensions()); + } else if (type.isA(listType)) { + if (nestedType == null) nestedType = "java.lang.Object"; + return org.xbean.spring.generator.Type.newCollectionType(type.getValue(), + org.xbean.spring.generator.Type.newSimpleType(nestedType)); + } else { + return org.xbean.spring.generator.Type.newSimpleType(type.getValue()); + } + } + + private static String toMethodLocator(JavaMethod method) { + StringBuffer buf = new StringBuffer(); + buf.append(method.getParentClass().getFullyQualifiedName()); + if (!method.isConstructor()) { + buf.append(".").append(method.getName()); + } + buf.append("("); + JavaParameter[] parameters = method.getParameters(); + for (int i = 0; i < parameters.length; i++) { + JavaParameter parameter = parameters[i]; + if (i > 0) { + buf.append(", "); + } + buf.append(parameter.getName()); + } + buf.append(") : ").append(method.getLineNumber()); + return buf.toString(); } } diff --git a/spring/src/java/org/xbean/spring/generator/Type.java b/spring/src/java/org/xbean/spring/generator/Type.java new file mode 100644 index 00000000..3dbfa0ab --- /dev/null +++ b/spring/src/java/org/xbean/spring/generator/Type.java @@ -0,0 +1,102 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import java.util.Set; +import java.util.HashSet; +import java.util.Collections; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class Type { + private final String name; + private final Type nestedType; + private final boolean primitive; + + public static Type newSimpleType(String name) { + if (name == null) throw new NullPointerException("type"); + if (name.indexOf("[") >= 0 || name.indexOf("]") >= 0) { + throw new IllegalArgumentException("Name can not contain '[' or ']' " + name); + } + return new Type(name, null); + } + + public static Type newArrayType(String type, int dimensions) { + if (type == null) throw new NullPointerException("type"); + if (dimensions < 1) throw new IllegalArgumentException("dimensions must be atleast one"); + StringBuffer buf = new StringBuffer(type.length() + (dimensions * 2)); + buf.append(type); + for (int i = 0; i < dimensions; i ++) { + buf.append("[]"); + } + return new Type(buf.toString(), newSimpleType(type)); + } + + public static Type newCollectionType(String collectionType, Type elementType) { + if (collectionType == null) throw new NullPointerException("collectionType"); + if (elementType == null) throw new NullPointerException("elementType"); + return new Type(collectionType, elementType); + } + + private Type(String name, Type nestedType) { + this.name = name; + this.nestedType = nestedType; + primitive = (nestedType == null) && primitives.contains(name); + } + + public String getName() { + return name; + } + + public Type getNestedType() { + return nestedType; + } + + public boolean isCollection() { + return nestedType != null; + } + + public boolean isPrimitive() { + return primitive; + } + + public int hashCode() { + return super.hashCode(); + } + + public boolean equals(Object obj) { + return super.equals(obj); + } + + private static final Set primitives; + + static { + Set set = new HashSet(); + set.add("boolean"); + set.add("byte"); + set.add("char"); + set.add("short"); + set.add("int"); + set.add("long"); + set.add("float"); + set.add("double"); + primitives = Collections.unmodifiableSet(set); + } +} diff --git a/spring/src/java/org/xbean/spring/generator/Utils.java b/spring/src/java/org/xbean/spring/generator/Utils.java index 02cb6e0d..8ab3b81c 100644 --- a/spring/src/java/org/xbean/spring/generator/Utils.java +++ b/spring/src/java/org/xbean/spring/generator/Utils.java @@ -21,6 +21,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.List; +import java.util.ArrayList; +import java.util.Iterator; /** * @author Dain Sundstrom @@ -41,18 +44,20 @@ public static String decapitalise(String value) { return value.substring(0, 1).toLowerCase() + value.substring(1); } - public static boolean isSimpleType(AttributeMapping attributeMapping) { - if (attributeMapping.isPrimitive()) { + public static boolean isSimpleType(Type type) { + if (type.isPrimitive()) { return true; } - String type = attributeMapping.getType(); - if (type.equals("javax.xml.namespace.QName")) { - return true; - } - if (attributeMapping.isArray()) { + if (type.isCollection()) { return false; } - return hasPropertyEditor(type); + + String name = type.getName(); + if (name.equals("java.lang.Class") || + name.equals("javax.xml.namespace.QName")) { + return true; + } + return hasPropertyEditor(name); } private static boolean hasPropertyEditor(String type) { @@ -83,9 +88,9 @@ private static Class loadClass(String name) throws ClassNotFoundException { return Utils.class.getClassLoader().loadClass(name); } - public static String getXsdType(AttributeMapping attributeMapping) { - String typeName = attributeMapping.getType(); - String xsdType = (String) XSD_TYPES.get(typeName); + public static String getXsdType(Type type) { + String name = type.getName(); + String xsdType = (String) XSD_TYPES.get(name); if (xsdType == null) { xsdType = "xsd:string"; } @@ -117,4 +122,16 @@ public static String getXsdType(AttributeMapping attributeMapping) { map.put("javax.xml.namespace.QName", "xs:QName"); XSD_TYPES = Collections.unmodifiableMap(map); } + + public static List findImplementationsOf(NamespaceMapping namespaceMapping, Type type) { + List elements = new ArrayList(); + String nestedTypeName = type.getName(); + for (Iterator iter = namespaceMapping.getElements().iterator(); iter.hasNext();) { + ElementMapping element = (ElementMapping) iter.next(); + if (nestedTypeName.equals(element.getClassName())) { + elements.add(element); + } + } + return elements; + } } diff --git a/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java b/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java index ca5e142e..6b3b43cc 100644 --- a/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java @@ -111,7 +111,7 @@ private void generatePropertiesFileConstructor(PrintWriter out, ElementMapping e out.print("("); for (Iterator iterator = args.iterator(); iterator.hasNext();) { AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); - out.print(attributeMapping.getType()); + out.print(attributeMapping.getType().getName()); if (iterator.hasNext()) { out.print(","); } diff --git a/spring/src/java/org/xbean/spring/generator/XsdGenerator.java b/spring/src/java/org/xbean/spring/generator/XsdGenerator.java index 92daabdf..44fab07f 100644 --- a/spring/src/java/org/xbean/spring/generator/XsdGenerator.java +++ b/spring/src/java/org/xbean/spring/generator/XsdGenerator.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Iterator; +import java.util.List; +import java.util.Collections; /** * @author Dain Sundstrom @@ -78,7 +80,7 @@ private void generateElementMapping(PrintWriter out, NamespaceMapping namespaceM int complexCount = 0; for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); - if (!Utils.isSimpleType(attributeMapping)) { + if (!Utils.isSimpleType(attributeMapping.getType())) { complexCount++; } } @@ -86,7 +88,7 @@ private void generateElementMapping(PrintWriter out, NamespaceMapping namespaceM out.println(" "); for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); - if (!Utils.isSimpleType(attributeMapping)) { + if (!Utils.isSimpleType(attributeMapping.getType())) { generateElementMappingComplexProperty(out, namespaceMapping, attributeMapping); } } @@ -95,20 +97,20 @@ private void generateElementMapping(PrintWriter out, NamespaceMapping namespaceM for (Iterator iterator = element.getAttributes().iterator(); iterator.hasNext();) { AttributeMapping attributeMapping = (AttributeMapping) iterator.next(); - if (Utils.isSimpleType(attributeMapping)) { + if (Utils.isSimpleType(attributeMapping.getType())) { generateElementMappingSimpleProperty(out, attributeMapping); - } else { + } else if (!attributeMapping.getType().isCollection()) { generateElementMappingComplexPropertyAsRef(out, attributeMapping); } } - out.println(" "); + out.println(" "); out.println(" "); out.println(" "); out.println(); } private void generateElementMappingSimpleProperty(PrintWriter out, AttributeMapping attributeMapping) { - out.println(" "); + out.println(" "); } private void generateElementMappingComplexPropertyAsRef(PrintWriter out, AttributeMapping attributeMapping) { @@ -116,25 +118,29 @@ private void generateElementMappingComplexPropertyAsRef(PrintWriter out, Attribu } private void generateElementMappingComplexProperty(PrintWriter out, NamespaceMapping namespaceMapping, AttributeMapping attributeMapping) { - out.println(" "); - // Check if this is an array of known elements - boolean found = false; - if (attributeMapping.isArray()) { - for (Iterator iter = namespaceMapping.getElements().iterator(); iter.hasNext();) { - ElementMapping elem = (ElementMapping) iter.next(); - if (elem.getClassName().equals(attributeMapping.getArrayType())) { - out.println(" "); - found = true; - break; - } - } - + Type type = attributeMapping.getType(); + List types; + if (type.isCollection()) { + types = Utils.findImplementationsOf(namespaceMapping, type.getNestedType()); + } else { + types = Utils.findImplementationsOf(namespaceMapping, type); } - // Else, use an xs:any to allow extension - if (!found) { - out.println(" "); + types = Collections.EMPTY_LIST; + String maxOccurs = type.isCollection() ? "unbounded" : "1"; + + out.println(" "); + out.println(" "); + if (types.isEmpty()) { + out.println(" "); + } else { + out.println(" "); + for (Iterator iterator = types.iterator(); iterator.hasNext();) { + ElementMapping element = (ElementMapping) iterator.next(); + out.println(" "); + } + out.println(" "); } - out.println(" "); + out.println(" "); + out.println(" "); } - } diff --git a/spring/src/test/org/xbean/spring/example/GinService.java b/spring/src/test/org/xbean/spring/example/GinService.java index 97749993..1749eec0 100644 --- a/spring/src/test/org/xbean/spring/example/GinService.java +++ b/spring/src/test/org/xbean/spring/example/GinService.java @@ -18,6 +18,7 @@ package org.xbean.spring.example; /** + * Gin is made from the distillation of white grain spirit and juniper berries. * @org.xbean.XBean element="gin" contentProperty="name" * * @version $Revision: 1.1 $ diff --git a/spring/src/test/org/xbean/spring/example/RestaurantService.java b/spring/src/test/org/xbean/spring/example/RestaurantService.java index f2862180..e47facc2 100644 --- a/spring/src/test/org/xbean/spring/example/RestaurantService.java +++ b/spring/src/test/org/xbean/spring/example/RestaurantService.java @@ -40,6 +40,9 @@ public class RestaurantService { private QName serviceName; private URI uri; + /** + * @org.xbean.Property nestedType="org.xbean.spring.example.PizzaService" + */ public List getDinnerMenu() { return dinnerMenu; } diff --git a/spring/src/test/org/xbean/spring/example/SaladService.java b/spring/src/test/org/xbean/spring/example/SaladService.java index 88ecab8d..7c456ef7 100644 --- a/spring/src/test/org/xbean/spring/example/SaladService.java +++ b/spring/src/test/org/xbean/spring/example/SaladService.java @@ -17,6 +17,7 @@ package org.xbean.spring.example; /** + * Basic salad. * @org.xbean.XBean * * @author Dain Sundstrom @@ -36,14 +37,24 @@ public SaladService(String dressing, String size, boolean crouton) { this.crouton = crouton; } + /** + * Dressing What type of dressing do you want? + */ public String getDressing() { return dressing; } + /** + * What size do you want? + */ public String getSize() { return size; } + /** + * Do you want crutons on that? + * @org.xbean.Property alias="addCroutons" + */ public boolean isCrouton() { return crouton; } diff --git a/spring/src/test/org/xbean/spring/example/SoupService.java b/spring/src/test/org/xbean/spring/example/SoupService.java index 73ec0b1c..602f945d 100644 --- a/spring/src/test/org/xbean/spring/example/SoupService.java +++ b/spring/src/test/org/xbean/spring/example/SoupService.java @@ -69,6 +69,9 @@ public boolean exists() { return exists; } + /** + * What type of soup would you like? + */ public String getType() { return type; } diff --git a/spring/src/test/org/xbean/spring/generator/ModelTest.java b/spring/src/test/org/xbean/spring/generator/ModelTest.java new file mode 100644 index 00000000..583dd903 --- /dev/null +++ b/spring/src/test/org/xbean/spring/generator/ModelTest.java @@ -0,0 +1,77 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.generator; + +import junit.framework.TestCase; + +import java.io.File; +import java.util.Iterator; +import java.util.Set; +import java.util.List; +import java.util.LinkedList; +import java.util.Arrays; +import java.util.StringTokenizer; +import java.util.Collections; +import java.beans.PropertyEditorManager; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 1.0 + */ +public class ModelTest extends TestCase { + private static final String DEFAULT_NAMESPACE = "http://xbean.org/test"; + + public void testQdox() throws Exception{ + QdoxMappingLoader mappingLoader = new QdoxMappingLoader(DEFAULT_NAMESPACE, new File[] { new File("src/test")}); + Set namespaces = mappingLoader.loadNamespaces(); + validateModel(namespaces); + } + + private void validateModel(Set namespaces) { + assertFalse(namespaces.isEmpty()); + + NamespaceMapping defaultNamespace = null; + for (Iterator iterator = namespaces.iterator(); iterator.hasNext();) { + NamespaceMapping namespaceMapping = (NamespaceMapping) iterator.next(); + if (namespaceMapping.getNamespace().equals(DEFAULT_NAMESPACE)) { + defaultNamespace = namespaceMapping; + break; + } + } + assertNotNull(defaultNamespace); + ElementMapping element = defaultNamespace.getElement("pizza"); + assertNotNull(element); + AttributeMapping attribute = element.getAttribute("myTopping"); + assertNotNull(attribute); + assertEquals("topping", attribute.getPropertyName()); + + ElementMapping beer = defaultNamespace.getElement("beer"); + assertNotNull(beer); + AttributeMapping beerId = beer.getAttribute("id"); + assertNotNull(beerId); + AttributeMapping beerName = beer.getAttribute("name"); + assertNotNull(beerName); + } + + public void testPropertyEditor() { + List editorSearchPath = new LinkedList(Arrays.asList(PropertyEditorManager.getEditorSearchPath())); + editorSearchPath.add("org.xbean.spring.context.impl"); + PropertyEditorManager.setEditorSearchPath((String[]) editorSearchPath.toArray(new String[editorSearchPath.size()])); + assertTrue(Utils.isSimpleType(Type.newSimpleType("java.net.URI"))); + } +} From 9f8e93eb7231ba70359f6a6efb21d373a9341f6f Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Mon, 31 Oct 2005 22:11:30 +0000 Subject: [PATCH 034/736] Initial maven 2 build git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380453 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 87 +------ .../xbean/classpath/SystemClassPathTest.java | 5 +- jmx/pom.xml | 45 ++++ kernel/pom.xml | 109 ++------- pom.xml | 221 ++++++++++++++++++ server/pom.xml | 41 ++++ spring/pom.xml | 53 +++++ telnet/pom.xml | 87 +------ 8 files changed, 392 insertions(+), 256 deletions(-) create mode 100644 jmx/pom.xml create mode 100644 pom.xml create mode 100644 server/pom.xml create mode 100644 spring/pom.xml diff --git a/classpath/pom.xml b/classpath/pom.xml index dabacde2..fe5a8975 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -15,84 +15,13 @@ * limitations under the License. --> - - 4.0.0 - - XBean :: ClassPath - xbean-classpath - xbean - 2.0-alpha-1-SNAPSHOT - - XBean - http://xbean.org - - - - - openejb - OpenEJB Repo - http://www.openejb.org/maven - legacy - - - - http://www.xbean.org/ - - - - repo1 - Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 - - - website - scp://minotaur.apache.org/www/maven.apache.org/maven2/ - - - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - David Blevins - dblevins - dblevins@visi.com - - Dude - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - - + + org.xbean + xbean + 2.0-SNAPSHOT + + 4.0.0 + xbean-classpath + XBean :: ClassPath diff --git a/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java b/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java index 8a8ecafe..33b56162 100644 --- a/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java +++ b/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java @@ -4,10 +4,7 @@ * @version $Revision$ $Date$ */ -import junit.framework.*; -import org.xbean.classpath.SystemClassPath; - -import java.net.URL; +import junit.framework.TestCase; public class SystemClassPathTest extends TestCase { diff --git a/jmx/pom.xml b/jmx/pom.xml new file mode 100644 index 00000000..540235ab --- /dev/null +++ b/jmx/pom.xml @@ -0,0 +1,45 @@ + + + + + org.xbean + xbean + 2.0-SNAPSHOT + + 4.0.0 + xbean-classpath + XBean :: JMX + + + commons-logging + commons-logging + + + mx4j + mx4j + + + xbean + xbean-kernel + + + xbean + xbean-spring + + + + diff --git a/kernel/pom.xml b/kernel/pom.xml index d4735575..0809763e 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -15,99 +15,20 @@ * limitations under the License. --> - - 4.0.0 - - XBean :: Kernel - xbean-kernel - xbean - 2.0-alpha-1-SNAPSHOT - - XBean - http://xbean.org - - - - - openejb - OpenEJB Repo - http://www.openejb.org/maven - legacy - - - - - XBean is a kernel architecture and server for ioc containers such as spring. - - - http://www.xbean.org/ - - - - repo1 - Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 - - - website - scp://minotaur.apache.org/www/maven.apache.org/maven2/ - - - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - Dain Sundstrom - dain - dain@iq80.com - - Despot - - - - - - - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd - - - junit - junit - 3.8.1 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - - + + org.xbean + xbean + 2.0-SNAPSHOT + + 4.0.0 + xbean-kernel + XBean :: Kernel + + + backport-util-concurrent + backport-util-concurrent + 2.0_01_pd + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..8e14ac27 --- /dev/null +++ b/pom.xml @@ -0,0 +1,221 @@ + + + + 4.0.0 + org.xbean + xbean + pom + XBean + 2.0-SNAPSHOT + XBean is a plugin based server archtecutre. + http://xbean.org + + + jira + http://jira.codehaus.org/browse/XB + + + + continuum + + + mail + + +
dev@xbean.org
+ + + + + + + xbean developers + mailto:dev-subscribe@xbean.org + mailto:dev-unsubscribe@xbean.org + + + xbean users + mailto:user-subscribe@xbean.org + mailto:user-unsubscribe@xbean.org + + + xbean source control messages + mailto:scm-subscribe@xbean.org + mailto:scm-unsubscribe@xbean.org + + + + + + adc + Alan D. Cabrera + + Commiter + + -8 + + + dain + Dain Sundstrom + dain@iq80.com + + Commiter + Despot + + -8 + + + dblevins + David Blevins + dblevins@visi.com + + Commiter + + -8 + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:svn:https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ + https://svn.codehaus.org/xbean/trunk/ + + + + XBean + http://xbean.org/ + + + + + + ant + ant + 1.6.2 + + + backport-util-concurrent + backport-util-concurrent + 2.0_01_pd + + + cglib + cglib-nodep + 2.1_2 + + + commons-logging + commons-logging + 1.0.3 + + + groovy + groovy + 1.0-jsr-03 + + + mx4j + mx4j + 3.0.1 + + + qdox + qdox + 1.5 + + + springframework + spring + 1.2.4 + + + stax + stax-api + 1.0 + test + + + xbean + xbean-kernel + 2.0-SNAPSHOT + + + xbean + xbean-spring + 2.0-SNAPSHOT + + + + + + + junit + junit + 3.8.1 + test + + + + + + repo1 + Maven Central Repository + scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 + + + snapshots + Maven Central Development Repository + scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2 + + + website + scp://www.xbean.org/home/projects/xbean/public_html/maven/ + + + + + classpath + jmx + kernel + server + spring + telnet + + + + src/java + src/test + + + + + + + + + + + + diff --git a/server/pom.xml b/server/pom.xml new file mode 100644 index 00000000..d68765ad --- /dev/null +++ b/server/pom.xml @@ -0,0 +1,41 @@ + + + + + org.xbean + xbean + 2.0-SNAPSHOT + + 4.0.0 + xbean-server + XBean :: Server + + + commons-logging + commons-logging + + + xbean + xbean-kernel + + + xbean + xbean-spring + + + + diff --git a/spring/pom.xml b/spring/pom.xml new file mode 100644 index 00000000..d387e7bf --- /dev/null +++ b/spring/pom.xml @@ -0,0 +1,53 @@ + + + + + org.xbean + xbean + 2.0-SNAPSHOT + + 4.0.0 + xbean-spring + XBean :: Spring + + + ant + ant + + + commons-logging + commons-logging + + + mx4j + mx4j + + + qdox + qdox + + + springframework + spring + + + stax + stax-api + + + + diff --git a/telnet/pom.xml b/telnet/pom.xml index 5a77d7e4..6fd46cb5 100644 --- a/telnet/pom.xml +++ b/telnet/pom.xml @@ -15,84 +15,13 @@ * limitations under the License. --> - - 4.0.0 - - XBean :: Telnet - xbean-telent - xbean - 2.0-alpha-1-SNAPSHOT - - XBean - http://xbean.org - - - - - openejb - OpenEJB Repo - http://www.openejb.org/maven - legacy - - - - http://www.xbean.org/ - - - - repo1 - Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 - - - website - scp://minotaur.apache.org/www/maven.apache.org/maven2/ - - - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - David Blevins - dblevins - dblevins@visi.com - - Dude - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - - + + org.xbean + xbean + 2.0-SNAPSHOT + + 4.0.0 + xbean-telnet + XBean :: telnet From b7a4859b0e2f7c6bbede9bc0b9d79a2e552c2481 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 00:00:18 +0000 Subject: [PATCH 035/736] Removed invalid declaration in stax dependency declaration. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380454 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e14ac27..d37b0ac4 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,6 @@ stax stax-api 1.0 - test xbean From 0c65470f19fa1fd7aa7d189f1f4189ac09678714 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 00:26:46 +0000 Subject: [PATCH 036/736] Changed all groupId entries to org.xbean git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380455 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 4 ++-- pom.xml | 4 ++-- server/pom.xml | 4 ++-- telnet/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jmx/pom.xml b/jmx/pom.xml index 540235ab..07b18744 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -33,11 +33,11 @@ mx4j - xbean + org.xbean xbean-kernel - xbean + org.xbean xbean-spring diff --git a/pom.xml b/pom.xml index d37b0ac4..48c45b61 100644 --- a/pom.xml +++ b/pom.xml @@ -156,12 +156,12 @@ 1.0 - xbean + org.xbean xbean-kernel 2.0-SNAPSHOT - xbean + org.xbean xbean-spring 2.0-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index d68765ad..544b7a57 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -29,11 +29,11 @@ commons-logging - xbean + org.xbean xbean-kernel - xbean + org.xbean xbean-spring diff --git a/telnet/pom.xml b/telnet/pom.xml index 6fd46cb5..ae2a0a3b 100644 --- a/telnet/pom.xml +++ b/telnet/pom.xml @@ -22,6 +22,6 @@ 4.0.0 xbean-telnet - XBean :: telnet + XBean :: Telnet From ab3e3446eff6e5dab3dd4947337da2394afc514c Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Tue, 1 Nov 2005 00:39:15 +0000 Subject: [PATCH 037/736] git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380456 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/project.xml | 2 +- jmx/project.xml | 6 +++--- kernel/project.xml | 2 +- pom.xml | 4 ++-- project.xml | 2 +- server/project.xml | 6 +++--- spring/project.xml | 2 +- telnet/project.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/classpath/project.xml b/classpath/project.xml index 8616727a..a3eed826 100644 --- a/classpath/project.xml +++ b/classpath/project.xml @@ -20,7 +20,7 @@ XBean :: ClassPath xbean-classpath - xbean + org.xbean 2.0-SNAPSHOT XBean.org diff --git a/jmx/project.xml b/jmx/project.xml index 6c7f72b2..1f4779c9 100644 --- a/jmx/project.xml +++ b/jmx/project.xml @@ -20,7 +20,7 @@ XBean :: JMX xbean-jmx - xbean + org.xbean 2.0-SNAPSHOT XBean.org @@ -92,12 +92,12 @@ test - xbean + org.xbean xbean-kernel 2.0-SNAPSHOT - xbean + org.xbean xbean-spring 2.0-SNAPSHOT diff --git a/kernel/project.xml b/kernel/project.xml index d70d9388..27610abe 100644 --- a/kernel/project.xml +++ b/kernel/project.xml @@ -20,7 +20,7 @@ XBean :: Kernel xbean-kernel - xbean + org.xbean 2.0-SNAPSHOT XBean.org diff --git a/pom.xml b/pom.xml index 48c45b61..8a3b781a 100644 --- a/pom.xml +++ b/pom.xml @@ -158,12 +158,12 @@ org.xbean xbean-kernel - 2.0-SNAPSHOT + ${version} org.xbean xbean-spring - 2.0-SNAPSHOT + ${version} diff --git a/project.xml b/project.xml index d9ccd07c..68c33b4f 100644 --- a/project.xml +++ b/project.xml @@ -19,7 +19,7 @@ XBean xbean - xbean + org.xbean 2.0-SNAPSHOT XBean.org diff --git a/server/project.xml b/server/project.xml index b04153b7..58140fb3 100644 --- a/server/project.xml +++ b/server/project.xml @@ -20,7 +20,7 @@ XBean :: Server xbean-server - xbean + org.xbean 2.0-SNAPSHOT XBean.org @@ -92,12 +92,12 @@ test - xbean + org.xbean xbean-kernel 2.0-SNAPSHOT - xbean + org.xbean xbean-spring 2.0-SNAPSHOT diff --git a/spring/project.xml b/spring/project.xml index ab59f634..e4e72b67 100644 --- a/spring/project.xml +++ b/spring/project.xml @@ -20,7 +20,7 @@ XBean :: Spring xbean-spring - xbean + org.xbean 2.0-SNAPSHOT XBean.org diff --git a/telnet/project.xml b/telnet/project.xml index 2875a3ed..0d51066c 100644 --- a/telnet/project.xml +++ b/telnet/project.xml @@ -20,7 +20,7 @@ XBean :: Telnet xbean-telnet - xbean + org.xbean 2.0-SNAPSHOT XBean.org From f7b6d524a5732b5578d37854156e6f6d75ff7937 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Tue, 1 Nov 2005 00:42:46 +0000 Subject: [PATCH 038/736] Global replace is evil. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380457 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/project.xml | 2 +- jmx/project.xml | 6 +++--- kernel/project.xml | 2 +- project.xml | 2 +- server/project.xml | 6 +++--- spring/project.xml | 2 +- telnet/project.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/classpath/project.xml b/classpath/project.xml index a3eed826..8616727a 100644 --- a/classpath/project.xml +++ b/classpath/project.xml @@ -20,7 +20,7 @@ XBean :: ClassPath xbean-classpath - org.xbean + xbean 2.0-SNAPSHOT XBean.org diff --git a/jmx/project.xml b/jmx/project.xml index 1f4779c9..6c7f72b2 100644 --- a/jmx/project.xml +++ b/jmx/project.xml @@ -20,7 +20,7 @@ XBean :: JMX xbean-jmx - org.xbean + xbean 2.0-SNAPSHOT XBean.org @@ -92,12 +92,12 @@ test - org.xbean + xbean xbean-kernel 2.0-SNAPSHOT - org.xbean + xbean xbean-spring 2.0-SNAPSHOT diff --git a/kernel/project.xml b/kernel/project.xml index 27610abe..d70d9388 100644 --- a/kernel/project.xml +++ b/kernel/project.xml @@ -20,7 +20,7 @@ XBean :: Kernel xbean-kernel - org.xbean + xbean 2.0-SNAPSHOT XBean.org diff --git a/project.xml b/project.xml index 68c33b4f..d9ccd07c 100644 --- a/project.xml +++ b/project.xml @@ -19,7 +19,7 @@ XBean xbean - org.xbean + xbean 2.0-SNAPSHOT XBean.org diff --git a/server/project.xml b/server/project.xml index 58140fb3..b04153b7 100644 --- a/server/project.xml +++ b/server/project.xml @@ -20,7 +20,7 @@ XBean :: Server xbean-server - org.xbean + xbean 2.0-SNAPSHOT XBean.org @@ -92,12 +92,12 @@ test - org.xbean + xbean xbean-kernel 2.0-SNAPSHOT - org.xbean + xbean xbean-spring 2.0-SNAPSHOT diff --git a/spring/project.xml b/spring/project.xml index e4e72b67..ab59f634 100644 --- a/spring/project.xml +++ b/spring/project.xml @@ -20,7 +20,7 @@ XBean :: Spring xbean-spring - org.xbean + xbean 2.0-SNAPSHOT XBean.org diff --git a/telnet/project.xml b/telnet/project.xml index 0d51066c..2875a3ed 100644 --- a/telnet/project.xml +++ b/telnet/project.xml @@ -20,7 +20,7 @@ XBean :: Telnet xbean-telnet - org.xbean + xbean 2.0-SNAPSHOT XBean.org From c06ecd608700a5a1d16363b667e5a08286b3438a Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 03:19:02 +0000 Subject: [PATCH 039/736] M2 build works now Disabled telnet module until the groovy pom on ibilio is fixed (see http://jira.codehaus.org/browse/MEV-163) git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380458 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 57 +++++++++++++++++ pom.xml | 20 ++---- server/pom.xml | 61 +++++++++++++++++++ .../spring/loader/SpringLoaderTest.java | 19 +++--- .../spring/main/SpringBootstrapTest.java | 8 +-- spring/pom.xml | 59 ++++++++++++++++++ .../org/xbean/spring/generator/ModelTest.java | 5 +- telnet/pom.xml | 6 ++ 8 files changed, 205 insertions(+), 30 deletions(-) diff --git a/jmx/pom.xml b/jmx/pom.xml index 07b18744..902a626a 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -41,5 +41,62 @@ xbean-spring + + + + + maven-antrun-plugin + + + process-classes + + + + + + + + + + + + + + + + + + run + + + + + + + + + src/resources + + + + + + target/generated + + META-INF/**/* + + + + src/test + + META-INF/**/* + **/*.x* + + + + diff --git a/pom.xml b/pom.xml index 8a3b781a..5cda4332 100644 --- a/pom.xml +++ b/pom.xml @@ -132,8 +132,8 @@ groovy - groovy - 1.0-jsr-03 + groovy-1.0-jsr + 03 mx4j @@ -200,21 +200,13 @@ kernel server spring - telnet + + + src/java src/test - - - - - - - - - - - + diff --git a/server/pom.xml b/server/pom.xml index 544b7a57..ce264594 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -24,6 +24,11 @@ xbean-server XBean :: Server + + cglib + cglib-nodep + test + commons-logging commons-logging @@ -37,5 +42,61 @@ xbean-spring + + + + maven-antrun-plugin + + + process-classes + + + + + + + + + + + + + + + + + + run + + + + + + + + + src/resources + + + + + + target/generated + + META-INF/**/* + + + + src/test + + META-INF/**/* + **/*.x* + + + + diff --git a/server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java b/server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java index 20a7ad91..be8a5ac2 100644 --- a/server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java +++ b/server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java @@ -48,6 +48,7 @@ * @since 2.0 */ public class SpringLoaderTest extends TestCase { + private static final String basedir = System.getProperties().getProperty("basedir", "."); private static final String CLASS_NAME = "TestClass"; private static final String ENTRY_NAME = "foo"; private static final String ENTRY_VALUE = "bar"; @@ -57,16 +58,16 @@ public void testLoad() throws Exception{ Kernel kernel = KernelFactory.newInstance().createKernel("test"); try { - File baseDir = new File("src/test/org/xbean/server/spring/loader/").getAbsoluteFile(); - System.setProperty("xbean.base.dir", baseDir.getAbsolutePath()); + File xbeanDir = new File(basedir, "src/test/org/xbean/server/spring/loader/").getAbsoluteFile(); + System.setProperty("xbean.base.dir", xbeanDir.getAbsolutePath()); - FileSystemRepository repository = new FileSystemRepository(new File(".").getAbsoluteFile()); + FileSystemRepository repository = new FileSystemRepository(new File(basedir).getAbsoluteFile()); ClassLoaderXmlPreprocessor classLoaderXmlPreprocessor = new ClassLoaderXmlPreprocessor(repository); List xmlPreprocessors = Collections.singletonList(classLoaderXmlPreprocessor); SpringLoader springLoader = new SpringLoader(); springLoader.setKernel(kernel); - springLoader.setBaseDir(baseDir); + springLoader.setBaseDir(xbeanDir); springLoader.setXmlPreprocessors(xmlPreprocessors); ServiceName configurationName = springLoader.load("classpath-xbean"); @@ -84,16 +85,16 @@ public void testReload() throws Exception{ Kernel kernel = KernelFactory.newInstance().createKernel("test"); try { - File baseDir = new File("src/test/org/xbean/server/spring/loader/").getAbsoluteFile(); - System.setProperty("xbean.base.dir", baseDir.getAbsolutePath()); + File xbeanDir = new File(basedir, "src/test/org/xbean/server/spring/loader/").getAbsoluteFile(); + System.setProperty("xbean.base.dir", xbeanDir.getAbsolutePath()); - FileSystemRepository repository = new FileSystemRepository(new File(".").getAbsoluteFile()); + FileSystemRepository repository = new FileSystemRepository(new File(basedir).getAbsoluteFile()); ClassLoaderXmlPreprocessor classLoaderXmlPreprocessor = new ClassLoaderXmlPreprocessor(repository); List xmlPreprocessors = Collections.singletonList(classLoaderXmlPreprocessor); SpringLoader springLoader = new SpringLoader(); springLoader.setKernel(kernel); - springLoader.setBaseDir(baseDir); + springLoader.setBaseDir(xbeanDir); springLoader.setXmlPreprocessors(xmlPreprocessors); ServiceName configurationName = springLoader.load("classpath-xbean"); SpringConfigurationServiceFactory serviceFactory = (SpringConfigurationServiceFactory) kernel.getServiceFactory(configurationName); @@ -135,7 +136,7 @@ protected void tearDown() throws Exception { } private static File createJarFile() throws IOException { - File file = new File("target/SpringLoaderTest.jar"); + File file = new File(basedir, "target/SpringLoaderTest.jar"); FileOutputStream out = new FileOutputStream(file); JarOutputStream jarOut = new JarOutputStream(out); diff --git a/server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java b/server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java index 6b84f005..e960c499 100644 --- a/server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java +++ b/server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java @@ -20,7 +20,6 @@ import org.xbean.kernel.Kernel; import org.xbean.kernel.KernelFactory; import org.xbean.server.main.KernelMain; -import org.xbean.server.spring.main.SpringBootstrap; /** * @author Dain Sundstrom @@ -28,17 +27,18 @@ * @since 2.0 */ public class SpringBootstrapTest extends TestCase { + private static final String basedir = System.getProperties().getProperty("basedir", "."); private SpringBootstrap springBootstrap; public void testClasspathBootstrap() throws Exception{ springBootstrap.setConfigurationFile("META-INF/xbean-bootstrap.xml"); - springBootstrap.setServerBaseDirectory("."); + springBootstrap.setServerBaseDirectory(basedir); assertBootable(springBootstrap); } public void testFileBootstrap() throws Exception{ - springBootstrap.setConfigurationFile("src/resources/META-INF/xbean-bootstrap.xml"); - springBootstrap.setServerBaseDirectory("."); + springBootstrap.setConfigurationFile(basedir + "/src/resources/META-INF/xbean-bootstrap.xml"); + springBootstrap.setServerBaseDirectory(basedir); assertBootable(springBootstrap); } diff --git a/spring/pom.xml b/spring/pom.xml index d387e7bf..596c3711 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -49,5 +49,64 @@ stax-api + + + + + maven-antrun-plugin + + + process-classes + + + + + + + + + + + + + + + + + + + + run + + + + + + + + + src/resources + + + + + + target/generated + + META-INF/**/* + + + + src/test + + META-INF/**/* + **/*.x* + + + + diff --git a/spring/src/test/org/xbean/spring/generator/ModelTest.java b/spring/src/test/org/xbean/spring/generator/ModelTest.java index 583dd903..7c7476c2 100644 --- a/spring/src/test/org/xbean/spring/generator/ModelTest.java +++ b/spring/src/test/org/xbean/spring/generator/ModelTest.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.LinkedList; import java.util.Arrays; -import java.util.StringTokenizer; -import java.util.Collections; import java.beans.PropertyEditorManager; /** @@ -37,7 +35,8 @@ public class ModelTest extends TestCase { private static final String DEFAULT_NAMESPACE = "http://xbean.org/test"; public void testQdox() throws Exception{ - QdoxMappingLoader mappingLoader = new QdoxMappingLoader(DEFAULT_NAMESPACE, new File[] { new File("src/test")}); + String basedir = System.getProperties().getProperty("basedir", "."); + QdoxMappingLoader mappingLoader = new QdoxMappingLoader(DEFAULT_NAMESPACE, new File[] { new File(basedir, "/src/test")}); Set namespaces = mappingLoader.loadNamespaces(); validateModel(namespaces); } diff --git a/telnet/pom.xml b/telnet/pom.xml index ae2a0a3b..9c9ea3ec 100644 --- a/telnet/pom.xml +++ b/telnet/pom.xml @@ -23,5 +23,11 @@ 4.0.0 xbean-telnet XBean :: Telnet + + + groovy + groovy-1.0-jsr + + From ba9ef40b71840d987e1df6abe1192e2c406e50ee Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 04:04:20 +0000 Subject: [PATCH 040/736] Add src/main directories for m2 build git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380459 13f79535-47bb-0310-9956-ffa450edef68 From f6a0b8e128f679d38f526e251d482a041a064a7a Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 04:09:35 +0000 Subject: [PATCH 041/736] Added src/test/java directories for m2 build. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380460 13f79535-47bb-0310-9956-ffa450edef68 From e0e3fe55ad65b2f37edc6184866a70052541aef1 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 04:29:17 +0000 Subject: [PATCH 042/736] test resources directory for m2 build git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380461 13f79535-47bb-0310-9956-ffa450edef68 From 7b535bddc01f36d57b1279e4d0a632d59a799b3b Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 04:34:48 +0000 Subject: [PATCH 043/736] For m2 resources git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380462 13f79535-47bb-0310-9956-ffa450edef68 From dc46f3ed04e3eb7f56e5a0e88a765af4dd389efb Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 09:02:48 +0000 Subject: [PATCH 044/736] Final converstion to maven 2 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380463 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/m2-readme.txt | 9 - classpath/maven.xml | 34 ---- classpath/mavenizer.sh | 25 --- classpath/project.properties | 35 ---- classpath/project.xml | 92 ---------- .../java/org/xbean/classpath/ClassPath.java | 0 .../org/xbean/classpath/ClassPathFactory.java | 0 .../org/xbean/classpath/ContextClassPath.java | 0 .../org/xbean/classpath/SunURLClassPath.java | 0 .../org/xbean/classpath/SystemClassPath.java | 0 .../org/xbean/classpath/TomcatClassPath.java | 0 .../classpath/TomcatWebAppClassPath.java | 0 .../xbean/classpath/maven/MavenResolver.java | 0 .../xbean/classpath/SystemClassPathTest.java | 0 jmx/maven.xml | 57 ------ jmx/pom.xml | 26 +-- jmx/project.properties | 35 ---- jmx/project.xml | 168 ------------------ .../java/org/xbean/jmx/EventAdapter.java | 0 .../java/org/xbean/jmx/JMXException.java | 0 .../org/xbean/jmx/JMXServiceException.java | 0 .../java/org/xbean/jmx/JMXServiceMonitor.java | 0 .../java/org/xbean/jmx/JMXStrategyFinder.java | 0 .../org/xbean/jmx/JMXWrappingStrategy.java | 0 .../{ => main}/java/org/xbean/jmx/MBean.java | 0 .../java/org/xbean/jmx/MBeanExporter.java | 0 .../xbean/jmx/config/JMXServiceConfig.java | 0 .../strategies/JavaBeanWrappingStrategy.java | 0 .../org.xbean.jmx.StrategyFinder/javabean | 0 .../{ => java}/org/xbean/jmx/JMXService.java | 0 .../org/xbean/jmx/JMXStrategyFinderTest.java | 0 .../{ => java}/org/xbean/jmx/JMXTest.java | 0 .../{ => java}/org/xbean/jmx/jmx-simple.xml | 0 jmx/src/test/{ => java}/org/xbean/jmx/jmx.xml | 0 .../resources/org/xbean/jmx/jmx-simple.xml | 11 ++ jmx/src/test/resources/org/xbean/jmx/jmx.xml | 17 ++ kernel/converting-gbean.apt | 54 ------ kernel/m2-readme.txt | 9 - kernel/maven.xml | 34 ---- kernel/mavenizer.sh | 25 --- kernel/project.properties | 35 ---- kernel/project.xml | 104 ----------- .../xbean/kernel/AbstractServiceFactory.java | 0 .../org/xbean/kernel/ForcedStopException.java | 0 .../kernel/IllegalServiceStateException.java | 0 .../kernel/InvalidServiceTypeException.java | 0 .../java/org/xbean/kernel/Kernel.java | 0 .../kernel/KernelAlreadyExistsException.java | 0 .../org/xbean/kernel/KernelErrorsError.java | 0 .../java/org/xbean/kernel/KernelFactory.java | 0 .../org/xbean/kernel/KernelFactoryError.java | 0 .../java/org/xbean/kernel/KernelMonitor.java | 0 .../KernelOperationInterruptedException.java | 0 .../KernelOperationTimoutException.java | 0 .../org/xbean/kernel/NullServiceMonitor.java | 0 .../xbean/kernel/RunningServiceCondition.java | 0 .../kernel/ServiceAlreadyExistsException.java | 0 .../org/xbean/kernel/ServiceCondition.java | 0 .../xbean/kernel/ServiceConditionContext.java | 0 .../java/org/xbean/kernel/ServiceContext.java | 0 .../kernel/ServiceContextThreadLocal.java | 0 .../java/org/xbean/kernel/ServiceEvent.java | 0 .../java/org/xbean/kernel/ServiceFactory.java | 0 .../java/org/xbean/kernel/ServiceMonitor.java | 0 .../java/org/xbean/kernel/ServiceName.java | 0 .../kernel/ServiceNotFoundException.java | 0 .../kernel/ServiceRegistrationException.java | 0 .../java/org/xbean/kernel/ServiceState.java | 0 .../org/xbean/kernel/StartStrategies.java | 0 .../java/org/xbean/kernel/StartStrategy.java | 0 .../xbean/kernel/StaticServiceFactory.java | 0 .../java/org/xbean/kernel/StopStrategies.java | 0 .../java/org/xbean/kernel/StopStrategy.java | 0 .../xbean/kernel/StoppedServiceCondition.java | 0 .../org/xbean/kernel/StringServiceName.java | 0 .../kernel/UnregisterServiceException.java | 0 .../UnsatisfiedConditionsException.java | 0 .../java/org/xbean/kernel/package.html | 0 .../kernel/standard/AggregateCondition.java | 0 .../kernel/standard/AsyncServiceMonitor.java | 0 .../standard/KernelMonitorBroadcaster.java | 0 .../standard/NonRestartableStopCondition.java | 0 .../kernel/standard/RegistryFutureTask.java | 0 .../xbean/kernel/standard/ServiceManager.java | 0 .../standard/ServiceManagerFactory.java | 0 .../standard/ServiceManagerRegistry.java | 0 .../standard/ServiceMonitorBroadcaster.java | 0 .../xbean/kernel/standard/StandardKernel.java | 0 .../standard/StandardKernelFactory.java | 0 .../StandardServiceConditionContext.java | 0 .../standard/StandardServiceContext.java | 0 .../org/xbean/kernel/standard/package.html | 0 .../kernel/KernelMonitorBroadcasterTest.java | 0 .../org/xbean/kernel/ServiceStateTest.java | 0 .../kernel/StaticServiceFactoryTest.java | 0 .../xbean/kernel/StringServiceNameTest.java | 0 .../standard/ServiceManagerRegistryTest.java | 0 .../kernel/standard/ServiceManagerTest.java | 0 .../ServiceMonitorBroadcasterTest.java | 0 .../kernel/standard/StandardKernelTest.java | 0 maven.xml | 21 --- pom.xml | 45 +++-- project.properties | 3 - project.xml | 32 ---- server/maven.xml | 56 ------ server/pom.xml | 24 +-- server/project.properties | 35 ---- server/project.xml | 160 ----------------- .../server/classloader/ClassLoaderUtil.java | 0 .../classloader/DestroyableClassLoader.java | 0 .../classloader/JarFileClassLoader.java | 0 .../classloader/MultiParentClassLoader.java | 0 .../server/classloader/NamedClassLoader.java | 0 .../org/xbean/server/loader/LoadAllMain.java | 0 .../java/org/xbean/server/loader/Loader.java | 0 .../xbean/server/main/FatalStartupError.java | 0 .../org/xbean/server/main/KernelMain.java | 0 .../java/org/xbean/server/main/Main.java | 0 .../propertyeditor/InetAddressEditor.java | 0 .../propertyeditor/ObjectNameEditor.java | 0 .../server/propertyeditor/URIEditor.java | 0 .../repository/FileSystemRepository.java | 0 .../xbean/server/repository/Repository.java | 0 .../ClassLoaderXmlPreprocessor.java | 0 .../configuration/SpringConfiguration.java | 0 .../SpringConfigurationServiceFactory.java | 0 .../server/spring/loader/SpringLoader.java | 0 .../server/spring/main/SpringBootstrap.java | 0 .../reference/ClassLoaderReference.java | 0 .../spring/reference/KernelReference.java | 0 .../reference/ServiceNameReference.java | 0 .../reference/ServiceNameStringReference.java | 0 .../resources/META-INF/xbean-bootstrap.xml | 0 .../classloader/JarFileClassLoaderTest.java | 0 .../MultiParentClassLoaderTest.java | 0 .../spring/loader/SpringLoaderTest.java | 4 +- .../spring/main/SpringBootstrapTest.java | 2 +- .../server/spring/loader/classpath-xbean.xml | 0 spring/maven.xml | 54 ------ spring/pom.xml | 24 +-- spring/project.properties | 35 ---- spring/project.xml | 167 ----------------- .../ClassPathXmlApplicationContext.java | 0 .../FileSystemXmlApplicationContext.java | 0 .../ResourceXmlApplicationContext.java | 0 .../context/SpringApplicationContext.java | 0 .../spring/context/SpringXmlPreprocessor.java | 0 .../context/XmlWebApplicationContext.java | 0 .../spring/context/impl/DefaultProperty.java | 0 .../spring/context/impl/MappingMetaData.java | 0 .../context/impl/NamedConstructorArgs.java | 0 .../spring/context/impl/NamespaceHelper.java | 0 .../spring/context/impl/ObjectNameEditor.java | 0 .../context/impl/PropertyEditorHelper.java | 0 .../spring/context/impl/QNameHelper.java | 0 .../context/impl/QNameReflectionHelper.java | 0 .../context/impl/QNameReflectionParams.java | 0 .../xbean/spring/context/impl/URIEditor.java | 0 .../impl/XBeanXmlBeanDefinitionParser.java | 0 .../impl/XBeanXmlBeanDefinitionReader.java | 0 .../spring/generator/AttributeMapping.java | 0 .../generator/DocumentationGenerator.java | 0 .../spring/generator/ElementMapping.java | 0 .../spring/generator/GeneratorPlugin.java | 0 .../generator/InvalidModelException.java | 0 .../org/xbean/spring/generator/LogFacade.java | 0 .../generator/MappingGeneratorTask.java | 0 .../xbean/spring/generator/MappingLoader.java | 0 .../spring/generator/NamespaceMapping.java | 0 .../spring/generator/QdoxMappingLoader.java | 0 .../spring/generator/SchemaGenerator.java | 0 .../java/org/xbean/spring/generator/Type.java | 0 .../org/xbean/spring/generator/Utils.java | 0 .../generator/XmlMetadataGenerator.java | 0 .../org/xbean/spring/generator/XmlWriter.java | 0 .../xbean/spring/generator/XsdGenerator.java | 0 .../spring/util/AbstractSpringVisitor.java | 0 .../org/xbean/spring/util/SpringVisitor.java | 0 .../org/xbean/spring/spring-beans.xsd | 0 .../spring/context/BeerUsingSpringTest.java | 0 .../spring/context/BeerUsingXBeanTest.java | 0 .../spring/context/GinUsingSpringTest.java | 0 .../context}/NamedConstructorArgsTest.java | 0 .../spring/context/PizzaUsingSpringTest.java | 0 .../spring/context/PizzaUsingXBeanTest.java | 0 .../PizzaUsingXBeanWinBeanRefTest.java | 0 .../PizzaUsingXBeanWithJavaNamespaceTest.java | 0 ...aUsingXBeanWithPropertiesTextNodeTest.java | 0 ...singResourceXmlApplicationContextTest.java | 0 .../RestaurantUsingSpringExtendedTest.java | 0 .../context/RestaurantUsingSpringTest.java | 0 .../RestaurantUsingXBeanAsRootTest.java | 0 .../RestaurantUsingXBeanMixedTest.java | 0 .../context/RestaurantUsingXBeanTest.java | 0 ...aurantUsingXBeanWithSimplerConfigTest.java | 0 .../spring/context/SaladUsingSpringTest.java | 0 .../spring/context/SaladUsingXBeanTest.java | 0 .../spring/context/SoupUsingSpringTest.java | 0 .../spring/context/SoupUsingXBeanTest.java | 0 .../spring/context/SpringTestSupport.java | 0 .../spring/context/VodkaUsingSpringTest.java | 0 .../spring/context/VodkaUsingXBeanTest.java | 0 .../spring/context/WineUsingSpringTest.java | 0 .../spring/context/WineUsingXBeanTest.java | 0 .../org/xbean/spring/example/BeerService.java | 0 .../org/xbean/spring/example/GinService.java | 0 .../xbean/spring/example/PizzaService.java | 0 .../spring/example/RestaurantService.java | 0 .../xbean/spring/example/SaladService.java | 0 .../org/xbean/spring/example/SoupService.java | 0 .../xbean/spring/example/VodkaService.java | 0 .../org/xbean/spring/example/WineService.java | 0 .../org/xbean/spring/generator/ModelTest.java | 0 .../http/xbean.org/schemas/pizza-simple | 0 .../spring/http/xbean.org/schemas/restaurant | 0 .../xbean/spring/http/xbean.org/schemas/salad | 0 .../xbean/spring/http/xbean.org/schemas/soup | 0 .../org/xbean/spring/context/beer-normal.xml | 0 .../org/xbean/spring/context/beer-xbean.xml | 0 .../org/xbean/spring/context/gin.xml | 0 .../org/xbean/spring/context/pizza-normal.xml | 0 .../spring/context/pizza-xbean-bean-ref.xml | 0 .../xbean/spring/context/pizza-xbean-java.xml | 0 .../spring/context/pizza-xbean-properties.xml | 0 .../org/xbean/spring/context/pizza-xbean.xml | 0 .../spring/context/restaurant-normal.xml | 0 .../context/restaurant-spring-extended.xml | 0 .../spring/context/restaurant-xbean-mixed.xml | 0 .../spring/context/restaurant-xbean-root.xml | 0 .../context/restaurant-xbean-simple.xml | 0 .../xbean/spring/context/restaurant-xbean.xml | 0 .../org/xbean/spring/context/salad-normal.xml | 0 .../org/xbean/spring/context/salad-xbean.xml | 0 .../org/xbean/spring/context/soup-normal.xml | 0 .../org/xbean/spring/context/soup-xbean.xml | 0 .../org/xbean/spring/context/vodka-normal.xml | 0 .../org/xbean/spring/context/vodka-xbean.xml | 0 .../org/xbean/spring/context/wine-normal.xml | 0 .../org/xbean/spring/context/wine-xbean.xml | 0 telnet/m2-readme.txt | 9 - telnet/maven.xml | 34 ---- telnet/mavenizer.sh | 25 --- telnet/project.properties | 35 ---- telnet/project.xml | 92 ---------- .../java/org/xbean/telnet/Command.java | 0 .../java/org/xbean/telnet/Exit.java | 0 .../java/org/xbean/telnet/GroovySh.java | 0 .../java/org/xbean/telnet/Help.java | 0 .../java/org/xbean/telnet/Lookup.java | 0 .../java/org/xbean/telnet/TelnetCodes.java | 0 .../java/org/xbean/telnet/TelnetDaemon.java | 0 .../org/xbean/telnet/TelnetInputStream.java | 0 .../java/org/xbean/telnet/TelnetOption.java | 0 .../org/xbean/telnet/TelnetPrintStream.java | 0 .../java/org/xbean/telnet/TelnetShell.java | 0 .../java/org/xbean/telnet/Test.java | 0 .../java/org/xbean/telnet/TextConsole.java | 0 .../java/org/xbean/telnet/Version.java | 0 .../org/xbean/telnet/TelnetShellTest.java | 0 259 files changed, 70 insertions(+), 1557 deletions(-) delete mode 100644 classpath/m2-readme.txt delete mode 100644 classpath/maven.xml delete mode 100755 classpath/mavenizer.sh delete mode 100644 classpath/project.properties delete mode 100644 classpath/project.xml rename classpath/src/{ => main}/java/org/xbean/classpath/ClassPath.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/ClassPathFactory.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/ContextClassPath.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/SunURLClassPath.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/SystemClassPath.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/TomcatClassPath.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/TomcatWebAppClassPath.java (100%) rename classpath/src/{ => main}/java/org/xbean/classpath/maven/MavenResolver.java (100%) rename classpath/src/test/{ => java}/org/xbean/classpath/SystemClassPathTest.java (100%) delete mode 100644 jmx/maven.xml delete mode 100644 jmx/project.properties delete mode 100644 jmx/project.xml rename jmx/src/{ => main}/java/org/xbean/jmx/EventAdapter.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/JMXException.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/JMXServiceException.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/JMXServiceMonitor.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/JMXStrategyFinder.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/JMXWrappingStrategy.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/MBean.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/MBeanExporter.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/config/JMXServiceConfig.java (100%) rename jmx/src/{ => main}/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java (100%) rename jmx/src/{ => main}/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean (100%) rename jmx/src/test/{ => java}/org/xbean/jmx/JMXService.java (100%) rename jmx/src/test/{ => java}/org/xbean/jmx/JMXStrategyFinderTest.java (100%) rename jmx/src/test/{ => java}/org/xbean/jmx/JMXTest.java (100%) rename jmx/src/test/{ => java}/org/xbean/jmx/jmx-simple.xml (100%) rename jmx/src/test/{ => java}/org/xbean/jmx/jmx.xml (100%) create mode 100644 jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml create mode 100644 jmx/src/test/resources/org/xbean/jmx/jmx.xml delete mode 100644 kernel/converting-gbean.apt delete mode 100644 kernel/m2-readme.txt delete mode 100644 kernel/maven.xml delete mode 100755 kernel/mavenizer.sh delete mode 100644 kernel/project.properties delete mode 100644 kernel/project.xml rename kernel/src/{ => main}/java/org/xbean/kernel/AbstractServiceFactory.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ForcedStopException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/IllegalServiceStateException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/InvalidServiceTypeException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/Kernel.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelAlreadyExistsException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelErrorsError.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelFactory.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelFactoryError.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelMonitor.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelOperationInterruptedException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/KernelOperationTimoutException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/NullServiceMonitor.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/RunningServiceCondition.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceAlreadyExistsException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceCondition.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceConditionContext.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceContext.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceContextThreadLocal.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceEvent.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceFactory.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceMonitor.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceName.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceNotFoundException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceRegistrationException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/ServiceState.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StartStrategies.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StartStrategy.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StaticServiceFactory.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StopStrategies.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StopStrategy.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StoppedServiceCondition.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/StringServiceName.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/UnregisterServiceException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/UnsatisfiedConditionsException.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/package.html (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/AggregateCondition.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/AsyncServiceMonitor.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/KernelMonitorBroadcaster.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/NonRestartableStopCondition.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/RegistryFutureTask.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/ServiceManager.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/ServiceManagerFactory.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/ServiceManagerRegistry.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/ServiceMonitorBroadcaster.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/StandardKernel.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/StandardKernelFactory.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/StandardServiceConditionContext.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/StandardServiceContext.java (100%) rename kernel/src/{ => main}/java/org/xbean/kernel/standard/package.html (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/KernelMonitorBroadcasterTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/ServiceStateTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/StaticServiceFactoryTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/StringServiceNameTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/standard/ServiceManagerRegistryTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/standard/ServiceManagerTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/standard/ServiceMonitorBroadcasterTest.java (100%) rename kernel/src/test/{ => java}/org/xbean/kernel/standard/StandardKernelTest.java (100%) delete mode 100644 maven.xml delete mode 100644 project.properties delete mode 100644 project.xml delete mode 100644 server/maven.xml delete mode 100644 server/project.properties delete mode 100644 server/project.xml rename server/src/{ => main}/java/org/xbean/server/classloader/ClassLoaderUtil.java (100%) rename server/src/{ => main}/java/org/xbean/server/classloader/DestroyableClassLoader.java (100%) rename server/src/{ => main}/java/org/xbean/server/classloader/JarFileClassLoader.java (100%) rename server/src/{ => main}/java/org/xbean/server/classloader/MultiParentClassLoader.java (100%) rename server/src/{ => main}/java/org/xbean/server/classloader/NamedClassLoader.java (100%) rename server/src/{ => main}/java/org/xbean/server/loader/LoadAllMain.java (100%) rename server/src/{ => main}/java/org/xbean/server/loader/Loader.java (100%) rename server/src/{ => main}/java/org/xbean/server/main/FatalStartupError.java (100%) rename server/src/{ => main}/java/org/xbean/server/main/KernelMain.java (100%) rename server/src/{ => main}/java/org/xbean/server/main/Main.java (100%) rename server/src/{ => main}/java/org/xbean/server/propertyeditor/InetAddressEditor.java (100%) rename server/src/{ => main}/java/org/xbean/server/propertyeditor/ObjectNameEditor.java (100%) rename server/src/{ => main}/java/org/xbean/server/propertyeditor/URIEditor.java (100%) rename server/src/{ => main}/java/org/xbean/server/repository/FileSystemRepository.java (100%) rename server/src/{ => main}/java/org/xbean/server/repository/Repository.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/configuration/SpringConfiguration.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/loader/SpringLoader.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/main/SpringBootstrap.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/reference/ClassLoaderReference.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/reference/KernelReference.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/reference/ServiceNameReference.java (100%) rename server/src/{ => main}/java/org/xbean/server/spring/reference/ServiceNameStringReference.java (100%) rename server/src/{ => main}/resources/META-INF/xbean-bootstrap.xml (100%) rename server/src/test/{ => java}/org/xbean/server/classloader/JarFileClassLoaderTest.java (100%) rename server/src/test/{ => java}/org/xbean/server/classloader/MultiParentClassLoaderTest.java (100%) rename server/src/test/{ => java}/org/xbean/server/spring/loader/SpringLoaderTest.java (96%) rename server/src/test/{ => java}/org/xbean/server/spring/main/SpringBootstrapTest.java (95%) rename server/src/test/{ => resources}/org/xbean/server/spring/loader/classpath-xbean.xml (100%) delete mode 100644 spring/maven.xml delete mode 100644 spring/project.properties delete mode 100644 spring/project.xml rename spring/src/{ => main}/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/ResourceXmlApplicationContext.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/SpringApplicationContext.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/SpringXmlPreprocessor.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/XmlWebApplicationContext.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/DefaultProperty.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/MappingMetaData.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/NamedConstructorArgs.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/NamespaceHelper.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/ObjectNameEditor.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/PropertyEditorHelper.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/QNameHelper.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/QNameReflectionHelper.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/QNameReflectionParams.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/URIEditor.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/AttributeMapping.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/DocumentationGenerator.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/ElementMapping.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/GeneratorPlugin.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/InvalidModelException.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/LogFacade.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/MappingGeneratorTask.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/MappingLoader.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/NamespaceMapping.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/QdoxMappingLoader.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/SchemaGenerator.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/Type.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/Utils.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/XmlMetadataGenerator.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/XmlWriter.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/generator/XsdGenerator.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/util/AbstractSpringVisitor.java (100%) rename spring/src/{ => main}/java/org/xbean/spring/util/SpringVisitor.java (100%) rename spring/src/{java => main/resources}/org/xbean/spring/spring-beans.xsd (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/BeerUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/BeerUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/GinUsingSpringTest.java (100%) rename spring/src/test/{org/xbean/spring/context/impl => java/org/xbean/spring/context}/NamedConstructorArgsTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/PizzaUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/PizzaUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/SaladUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/SaladUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/SoupUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/SoupUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/SpringTestSupport.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/VodkaUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/VodkaUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/WineUsingSpringTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/context/WineUsingXBeanTest.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/BeerService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/GinService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/PizzaService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/RestaurantService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/SaladService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/SoupService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/VodkaService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/example/WineService.java (100%) rename spring/src/test/{ => java}/org/xbean/spring/generator/ModelTest.java (100%) rename spring/src/test/{ => resources}/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza-simple (100%) rename spring/src/test/{ => resources}/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant (100%) rename spring/src/test/{ => resources}/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad (100%) rename spring/src/test/{ => resources}/META-INF/services/org/xbean/spring/http/xbean.org/schemas/soup (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/beer-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/beer-xbean.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/gin.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/pizza-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/pizza-xbean-bean-ref.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/pizza-xbean-java.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/pizza-xbean-properties.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/pizza-xbean.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/restaurant-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/restaurant-spring-extended.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/restaurant-xbean-mixed.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/restaurant-xbean-root.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/restaurant-xbean-simple.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/restaurant-xbean.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/salad-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/salad-xbean.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/soup-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/soup-xbean.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/vodka-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/vodka-xbean.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/wine-normal.xml (100%) rename spring/src/test/{ => resources}/org/xbean/spring/context/wine-xbean.xml (100%) delete mode 100644 telnet/m2-readme.txt delete mode 100644 telnet/maven.xml delete mode 100755 telnet/mavenizer.sh delete mode 100644 telnet/project.properties delete mode 100644 telnet/project.xml rename telnet/src/{ => main}/java/org/xbean/telnet/Command.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/Exit.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/GroovySh.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/Help.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/Lookup.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TelnetCodes.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TelnetDaemon.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TelnetInputStream.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TelnetOption.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TelnetPrintStream.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TelnetShell.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/Test.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/TextConsole.java (100%) rename telnet/src/{ => main}/java/org/xbean/telnet/Version.java (100%) rename telnet/src/test/{ => java}/org/xbean/telnet/TelnetShellTest.java (100%) diff --git a/classpath/m2-readme.txt b/classpath/m2-readme.txt deleted file mode 100644 index 3750464a..00000000 --- a/classpath/m2-readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -Trying Maven 2.x ----------------- - -If you want to try m2 then simply run the mavenizer.sh script which -will produce an "m2" directory. Move into the "m2" directory and - -m2 install - -That should compile, test, package and install diff --git a/classpath/maven.xml b/classpath/maven.xml deleted file mode 100644 index 0872ff3b..00000000 --- a/classpath/maven.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/classpath/mavenizer.sh b/classpath/mavenizer.sh deleted file mode 100755 index 0c9696c3..00000000 --- a/classpath/mavenizer.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -DIR=m2 - -rm -rf $DIR > /dev/null 2>&1 -mkdir $DIR - -cp -r src $DIR -cp pom.xml $DIR - -( - cd $DIR - - find . -name '\.svn' -exec rm -rf {} \; - - ( - cd src - - mkdir main ; mv java main - - ( cd test ; mkdir java ; mv org java ) - - ) - -) diff --git a/classpath/project.properties b/classpath/project.properties deleted file mode 100644 index d8a8fc95..00000000 --- a/classpath/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/classpath/project.xml b/classpath/project.xml deleted file mode 100644 index 8616727a..00000000 --- a/classpath/project.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - 3 - - XBean :: ClassPath - xbean-classpath - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: Classpath and classloader manipulation library - - - Classpath and classloader manipulation library - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - emma - maven-emma-plugin - 0.6 - plugin - - - - - - - - - - src/java - src/test - - - **/*Test.java - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - diff --git a/classpath/src/java/org/xbean/classpath/ClassPath.java b/classpath/src/main/java/org/xbean/classpath/ClassPath.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/ClassPath.java rename to classpath/src/main/java/org/xbean/classpath/ClassPath.java diff --git a/classpath/src/java/org/xbean/classpath/ClassPathFactory.java b/classpath/src/main/java/org/xbean/classpath/ClassPathFactory.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/ClassPathFactory.java rename to classpath/src/main/java/org/xbean/classpath/ClassPathFactory.java diff --git a/classpath/src/java/org/xbean/classpath/ContextClassPath.java b/classpath/src/main/java/org/xbean/classpath/ContextClassPath.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/ContextClassPath.java rename to classpath/src/main/java/org/xbean/classpath/ContextClassPath.java diff --git a/classpath/src/java/org/xbean/classpath/SunURLClassPath.java b/classpath/src/main/java/org/xbean/classpath/SunURLClassPath.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/SunURLClassPath.java rename to classpath/src/main/java/org/xbean/classpath/SunURLClassPath.java diff --git a/classpath/src/java/org/xbean/classpath/SystemClassPath.java b/classpath/src/main/java/org/xbean/classpath/SystemClassPath.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/SystemClassPath.java rename to classpath/src/main/java/org/xbean/classpath/SystemClassPath.java diff --git a/classpath/src/java/org/xbean/classpath/TomcatClassPath.java b/classpath/src/main/java/org/xbean/classpath/TomcatClassPath.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/TomcatClassPath.java rename to classpath/src/main/java/org/xbean/classpath/TomcatClassPath.java diff --git a/classpath/src/java/org/xbean/classpath/TomcatWebAppClassPath.java b/classpath/src/main/java/org/xbean/classpath/TomcatWebAppClassPath.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/TomcatWebAppClassPath.java rename to classpath/src/main/java/org/xbean/classpath/TomcatWebAppClassPath.java diff --git a/classpath/src/java/org/xbean/classpath/maven/MavenResolver.java b/classpath/src/main/java/org/xbean/classpath/maven/MavenResolver.java similarity index 100% rename from classpath/src/java/org/xbean/classpath/maven/MavenResolver.java rename to classpath/src/main/java/org/xbean/classpath/maven/MavenResolver.java diff --git a/classpath/src/test/org/xbean/classpath/SystemClassPathTest.java b/classpath/src/test/java/org/xbean/classpath/SystemClassPathTest.java similarity index 100% rename from classpath/src/test/org/xbean/classpath/SystemClassPathTest.java rename to classpath/src/test/java/org/xbean/classpath/SystemClassPathTest.java diff --git a/jmx/maven.xml b/jmx/maven.xml deleted file mode 100644 index b92e359c..00000000 --- a/jmx/maven.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jmx/pom.xml b/jmx/pom.xml index 902a626a..a26f39c0 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -21,7 +21,7 @@ 2.0-SNAPSHOT 4.0.0 - xbean-classpath + xbean-jmx XBean :: JMX @@ -60,7 +60,7 @@ @@ -75,28 +75,6 @@ - - - - src/resources - - - - - - target/generated - - META-INF/**/* - - - - src/test - - META-INF/**/* - **/*.x* - - - diff --git a/jmx/project.properties b/jmx/project.properties deleted file mode 100644 index a960e0b9..00000000 --- a/jmx/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/mave,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/jmx/project.xml b/jmx/project.xml deleted file mode 100644 index 6c7f72b2..00000000 --- a/jmx/project.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - 3 - - XBean :: JMX - xbean-jmx - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: JMX Services - - - The XBean JMX module contains code that allows configuration of JMX MBeans. - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - commons-logging - commons-logging - 1.0.3 - - - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd - - - cglib - cglib-nodep - 2.1_2 - test - - - mx4j - mx4j - 3.0.1 - - - springframework - spring - 1.2.4 - - - stax - stax-api - 1.0 - test - - - xbean - xbean-kernel - 2.0-SNAPSHOT - - - xbean - xbean-spring - 2.0-SNAPSHOT - - - - - emma - maven-emma-plugin - 0.6 - plugin - - - - - ant - ant - 1.6.2 - - - qdox - qdox - 1.5 - - - - - src/java - - - src/resources - - - src/test - - - - src/test - - **/*.xml - - - - - **/*Test.java - - - - - - - - - - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - - - - diff --git a/jmx/src/java/org/xbean/jmx/EventAdapter.java b/jmx/src/main/java/org/xbean/jmx/EventAdapter.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/EventAdapter.java rename to jmx/src/main/java/org/xbean/jmx/EventAdapter.java diff --git a/jmx/src/java/org/xbean/jmx/JMXException.java b/jmx/src/main/java/org/xbean/jmx/JMXException.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/JMXException.java rename to jmx/src/main/java/org/xbean/jmx/JMXException.java diff --git a/jmx/src/java/org/xbean/jmx/JMXServiceException.java b/jmx/src/main/java/org/xbean/jmx/JMXServiceException.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/JMXServiceException.java rename to jmx/src/main/java/org/xbean/jmx/JMXServiceException.java diff --git a/jmx/src/java/org/xbean/jmx/JMXServiceMonitor.java b/jmx/src/main/java/org/xbean/jmx/JMXServiceMonitor.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/JMXServiceMonitor.java rename to jmx/src/main/java/org/xbean/jmx/JMXServiceMonitor.java diff --git a/jmx/src/java/org/xbean/jmx/JMXStrategyFinder.java b/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/JMXStrategyFinder.java rename to jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java diff --git a/jmx/src/java/org/xbean/jmx/JMXWrappingStrategy.java b/jmx/src/main/java/org/xbean/jmx/JMXWrappingStrategy.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/JMXWrappingStrategy.java rename to jmx/src/main/java/org/xbean/jmx/JMXWrappingStrategy.java diff --git a/jmx/src/java/org/xbean/jmx/MBean.java b/jmx/src/main/java/org/xbean/jmx/MBean.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/MBean.java rename to jmx/src/main/java/org/xbean/jmx/MBean.java diff --git a/jmx/src/java/org/xbean/jmx/MBeanExporter.java b/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/MBeanExporter.java rename to jmx/src/main/java/org/xbean/jmx/MBeanExporter.java diff --git a/jmx/src/java/org/xbean/jmx/config/JMXServiceConfig.java b/jmx/src/main/java/org/xbean/jmx/config/JMXServiceConfig.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/config/JMXServiceConfig.java rename to jmx/src/main/java/org/xbean/jmx/config/JMXServiceConfig.java diff --git a/jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java b/jmx/src/main/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java similarity index 100% rename from jmx/src/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java rename to jmx/src/main/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java diff --git a/jmx/src/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean b/jmx/src/main/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean similarity index 100% rename from jmx/src/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean rename to jmx/src/main/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean diff --git a/jmx/src/test/org/xbean/jmx/JMXService.java b/jmx/src/test/java/org/xbean/jmx/JMXService.java similarity index 100% rename from jmx/src/test/org/xbean/jmx/JMXService.java rename to jmx/src/test/java/org/xbean/jmx/JMXService.java diff --git a/jmx/src/test/org/xbean/jmx/JMXStrategyFinderTest.java b/jmx/src/test/java/org/xbean/jmx/JMXStrategyFinderTest.java similarity index 100% rename from jmx/src/test/org/xbean/jmx/JMXStrategyFinderTest.java rename to jmx/src/test/java/org/xbean/jmx/JMXStrategyFinderTest.java diff --git a/jmx/src/test/org/xbean/jmx/JMXTest.java b/jmx/src/test/java/org/xbean/jmx/JMXTest.java similarity index 100% rename from jmx/src/test/org/xbean/jmx/JMXTest.java rename to jmx/src/test/java/org/xbean/jmx/JMXTest.java diff --git a/jmx/src/test/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/java/org/xbean/jmx/jmx-simple.xml similarity index 100% rename from jmx/src/test/org/xbean/jmx/jmx-simple.xml rename to jmx/src/test/java/org/xbean/jmx/jmx-simple.xml diff --git a/jmx/src/test/org/xbean/jmx/jmx.xml b/jmx/src/test/java/org/xbean/jmx/jmx.xml similarity index 100% rename from jmx/src/test/org/xbean/jmx/jmx.xml rename to jmx/src/test/java/org/xbean/jmx/jmx.xml diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml new file mode 100644 index 00000000..55215a79 --- /dev/null +++ b/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx.xml b/jmx/src/test/resources/org/xbean/jmx/jmx.xml new file mode 100644 index 00000000..654db7dd --- /dev/null +++ b/jmx/src/test/resources/org/xbean/jmx/jmx.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/kernel/converting-gbean.apt b/kernel/converting-gbean.apt deleted file mode 100644 index d93fc0d1..00000000 --- a/kernel/converting-gbean.apt +++ /dev/null @@ -1,54 +0,0 @@ - ----- - Converting xbean.org from m1 to m2 - ----- - Jason van Zyl - ----- - - What follows is a little description of the the process that I go through - when converting an m1 project to an m2 project. In this example I'm going to - use xbean.org, Dain Sundstrom's [yada yada yada] ... - - Usually when I start looking at converting a project from m1 to m2 I take a - quick look at the directory structure because the standard layout we - decided upon for m2 is slightly different from layout most common in m1 - and it's understandable that folks might not want to change their layout. - I talked it over with Dain and because SVN makes it so easy to shuffle things - around he decided it would be ok to use the m2 standard. Using the m2 - standards does make things easier because the standards for m2 are - encapsulated in the Super POM that all m2 project inherit from. You can sort of - think of the Super POM in Maven as the analog of <<>> in Java. - - - pitfalls in using the default structure - - - resources in the same directories as sources - - - some things we don't have in m2 right now are a clover plugin - - Updating the POM - - - change pomVersion to modelVersion and 3 to 4.0.0 - - - the id element is deprecated an calculated in m2, so i changed the - id element to artifactId - - - currentVersion to version - - - change the version from 1.0-SNAPSHOT to 1.0-alpha-1-SNAPSHOT - - - package element no longer exists, it will be the job of plugins - - - remove the siteAddress and siteDirectory elemement and replace it - with the distributionManagement element - - - removed the entire build element because we are using m2 standards - which are encapsulated in the Super POM. - - - remove the reports for now as we don't have many - -Annoyances - - The single biggest annoyance with converting from m1 to m2 is the fact that - often times people have not made POMs for artifacts we have entered into the - repository. With m2 the build will not work if artifacts do not have the - accompanying POMs. - diff --git a/kernel/m2-readme.txt b/kernel/m2-readme.txt deleted file mode 100644 index 3750464a..00000000 --- a/kernel/m2-readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -Trying Maven 2.x ----------------- - -If you want to try m2 then simply run the mavenizer.sh script which -will produce an "m2" directory. Move into the "m2" directory and - -m2 install - -That should compile, test, package and install diff --git a/kernel/maven.xml b/kernel/maven.xml deleted file mode 100644 index 0872ff3b..00000000 --- a/kernel/maven.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/kernel/mavenizer.sh b/kernel/mavenizer.sh deleted file mode 100755 index 0c9696c3..00000000 --- a/kernel/mavenizer.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -DIR=m2 - -rm -rf $DIR > /dev/null 2>&1 -mkdir $DIR - -cp -r src $DIR -cp pom.xml $DIR - -( - cd $DIR - - find . -name '\.svn' -exec rm -rf {} \; - - ( - cd src - - mkdir main ; mv java main - - ( cd test ; mkdir java ; mv org java ) - - ) - -) diff --git a/kernel/project.properties b/kernel/project.properties deleted file mode 100644 index d8a8fc95..00000000 --- a/kernel/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/kernel/project.xml b/kernel/project.xml deleted file mode 100644 index d70d9388..00000000 --- a/kernel/project.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - 3 - - XBean :: Kernel - xbean-kernel - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: kernel for containers - - - XBean is a kernel architecture and server for ioc containers such as spring. - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd - - - emma - maven-emma-plugin - 0.6 - plugin - - - - - src/java - src/test - - - **/*Test.java - - - - - - - - - - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - - - - diff --git a/kernel/src/java/org/xbean/kernel/AbstractServiceFactory.java b/kernel/src/main/java/org/xbean/kernel/AbstractServiceFactory.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/AbstractServiceFactory.java rename to kernel/src/main/java/org/xbean/kernel/AbstractServiceFactory.java diff --git a/kernel/src/java/org/xbean/kernel/ForcedStopException.java b/kernel/src/main/java/org/xbean/kernel/ForcedStopException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ForcedStopException.java rename to kernel/src/main/java/org/xbean/kernel/ForcedStopException.java diff --git a/kernel/src/java/org/xbean/kernel/IllegalServiceStateException.java b/kernel/src/main/java/org/xbean/kernel/IllegalServiceStateException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/IllegalServiceStateException.java rename to kernel/src/main/java/org/xbean/kernel/IllegalServiceStateException.java diff --git a/kernel/src/java/org/xbean/kernel/InvalidServiceTypeException.java b/kernel/src/main/java/org/xbean/kernel/InvalidServiceTypeException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/InvalidServiceTypeException.java rename to kernel/src/main/java/org/xbean/kernel/InvalidServiceTypeException.java diff --git a/kernel/src/java/org/xbean/kernel/Kernel.java b/kernel/src/main/java/org/xbean/kernel/Kernel.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/Kernel.java rename to kernel/src/main/java/org/xbean/kernel/Kernel.java diff --git a/kernel/src/java/org/xbean/kernel/KernelAlreadyExistsException.java b/kernel/src/main/java/org/xbean/kernel/KernelAlreadyExistsException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelAlreadyExistsException.java rename to kernel/src/main/java/org/xbean/kernel/KernelAlreadyExistsException.java diff --git a/kernel/src/java/org/xbean/kernel/KernelErrorsError.java b/kernel/src/main/java/org/xbean/kernel/KernelErrorsError.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelErrorsError.java rename to kernel/src/main/java/org/xbean/kernel/KernelErrorsError.java diff --git a/kernel/src/java/org/xbean/kernel/KernelFactory.java b/kernel/src/main/java/org/xbean/kernel/KernelFactory.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelFactory.java rename to kernel/src/main/java/org/xbean/kernel/KernelFactory.java diff --git a/kernel/src/java/org/xbean/kernel/KernelFactoryError.java b/kernel/src/main/java/org/xbean/kernel/KernelFactoryError.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelFactoryError.java rename to kernel/src/main/java/org/xbean/kernel/KernelFactoryError.java diff --git a/kernel/src/java/org/xbean/kernel/KernelMonitor.java b/kernel/src/main/java/org/xbean/kernel/KernelMonitor.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelMonitor.java rename to kernel/src/main/java/org/xbean/kernel/KernelMonitor.java diff --git a/kernel/src/java/org/xbean/kernel/KernelOperationInterruptedException.java b/kernel/src/main/java/org/xbean/kernel/KernelOperationInterruptedException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelOperationInterruptedException.java rename to kernel/src/main/java/org/xbean/kernel/KernelOperationInterruptedException.java diff --git a/kernel/src/java/org/xbean/kernel/KernelOperationTimoutException.java b/kernel/src/main/java/org/xbean/kernel/KernelOperationTimoutException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/KernelOperationTimoutException.java rename to kernel/src/main/java/org/xbean/kernel/KernelOperationTimoutException.java diff --git a/kernel/src/java/org/xbean/kernel/NullServiceMonitor.java b/kernel/src/main/java/org/xbean/kernel/NullServiceMonitor.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/NullServiceMonitor.java rename to kernel/src/main/java/org/xbean/kernel/NullServiceMonitor.java diff --git a/kernel/src/java/org/xbean/kernel/RunningServiceCondition.java b/kernel/src/main/java/org/xbean/kernel/RunningServiceCondition.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/RunningServiceCondition.java rename to kernel/src/main/java/org/xbean/kernel/RunningServiceCondition.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceAlreadyExistsException.java b/kernel/src/main/java/org/xbean/kernel/ServiceAlreadyExistsException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceAlreadyExistsException.java rename to kernel/src/main/java/org/xbean/kernel/ServiceAlreadyExistsException.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceCondition.java b/kernel/src/main/java/org/xbean/kernel/ServiceCondition.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceCondition.java rename to kernel/src/main/java/org/xbean/kernel/ServiceCondition.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceConditionContext.java b/kernel/src/main/java/org/xbean/kernel/ServiceConditionContext.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceConditionContext.java rename to kernel/src/main/java/org/xbean/kernel/ServiceConditionContext.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceContext.java b/kernel/src/main/java/org/xbean/kernel/ServiceContext.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceContext.java rename to kernel/src/main/java/org/xbean/kernel/ServiceContext.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceContextThreadLocal.java b/kernel/src/main/java/org/xbean/kernel/ServiceContextThreadLocal.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceContextThreadLocal.java rename to kernel/src/main/java/org/xbean/kernel/ServiceContextThreadLocal.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceEvent.java b/kernel/src/main/java/org/xbean/kernel/ServiceEvent.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceEvent.java rename to kernel/src/main/java/org/xbean/kernel/ServiceEvent.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceFactory.java b/kernel/src/main/java/org/xbean/kernel/ServiceFactory.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceFactory.java rename to kernel/src/main/java/org/xbean/kernel/ServiceFactory.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceMonitor.java b/kernel/src/main/java/org/xbean/kernel/ServiceMonitor.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceMonitor.java rename to kernel/src/main/java/org/xbean/kernel/ServiceMonitor.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceName.java b/kernel/src/main/java/org/xbean/kernel/ServiceName.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceName.java rename to kernel/src/main/java/org/xbean/kernel/ServiceName.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceNotFoundException.java b/kernel/src/main/java/org/xbean/kernel/ServiceNotFoundException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceNotFoundException.java rename to kernel/src/main/java/org/xbean/kernel/ServiceNotFoundException.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceRegistrationException.java b/kernel/src/main/java/org/xbean/kernel/ServiceRegistrationException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceRegistrationException.java rename to kernel/src/main/java/org/xbean/kernel/ServiceRegistrationException.java diff --git a/kernel/src/java/org/xbean/kernel/ServiceState.java b/kernel/src/main/java/org/xbean/kernel/ServiceState.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/ServiceState.java rename to kernel/src/main/java/org/xbean/kernel/ServiceState.java diff --git a/kernel/src/java/org/xbean/kernel/StartStrategies.java b/kernel/src/main/java/org/xbean/kernel/StartStrategies.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StartStrategies.java rename to kernel/src/main/java/org/xbean/kernel/StartStrategies.java diff --git a/kernel/src/java/org/xbean/kernel/StartStrategy.java b/kernel/src/main/java/org/xbean/kernel/StartStrategy.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StartStrategy.java rename to kernel/src/main/java/org/xbean/kernel/StartStrategy.java diff --git a/kernel/src/java/org/xbean/kernel/StaticServiceFactory.java b/kernel/src/main/java/org/xbean/kernel/StaticServiceFactory.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StaticServiceFactory.java rename to kernel/src/main/java/org/xbean/kernel/StaticServiceFactory.java diff --git a/kernel/src/java/org/xbean/kernel/StopStrategies.java b/kernel/src/main/java/org/xbean/kernel/StopStrategies.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StopStrategies.java rename to kernel/src/main/java/org/xbean/kernel/StopStrategies.java diff --git a/kernel/src/java/org/xbean/kernel/StopStrategy.java b/kernel/src/main/java/org/xbean/kernel/StopStrategy.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StopStrategy.java rename to kernel/src/main/java/org/xbean/kernel/StopStrategy.java diff --git a/kernel/src/java/org/xbean/kernel/StoppedServiceCondition.java b/kernel/src/main/java/org/xbean/kernel/StoppedServiceCondition.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StoppedServiceCondition.java rename to kernel/src/main/java/org/xbean/kernel/StoppedServiceCondition.java diff --git a/kernel/src/java/org/xbean/kernel/StringServiceName.java b/kernel/src/main/java/org/xbean/kernel/StringServiceName.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/StringServiceName.java rename to kernel/src/main/java/org/xbean/kernel/StringServiceName.java diff --git a/kernel/src/java/org/xbean/kernel/UnregisterServiceException.java b/kernel/src/main/java/org/xbean/kernel/UnregisterServiceException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/UnregisterServiceException.java rename to kernel/src/main/java/org/xbean/kernel/UnregisterServiceException.java diff --git a/kernel/src/java/org/xbean/kernel/UnsatisfiedConditionsException.java b/kernel/src/main/java/org/xbean/kernel/UnsatisfiedConditionsException.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/UnsatisfiedConditionsException.java rename to kernel/src/main/java/org/xbean/kernel/UnsatisfiedConditionsException.java diff --git a/kernel/src/java/org/xbean/kernel/package.html b/kernel/src/main/java/org/xbean/kernel/package.html similarity index 100% rename from kernel/src/java/org/xbean/kernel/package.html rename to kernel/src/main/java/org/xbean/kernel/package.html diff --git a/kernel/src/java/org/xbean/kernel/standard/AggregateCondition.java b/kernel/src/main/java/org/xbean/kernel/standard/AggregateCondition.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/AggregateCondition.java rename to kernel/src/main/java/org/xbean/kernel/standard/AggregateCondition.java diff --git a/kernel/src/java/org/xbean/kernel/standard/AsyncServiceMonitor.java b/kernel/src/main/java/org/xbean/kernel/standard/AsyncServiceMonitor.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/AsyncServiceMonitor.java rename to kernel/src/main/java/org/xbean/kernel/standard/AsyncServiceMonitor.java diff --git a/kernel/src/java/org/xbean/kernel/standard/KernelMonitorBroadcaster.java b/kernel/src/main/java/org/xbean/kernel/standard/KernelMonitorBroadcaster.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/KernelMonitorBroadcaster.java rename to kernel/src/main/java/org/xbean/kernel/standard/KernelMonitorBroadcaster.java diff --git a/kernel/src/java/org/xbean/kernel/standard/NonRestartableStopCondition.java b/kernel/src/main/java/org/xbean/kernel/standard/NonRestartableStopCondition.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/NonRestartableStopCondition.java rename to kernel/src/main/java/org/xbean/kernel/standard/NonRestartableStopCondition.java diff --git a/kernel/src/java/org/xbean/kernel/standard/RegistryFutureTask.java b/kernel/src/main/java/org/xbean/kernel/standard/RegistryFutureTask.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/RegistryFutureTask.java rename to kernel/src/main/java/org/xbean/kernel/standard/RegistryFutureTask.java diff --git a/kernel/src/java/org/xbean/kernel/standard/ServiceManager.java b/kernel/src/main/java/org/xbean/kernel/standard/ServiceManager.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/ServiceManager.java rename to kernel/src/main/java/org/xbean/kernel/standard/ServiceManager.java diff --git a/kernel/src/java/org/xbean/kernel/standard/ServiceManagerFactory.java b/kernel/src/main/java/org/xbean/kernel/standard/ServiceManagerFactory.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/ServiceManagerFactory.java rename to kernel/src/main/java/org/xbean/kernel/standard/ServiceManagerFactory.java diff --git a/kernel/src/java/org/xbean/kernel/standard/ServiceManagerRegistry.java b/kernel/src/main/java/org/xbean/kernel/standard/ServiceManagerRegistry.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/ServiceManagerRegistry.java rename to kernel/src/main/java/org/xbean/kernel/standard/ServiceManagerRegistry.java diff --git a/kernel/src/java/org/xbean/kernel/standard/ServiceMonitorBroadcaster.java b/kernel/src/main/java/org/xbean/kernel/standard/ServiceMonitorBroadcaster.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/ServiceMonitorBroadcaster.java rename to kernel/src/main/java/org/xbean/kernel/standard/ServiceMonitorBroadcaster.java diff --git a/kernel/src/java/org/xbean/kernel/standard/StandardKernel.java b/kernel/src/main/java/org/xbean/kernel/standard/StandardKernel.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/StandardKernel.java rename to kernel/src/main/java/org/xbean/kernel/standard/StandardKernel.java diff --git a/kernel/src/java/org/xbean/kernel/standard/StandardKernelFactory.java b/kernel/src/main/java/org/xbean/kernel/standard/StandardKernelFactory.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/StandardKernelFactory.java rename to kernel/src/main/java/org/xbean/kernel/standard/StandardKernelFactory.java diff --git a/kernel/src/java/org/xbean/kernel/standard/StandardServiceConditionContext.java b/kernel/src/main/java/org/xbean/kernel/standard/StandardServiceConditionContext.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/StandardServiceConditionContext.java rename to kernel/src/main/java/org/xbean/kernel/standard/StandardServiceConditionContext.java diff --git a/kernel/src/java/org/xbean/kernel/standard/StandardServiceContext.java b/kernel/src/main/java/org/xbean/kernel/standard/StandardServiceContext.java similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/StandardServiceContext.java rename to kernel/src/main/java/org/xbean/kernel/standard/StandardServiceContext.java diff --git a/kernel/src/java/org/xbean/kernel/standard/package.html b/kernel/src/main/java/org/xbean/kernel/standard/package.html similarity index 100% rename from kernel/src/java/org/xbean/kernel/standard/package.html rename to kernel/src/main/java/org/xbean/kernel/standard/package.html diff --git a/kernel/src/test/org/xbean/kernel/KernelMonitorBroadcasterTest.java b/kernel/src/test/java/org/xbean/kernel/KernelMonitorBroadcasterTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/KernelMonitorBroadcasterTest.java rename to kernel/src/test/java/org/xbean/kernel/KernelMonitorBroadcasterTest.java diff --git a/kernel/src/test/org/xbean/kernel/ServiceStateTest.java b/kernel/src/test/java/org/xbean/kernel/ServiceStateTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/ServiceStateTest.java rename to kernel/src/test/java/org/xbean/kernel/ServiceStateTest.java diff --git a/kernel/src/test/org/xbean/kernel/StaticServiceFactoryTest.java b/kernel/src/test/java/org/xbean/kernel/StaticServiceFactoryTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/StaticServiceFactoryTest.java rename to kernel/src/test/java/org/xbean/kernel/StaticServiceFactoryTest.java diff --git a/kernel/src/test/org/xbean/kernel/StringServiceNameTest.java b/kernel/src/test/java/org/xbean/kernel/StringServiceNameTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/StringServiceNameTest.java rename to kernel/src/test/java/org/xbean/kernel/StringServiceNameTest.java diff --git a/kernel/src/test/org/xbean/kernel/standard/ServiceManagerRegistryTest.java b/kernel/src/test/java/org/xbean/kernel/standard/ServiceManagerRegistryTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/standard/ServiceManagerRegistryTest.java rename to kernel/src/test/java/org/xbean/kernel/standard/ServiceManagerRegistryTest.java diff --git a/kernel/src/test/org/xbean/kernel/standard/ServiceManagerTest.java b/kernel/src/test/java/org/xbean/kernel/standard/ServiceManagerTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/standard/ServiceManagerTest.java rename to kernel/src/test/java/org/xbean/kernel/standard/ServiceManagerTest.java diff --git a/kernel/src/test/org/xbean/kernel/standard/ServiceMonitorBroadcasterTest.java b/kernel/src/test/java/org/xbean/kernel/standard/ServiceMonitorBroadcasterTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/standard/ServiceMonitorBroadcasterTest.java rename to kernel/src/test/java/org/xbean/kernel/standard/ServiceMonitorBroadcasterTest.java diff --git a/kernel/src/test/org/xbean/kernel/standard/StandardKernelTest.java b/kernel/src/test/java/org/xbean/kernel/standard/StandardKernelTest.java similarity index 100% rename from kernel/src/test/org/xbean/kernel/standard/StandardKernelTest.java rename to kernel/src/test/java/org/xbean/kernel/standard/StandardKernelTest.java diff --git a/maven.xml b/maven.xml deleted file mode 100644 index 9c0de314..00000000 --- a/maven.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 5cda4332..488f0b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -179,18 +179,18 @@ - repo1 - Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 + xbean-repo + XBean Central Repository + scpexe://xbean.org/home/projects/xbean/m2-repository - snapshots - Maven Central Development Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2 + xbean-snapshots + XBean Central Development Repository + scpexe://xbean.org/home/projects/xbean/m2-repository - website - scp://www.xbean.org/home/projects/xbean/public_html/maven/ + xbean-website + scpexe://xbean.org/home/projects/xbean/public_html/maven/ @@ -206,7 +206,32 @@ - src/java - src/test + + + maven-one-plugin + + + + install-maven-one-repository + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-alpha-5 + + + + + + snapshots + Maven Central Plugins Development Repository + http://snapshots.maven.codehaus.org/maven2 + + diff --git a/project.properties b/project.properties deleted file mode 100644 index 23886308..00000000 --- a/project.properties +++ /dev/null @@ -1,3 +0,0 @@ -maven.multiproject.include=*/project.xml -maven.junit.fork=yes -maven.junit.forkmode=once diff --git a/project.xml b/project.xml deleted file mode 100644 index d9ccd07c..00000000 --- a/project.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - 3 - - XBean - xbean - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - - diff --git a/server/maven.xml b/server/maven.xml deleted file mode 100644 index ef50dfc4..00000000 --- a/server/maven.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/pom.xml b/server/pom.xml index ce264594..30ca3ae1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -60,7 +60,7 @@ @@ -75,28 +75,6 @@ - - - - src/resources - - - - - - target/generated - - META-INF/**/* - - - - src/test - - META-INF/**/* - **/*.x* - - - diff --git a/server/project.properties b/server/project.properties deleted file mode 100644 index e7a00a67..00000000 --- a/server/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/mave,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/server/project.xml b/server/project.xml deleted file mode 100644 index b04153b7..00000000 --- a/server/project.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - 3 - - XBean :: Server - xbean-server - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: generic server components - - - The XBean server module contains generic services useful in a server environment. - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - commons-logging - commons-logging - 1.0.3 - - - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd - - - cglib - cglib-nodep - 2.1_2 - test - - - mx4j - mx4j - 3.0.1 - - - springframework - spring - 1.2.4 - - - stax - stax-api - 1.0 - test - - - xbean - xbean-kernel - 2.0-SNAPSHOT - - - xbean - xbean-spring - 2.0-SNAPSHOT - - - - - emma - maven-emma-plugin - 0.6 - plugin - - - - - ant - ant - 1.6.2 - - - qdox - qdox - 1.5 - - - - - src/java - - - src/resources - - - src/test - - - **/*Test.java - - - - - - - - - - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - - - - diff --git a/server/src/java/org/xbean/server/classloader/ClassLoaderUtil.java b/server/src/main/java/org/xbean/server/classloader/ClassLoaderUtil.java similarity index 100% rename from server/src/java/org/xbean/server/classloader/ClassLoaderUtil.java rename to server/src/main/java/org/xbean/server/classloader/ClassLoaderUtil.java diff --git a/server/src/java/org/xbean/server/classloader/DestroyableClassLoader.java b/server/src/main/java/org/xbean/server/classloader/DestroyableClassLoader.java similarity index 100% rename from server/src/java/org/xbean/server/classloader/DestroyableClassLoader.java rename to server/src/main/java/org/xbean/server/classloader/DestroyableClassLoader.java diff --git a/server/src/java/org/xbean/server/classloader/JarFileClassLoader.java b/server/src/main/java/org/xbean/server/classloader/JarFileClassLoader.java similarity index 100% rename from server/src/java/org/xbean/server/classloader/JarFileClassLoader.java rename to server/src/main/java/org/xbean/server/classloader/JarFileClassLoader.java diff --git a/server/src/java/org/xbean/server/classloader/MultiParentClassLoader.java b/server/src/main/java/org/xbean/server/classloader/MultiParentClassLoader.java similarity index 100% rename from server/src/java/org/xbean/server/classloader/MultiParentClassLoader.java rename to server/src/main/java/org/xbean/server/classloader/MultiParentClassLoader.java diff --git a/server/src/java/org/xbean/server/classloader/NamedClassLoader.java b/server/src/main/java/org/xbean/server/classloader/NamedClassLoader.java similarity index 100% rename from server/src/java/org/xbean/server/classloader/NamedClassLoader.java rename to server/src/main/java/org/xbean/server/classloader/NamedClassLoader.java diff --git a/server/src/java/org/xbean/server/loader/LoadAllMain.java b/server/src/main/java/org/xbean/server/loader/LoadAllMain.java similarity index 100% rename from server/src/java/org/xbean/server/loader/LoadAllMain.java rename to server/src/main/java/org/xbean/server/loader/LoadAllMain.java diff --git a/server/src/java/org/xbean/server/loader/Loader.java b/server/src/main/java/org/xbean/server/loader/Loader.java similarity index 100% rename from server/src/java/org/xbean/server/loader/Loader.java rename to server/src/main/java/org/xbean/server/loader/Loader.java diff --git a/server/src/java/org/xbean/server/main/FatalStartupError.java b/server/src/main/java/org/xbean/server/main/FatalStartupError.java similarity index 100% rename from server/src/java/org/xbean/server/main/FatalStartupError.java rename to server/src/main/java/org/xbean/server/main/FatalStartupError.java diff --git a/server/src/java/org/xbean/server/main/KernelMain.java b/server/src/main/java/org/xbean/server/main/KernelMain.java similarity index 100% rename from server/src/java/org/xbean/server/main/KernelMain.java rename to server/src/main/java/org/xbean/server/main/KernelMain.java diff --git a/server/src/java/org/xbean/server/main/Main.java b/server/src/main/java/org/xbean/server/main/Main.java similarity index 100% rename from server/src/java/org/xbean/server/main/Main.java rename to server/src/main/java/org/xbean/server/main/Main.java diff --git a/server/src/java/org/xbean/server/propertyeditor/InetAddressEditor.java b/server/src/main/java/org/xbean/server/propertyeditor/InetAddressEditor.java similarity index 100% rename from server/src/java/org/xbean/server/propertyeditor/InetAddressEditor.java rename to server/src/main/java/org/xbean/server/propertyeditor/InetAddressEditor.java diff --git a/server/src/java/org/xbean/server/propertyeditor/ObjectNameEditor.java b/server/src/main/java/org/xbean/server/propertyeditor/ObjectNameEditor.java similarity index 100% rename from server/src/java/org/xbean/server/propertyeditor/ObjectNameEditor.java rename to server/src/main/java/org/xbean/server/propertyeditor/ObjectNameEditor.java diff --git a/server/src/java/org/xbean/server/propertyeditor/URIEditor.java b/server/src/main/java/org/xbean/server/propertyeditor/URIEditor.java similarity index 100% rename from server/src/java/org/xbean/server/propertyeditor/URIEditor.java rename to server/src/main/java/org/xbean/server/propertyeditor/URIEditor.java diff --git a/server/src/java/org/xbean/server/repository/FileSystemRepository.java b/server/src/main/java/org/xbean/server/repository/FileSystemRepository.java similarity index 100% rename from server/src/java/org/xbean/server/repository/FileSystemRepository.java rename to server/src/main/java/org/xbean/server/repository/FileSystemRepository.java diff --git a/server/src/java/org/xbean/server/repository/Repository.java b/server/src/main/java/org/xbean/server/repository/Repository.java similarity index 100% rename from server/src/java/org/xbean/server/repository/Repository.java rename to server/src/main/java/org/xbean/server/repository/Repository.java diff --git a/server/src/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java b/server/src/main/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java similarity index 100% rename from server/src/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java rename to server/src/main/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java diff --git a/server/src/java/org/xbean/server/spring/configuration/SpringConfiguration.java b/server/src/main/java/org/xbean/server/spring/configuration/SpringConfiguration.java similarity index 100% rename from server/src/java/org/xbean/server/spring/configuration/SpringConfiguration.java rename to server/src/main/java/org/xbean/server/spring/configuration/SpringConfiguration.java diff --git a/server/src/java/org/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java b/server/src/main/java/org/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java similarity index 100% rename from server/src/java/org/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java rename to server/src/main/java/org/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java diff --git a/server/src/java/org/xbean/server/spring/loader/SpringLoader.java b/server/src/main/java/org/xbean/server/spring/loader/SpringLoader.java similarity index 100% rename from server/src/java/org/xbean/server/spring/loader/SpringLoader.java rename to server/src/main/java/org/xbean/server/spring/loader/SpringLoader.java diff --git a/server/src/java/org/xbean/server/spring/main/SpringBootstrap.java b/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java similarity index 100% rename from server/src/java/org/xbean/server/spring/main/SpringBootstrap.java rename to server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java diff --git a/server/src/java/org/xbean/server/spring/reference/ClassLoaderReference.java b/server/src/main/java/org/xbean/server/spring/reference/ClassLoaderReference.java similarity index 100% rename from server/src/java/org/xbean/server/spring/reference/ClassLoaderReference.java rename to server/src/main/java/org/xbean/server/spring/reference/ClassLoaderReference.java diff --git a/server/src/java/org/xbean/server/spring/reference/KernelReference.java b/server/src/main/java/org/xbean/server/spring/reference/KernelReference.java similarity index 100% rename from server/src/java/org/xbean/server/spring/reference/KernelReference.java rename to server/src/main/java/org/xbean/server/spring/reference/KernelReference.java diff --git a/server/src/java/org/xbean/server/spring/reference/ServiceNameReference.java b/server/src/main/java/org/xbean/server/spring/reference/ServiceNameReference.java similarity index 100% rename from server/src/java/org/xbean/server/spring/reference/ServiceNameReference.java rename to server/src/main/java/org/xbean/server/spring/reference/ServiceNameReference.java diff --git a/server/src/java/org/xbean/server/spring/reference/ServiceNameStringReference.java b/server/src/main/java/org/xbean/server/spring/reference/ServiceNameStringReference.java similarity index 100% rename from server/src/java/org/xbean/server/spring/reference/ServiceNameStringReference.java rename to server/src/main/java/org/xbean/server/spring/reference/ServiceNameStringReference.java diff --git a/server/src/resources/META-INF/xbean-bootstrap.xml b/server/src/main/resources/META-INF/xbean-bootstrap.xml similarity index 100% rename from server/src/resources/META-INF/xbean-bootstrap.xml rename to server/src/main/resources/META-INF/xbean-bootstrap.xml diff --git a/server/src/test/org/xbean/server/classloader/JarFileClassLoaderTest.java b/server/src/test/java/org/xbean/server/classloader/JarFileClassLoaderTest.java similarity index 100% rename from server/src/test/org/xbean/server/classloader/JarFileClassLoaderTest.java rename to server/src/test/java/org/xbean/server/classloader/JarFileClassLoaderTest.java diff --git a/server/src/test/org/xbean/server/classloader/MultiParentClassLoaderTest.java b/server/src/test/java/org/xbean/server/classloader/MultiParentClassLoaderTest.java similarity index 100% rename from server/src/test/org/xbean/server/classloader/MultiParentClassLoaderTest.java rename to server/src/test/java/org/xbean/server/classloader/MultiParentClassLoaderTest.java diff --git a/server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java b/server/src/test/java/org/xbean/server/spring/loader/SpringLoaderTest.java similarity index 96% rename from server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java rename to server/src/test/java/org/xbean/server/spring/loader/SpringLoaderTest.java index be8a5ac2..bbe2e7ba 100644 --- a/server/src/test/org/xbean/server/spring/loader/SpringLoaderTest.java +++ b/server/src/test/java/org/xbean/server/spring/loader/SpringLoaderTest.java @@ -58,7 +58,7 @@ public void testLoad() throws Exception{ Kernel kernel = KernelFactory.newInstance().createKernel("test"); try { - File xbeanDir = new File(basedir, "src/test/org/xbean/server/spring/loader/").getAbsoluteFile(); + File xbeanDir = new File(basedir, "src/test/resources/org/xbean/server/spring/loader/").getAbsoluteFile(); System.setProperty("xbean.base.dir", xbeanDir.getAbsolutePath()); FileSystemRepository repository = new FileSystemRepository(new File(basedir).getAbsoluteFile()); @@ -85,7 +85,7 @@ public void testReload() throws Exception{ Kernel kernel = KernelFactory.newInstance().createKernel("test"); try { - File xbeanDir = new File(basedir, "src/test/org/xbean/server/spring/loader/").getAbsoluteFile(); + File xbeanDir = new File(basedir, "src/test/resources/org/xbean/server/spring/loader/").getAbsoluteFile(); System.setProperty("xbean.base.dir", xbeanDir.getAbsolutePath()); FileSystemRepository repository = new FileSystemRepository(new File(basedir).getAbsoluteFile()); diff --git a/server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java b/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java similarity index 95% rename from server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java rename to server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java index e960c499..f9e81ff5 100644 --- a/server/src/test/org/xbean/server/spring/main/SpringBootstrapTest.java +++ b/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java @@ -37,7 +37,7 @@ public void testClasspathBootstrap() throws Exception{ } public void testFileBootstrap() throws Exception{ - springBootstrap.setConfigurationFile(basedir + "/src/resources/META-INF/xbean-bootstrap.xml"); + springBootstrap.setConfigurationFile(basedir + "/src/main/resources/META-INF/xbean-bootstrap.xml"); springBootstrap.setServerBaseDirectory(basedir); assertBootable(springBootstrap); } diff --git a/server/src/test/org/xbean/server/spring/loader/classpath-xbean.xml b/server/src/test/resources/org/xbean/server/spring/loader/classpath-xbean.xml similarity index 100% rename from server/src/test/org/xbean/server/spring/loader/classpath-xbean.xml rename to server/src/test/resources/org/xbean/server/spring/loader/classpath-xbean.xml diff --git a/spring/maven.xml b/spring/maven.xml deleted file mode 100644 index 9ee814fa..00000000 --- a/spring/maven.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring/pom.xml b/spring/pom.xml index 596c3711..6ae2cf79 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -69,7 +69,7 @@ @@ -85,28 +85,6 @@ - - - - src/resources - - - - - - target/generated - - META-INF/**/* - - - - src/test - - META-INF/**/* - **/*.x* - - - diff --git a/spring/project.properties b/spring/project.properties deleted file mode 100644 index d8a8fc95..00000000 --- a/spring/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/spring/project.xml b/spring/project.xml deleted file mode 100644 index ab59f634..00000000 --- a/spring/project.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - 3 - - XBean :: Spring - xbean-spring - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: Spring Adaptor - - - XBean Spring Adaptor adds some enhancements to Spring such as custom - XML languages. - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - commons-logging - commons-logging - 1.0.3 - - - - springframework - spring - 1.2.4 - - - - - stax - stax-api - 1.0 - - - - - mx4j - mx4j-jmx - 2.1.1 - - - - - ant - ant - 1.6.2 - - - qdox - qdox - 1.5 - - - - - junit - junit - 3.8.1 - - - - - emma - maven-emma-plugin - 0.6 - plugin - - - - - src/java - - - src/resources - - - - src/test - - - - target/generated - - META-INF/**/* - - - - src/test - - META-INF/**/* - **/*.x* - - - - - **/*Test.java - - - - - - - - - - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - - - - diff --git a/spring/src/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java b/spring/src/main/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java rename to spring/src/main/java/org/xbean/spring/context/ClassPathXmlApplicationContext.java diff --git a/spring/src/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java b/spring/src/main/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java rename to spring/src/main/java/org/xbean/spring/context/FileSystemXmlApplicationContext.java diff --git a/spring/src/java/org/xbean/spring/context/ResourceXmlApplicationContext.java b/spring/src/main/java/org/xbean/spring/context/ResourceXmlApplicationContext.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/ResourceXmlApplicationContext.java rename to spring/src/main/java/org/xbean/spring/context/ResourceXmlApplicationContext.java diff --git a/spring/src/java/org/xbean/spring/context/SpringApplicationContext.java b/spring/src/main/java/org/xbean/spring/context/SpringApplicationContext.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/SpringApplicationContext.java rename to spring/src/main/java/org/xbean/spring/context/SpringApplicationContext.java diff --git a/spring/src/java/org/xbean/spring/context/SpringXmlPreprocessor.java b/spring/src/main/java/org/xbean/spring/context/SpringXmlPreprocessor.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/SpringXmlPreprocessor.java rename to spring/src/main/java/org/xbean/spring/context/SpringXmlPreprocessor.java diff --git a/spring/src/java/org/xbean/spring/context/XmlWebApplicationContext.java b/spring/src/main/java/org/xbean/spring/context/XmlWebApplicationContext.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/XmlWebApplicationContext.java rename to spring/src/main/java/org/xbean/spring/context/XmlWebApplicationContext.java diff --git a/spring/src/java/org/xbean/spring/context/impl/DefaultProperty.java b/spring/src/main/java/org/xbean/spring/context/impl/DefaultProperty.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/DefaultProperty.java rename to spring/src/main/java/org/xbean/spring/context/impl/DefaultProperty.java diff --git a/spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java b/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/MappingMetaData.java rename to spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java diff --git a/spring/src/java/org/xbean/spring/context/impl/NamedConstructorArgs.java b/spring/src/main/java/org/xbean/spring/context/impl/NamedConstructorArgs.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/NamedConstructorArgs.java rename to spring/src/main/java/org/xbean/spring/context/impl/NamedConstructorArgs.java diff --git a/spring/src/java/org/xbean/spring/context/impl/NamespaceHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/NamespaceHelper.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/NamespaceHelper.java rename to spring/src/main/java/org/xbean/spring/context/impl/NamespaceHelper.java diff --git a/spring/src/java/org/xbean/spring/context/impl/ObjectNameEditor.java b/spring/src/main/java/org/xbean/spring/context/impl/ObjectNameEditor.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/ObjectNameEditor.java rename to spring/src/main/java/org/xbean/spring/context/impl/ObjectNameEditor.java diff --git a/spring/src/java/org/xbean/spring/context/impl/PropertyEditorHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/PropertyEditorHelper.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/PropertyEditorHelper.java rename to spring/src/main/java/org/xbean/spring/context/impl/PropertyEditorHelper.java diff --git a/spring/src/java/org/xbean/spring/context/impl/QNameHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/QNameHelper.java rename to spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java diff --git a/spring/src/java/org/xbean/spring/context/impl/QNameReflectionHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/QNameReflectionHelper.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/QNameReflectionHelper.java rename to spring/src/main/java/org/xbean/spring/context/impl/QNameReflectionHelper.java diff --git a/spring/src/java/org/xbean/spring/context/impl/QNameReflectionParams.java b/spring/src/main/java/org/xbean/spring/context/impl/QNameReflectionParams.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/QNameReflectionParams.java rename to spring/src/main/java/org/xbean/spring/context/impl/QNameReflectionParams.java diff --git a/spring/src/java/org/xbean/spring/context/impl/URIEditor.java b/spring/src/main/java/org/xbean/spring/context/impl/URIEditor.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/URIEditor.java rename to spring/src/main/java/org/xbean/spring/context/impl/URIEditor.java diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java rename to spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java diff --git a/spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java similarity index 100% rename from spring/src/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java rename to spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java diff --git a/spring/src/java/org/xbean/spring/generator/AttributeMapping.java b/spring/src/main/java/org/xbean/spring/generator/AttributeMapping.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/AttributeMapping.java rename to spring/src/main/java/org/xbean/spring/generator/AttributeMapping.java diff --git a/spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java b/spring/src/main/java/org/xbean/spring/generator/DocumentationGenerator.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/DocumentationGenerator.java rename to spring/src/main/java/org/xbean/spring/generator/DocumentationGenerator.java diff --git a/spring/src/java/org/xbean/spring/generator/ElementMapping.java b/spring/src/main/java/org/xbean/spring/generator/ElementMapping.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/ElementMapping.java rename to spring/src/main/java/org/xbean/spring/generator/ElementMapping.java diff --git a/spring/src/java/org/xbean/spring/generator/GeneratorPlugin.java b/spring/src/main/java/org/xbean/spring/generator/GeneratorPlugin.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/GeneratorPlugin.java rename to spring/src/main/java/org/xbean/spring/generator/GeneratorPlugin.java diff --git a/spring/src/java/org/xbean/spring/generator/InvalidModelException.java b/spring/src/main/java/org/xbean/spring/generator/InvalidModelException.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/InvalidModelException.java rename to spring/src/main/java/org/xbean/spring/generator/InvalidModelException.java diff --git a/spring/src/java/org/xbean/spring/generator/LogFacade.java b/spring/src/main/java/org/xbean/spring/generator/LogFacade.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/LogFacade.java rename to spring/src/main/java/org/xbean/spring/generator/LogFacade.java diff --git a/spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java b/spring/src/main/java/org/xbean/spring/generator/MappingGeneratorTask.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/MappingGeneratorTask.java rename to spring/src/main/java/org/xbean/spring/generator/MappingGeneratorTask.java diff --git a/spring/src/java/org/xbean/spring/generator/MappingLoader.java b/spring/src/main/java/org/xbean/spring/generator/MappingLoader.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/MappingLoader.java rename to spring/src/main/java/org/xbean/spring/generator/MappingLoader.java diff --git a/spring/src/java/org/xbean/spring/generator/NamespaceMapping.java b/spring/src/main/java/org/xbean/spring/generator/NamespaceMapping.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/NamespaceMapping.java rename to spring/src/main/java/org/xbean/spring/generator/NamespaceMapping.java diff --git a/spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java b/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/QdoxMappingLoader.java rename to spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java diff --git a/spring/src/java/org/xbean/spring/generator/SchemaGenerator.java b/spring/src/main/java/org/xbean/spring/generator/SchemaGenerator.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/SchemaGenerator.java rename to spring/src/main/java/org/xbean/spring/generator/SchemaGenerator.java diff --git a/spring/src/java/org/xbean/spring/generator/Type.java b/spring/src/main/java/org/xbean/spring/generator/Type.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/Type.java rename to spring/src/main/java/org/xbean/spring/generator/Type.java diff --git a/spring/src/java/org/xbean/spring/generator/Utils.java b/spring/src/main/java/org/xbean/spring/generator/Utils.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/Utils.java rename to spring/src/main/java/org/xbean/spring/generator/Utils.java diff --git a/spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java b/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/XmlMetadataGenerator.java rename to spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java diff --git a/spring/src/java/org/xbean/spring/generator/XmlWriter.java b/spring/src/main/java/org/xbean/spring/generator/XmlWriter.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/XmlWriter.java rename to spring/src/main/java/org/xbean/spring/generator/XmlWriter.java diff --git a/spring/src/java/org/xbean/spring/generator/XsdGenerator.java b/spring/src/main/java/org/xbean/spring/generator/XsdGenerator.java similarity index 100% rename from spring/src/java/org/xbean/spring/generator/XsdGenerator.java rename to spring/src/main/java/org/xbean/spring/generator/XsdGenerator.java diff --git a/spring/src/java/org/xbean/spring/util/AbstractSpringVisitor.java b/spring/src/main/java/org/xbean/spring/util/AbstractSpringVisitor.java similarity index 100% rename from spring/src/java/org/xbean/spring/util/AbstractSpringVisitor.java rename to spring/src/main/java/org/xbean/spring/util/AbstractSpringVisitor.java diff --git a/spring/src/java/org/xbean/spring/util/SpringVisitor.java b/spring/src/main/java/org/xbean/spring/util/SpringVisitor.java similarity index 100% rename from spring/src/java/org/xbean/spring/util/SpringVisitor.java rename to spring/src/main/java/org/xbean/spring/util/SpringVisitor.java diff --git a/spring/src/java/org/xbean/spring/spring-beans.xsd b/spring/src/main/resources/org/xbean/spring/spring-beans.xsd similarity index 100% rename from spring/src/java/org/xbean/spring/spring-beans.xsd rename to spring/src/main/resources/org/xbean/spring/spring-beans.xsd diff --git a/spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/BeerUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/BeerUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/BeerUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/BeerUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/BeerUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/BeerUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/BeerUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/context/GinUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/GinUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/GinUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/GinUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/impl/NamedConstructorArgsTest.java b/spring/src/test/java/org/xbean/spring/context/NamedConstructorArgsTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/impl/NamedConstructorArgsTest.java rename to spring/src/test/java/org/xbean/spring/context/NamedConstructorArgsTest.java diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/PizzaUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/PizzaUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/PizzaUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/PizzaUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java b/spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java rename to spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java b/spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java rename to spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java diff --git a/spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java b/spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java rename to spring/src/test/java/org/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingSpringExtendedTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanMixedTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java b/spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java rename to spring/src/test/java/org/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java diff --git a/spring/src/test/org/xbean/spring/context/SaladUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/SaladUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/SaladUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/SaladUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/SaladUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/SaladUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/SaladUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/SaladUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/context/SoupUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/SoupUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/SoupUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/SoupUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/SoupUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/SoupUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/SoupUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/SoupUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/context/SpringTestSupport.java b/spring/src/test/java/org/xbean/spring/context/SpringTestSupport.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/SpringTestSupport.java rename to spring/src/test/java/org/xbean/spring/context/SpringTestSupport.java diff --git a/spring/src/test/org/xbean/spring/context/VodkaUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/VodkaUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/VodkaUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/VodkaUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/VodkaUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/VodkaUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/VodkaUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/VodkaUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/context/WineUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/WineUsingSpringTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/WineUsingSpringTest.java rename to spring/src/test/java/org/xbean/spring/context/WineUsingSpringTest.java diff --git a/spring/src/test/org/xbean/spring/context/WineUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/WineUsingXBeanTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/context/WineUsingXBeanTest.java rename to spring/src/test/java/org/xbean/spring/context/WineUsingXBeanTest.java diff --git a/spring/src/test/org/xbean/spring/example/BeerService.java b/spring/src/test/java/org/xbean/spring/example/BeerService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/BeerService.java rename to spring/src/test/java/org/xbean/spring/example/BeerService.java diff --git a/spring/src/test/org/xbean/spring/example/GinService.java b/spring/src/test/java/org/xbean/spring/example/GinService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/GinService.java rename to spring/src/test/java/org/xbean/spring/example/GinService.java diff --git a/spring/src/test/org/xbean/spring/example/PizzaService.java b/spring/src/test/java/org/xbean/spring/example/PizzaService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/PizzaService.java rename to spring/src/test/java/org/xbean/spring/example/PizzaService.java diff --git a/spring/src/test/org/xbean/spring/example/RestaurantService.java b/spring/src/test/java/org/xbean/spring/example/RestaurantService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/RestaurantService.java rename to spring/src/test/java/org/xbean/spring/example/RestaurantService.java diff --git a/spring/src/test/org/xbean/spring/example/SaladService.java b/spring/src/test/java/org/xbean/spring/example/SaladService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/SaladService.java rename to spring/src/test/java/org/xbean/spring/example/SaladService.java diff --git a/spring/src/test/org/xbean/spring/example/SoupService.java b/spring/src/test/java/org/xbean/spring/example/SoupService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/SoupService.java rename to spring/src/test/java/org/xbean/spring/example/SoupService.java diff --git a/spring/src/test/org/xbean/spring/example/VodkaService.java b/spring/src/test/java/org/xbean/spring/example/VodkaService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/VodkaService.java rename to spring/src/test/java/org/xbean/spring/example/VodkaService.java diff --git a/spring/src/test/org/xbean/spring/example/WineService.java b/spring/src/test/java/org/xbean/spring/example/WineService.java similarity index 100% rename from spring/src/test/org/xbean/spring/example/WineService.java rename to spring/src/test/java/org/xbean/spring/example/WineService.java diff --git a/spring/src/test/org/xbean/spring/generator/ModelTest.java b/spring/src/test/java/org/xbean/spring/generator/ModelTest.java similarity index 100% rename from spring/src/test/org/xbean/spring/generator/ModelTest.java rename to spring/src/test/java/org/xbean/spring/generator/ModelTest.java diff --git a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza-simple b/spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza-simple similarity index 100% rename from spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza-simple rename to spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza-simple diff --git a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant b/spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant similarity index 100% rename from spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant rename to spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant diff --git a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad b/spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad similarity index 100% rename from spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad rename to spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad diff --git a/spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/soup b/spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/soup similarity index 100% rename from spring/src/test/META-INF/services/org/xbean/spring/http/xbean.org/schemas/soup rename to spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/soup diff --git a/spring/src/test/org/xbean/spring/context/beer-normal.xml b/spring/src/test/resources/org/xbean/spring/context/beer-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/beer-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/beer-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/beer-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/beer-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/beer-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/beer-xbean.xml diff --git a/spring/src/test/org/xbean/spring/context/gin.xml b/spring/src/test/resources/org/xbean/spring/context/gin.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/gin.xml rename to spring/src/test/resources/org/xbean/spring/context/gin.xml diff --git a/spring/src/test/org/xbean/spring/context/pizza-normal.xml b/spring/src/test/resources/org/xbean/spring/context/pizza-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/pizza-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/pizza-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml b/spring/src/test/resources/org/xbean/spring/context/pizza-xbean-bean-ref.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/pizza-xbean-bean-ref.xml rename to spring/src/test/resources/org/xbean/spring/context/pizza-xbean-bean-ref.xml diff --git a/spring/src/test/org/xbean/spring/context/pizza-xbean-java.xml b/spring/src/test/resources/org/xbean/spring/context/pizza-xbean-java.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/pizza-xbean-java.xml rename to spring/src/test/resources/org/xbean/spring/context/pizza-xbean-java.xml diff --git a/spring/src/test/org/xbean/spring/context/pizza-xbean-properties.xml b/spring/src/test/resources/org/xbean/spring/context/pizza-xbean-properties.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/pizza-xbean-properties.xml rename to spring/src/test/resources/org/xbean/spring/context/pizza-xbean-properties.xml diff --git a/spring/src/test/org/xbean/spring/context/pizza-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/pizza-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/pizza-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/pizza-xbean.xml diff --git a/spring/src/test/org/xbean/spring/context/restaurant-normal.xml b/spring/src/test/resources/org/xbean/spring/context/restaurant-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/restaurant-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/restaurant-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/restaurant-spring-extended.xml b/spring/src/test/resources/org/xbean/spring/context/restaurant-spring-extended.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/restaurant-spring-extended.xml rename to spring/src/test/resources/org/xbean/spring/context/restaurant-spring-extended.xml diff --git a/spring/src/test/org/xbean/spring/context/restaurant-xbean-mixed.xml b/spring/src/test/resources/org/xbean/spring/context/restaurant-xbean-mixed.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/restaurant-xbean-mixed.xml rename to spring/src/test/resources/org/xbean/spring/context/restaurant-xbean-mixed.xml diff --git a/spring/src/test/org/xbean/spring/context/restaurant-xbean-root.xml b/spring/src/test/resources/org/xbean/spring/context/restaurant-xbean-root.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/restaurant-xbean-root.xml rename to spring/src/test/resources/org/xbean/spring/context/restaurant-xbean-root.xml diff --git a/spring/src/test/org/xbean/spring/context/restaurant-xbean-simple.xml b/spring/src/test/resources/org/xbean/spring/context/restaurant-xbean-simple.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/restaurant-xbean-simple.xml rename to spring/src/test/resources/org/xbean/spring/context/restaurant-xbean-simple.xml diff --git a/spring/src/test/org/xbean/spring/context/restaurant-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/restaurant-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/restaurant-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/restaurant-xbean.xml diff --git a/spring/src/test/org/xbean/spring/context/salad-normal.xml b/spring/src/test/resources/org/xbean/spring/context/salad-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/salad-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/salad-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/salad-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/salad-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/salad-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/salad-xbean.xml diff --git a/spring/src/test/org/xbean/spring/context/soup-normal.xml b/spring/src/test/resources/org/xbean/spring/context/soup-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/soup-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/soup-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/soup-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/soup-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/soup-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/soup-xbean.xml diff --git a/spring/src/test/org/xbean/spring/context/vodka-normal.xml b/spring/src/test/resources/org/xbean/spring/context/vodka-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/vodka-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/vodka-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/vodka-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/vodka-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/vodka-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/vodka-xbean.xml diff --git a/spring/src/test/org/xbean/spring/context/wine-normal.xml b/spring/src/test/resources/org/xbean/spring/context/wine-normal.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/wine-normal.xml rename to spring/src/test/resources/org/xbean/spring/context/wine-normal.xml diff --git a/spring/src/test/org/xbean/spring/context/wine-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/wine-xbean.xml similarity index 100% rename from spring/src/test/org/xbean/spring/context/wine-xbean.xml rename to spring/src/test/resources/org/xbean/spring/context/wine-xbean.xml diff --git a/telnet/m2-readme.txt b/telnet/m2-readme.txt deleted file mode 100644 index 3750464a..00000000 --- a/telnet/m2-readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -Trying Maven 2.x ----------------- - -If you want to try m2 then simply run the mavenizer.sh script which -will produce an "m2" directory. Move into the "m2" directory and - -m2 install - -That should compile, test, package and install diff --git a/telnet/maven.xml b/telnet/maven.xml deleted file mode 100644 index 0872ff3b..00000000 --- a/telnet/maven.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/telnet/mavenizer.sh b/telnet/mavenizer.sh deleted file mode 100755 index 0c9696c3..00000000 --- a/telnet/mavenizer.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -DIR=m2 - -rm -rf $DIR > /dev/null 2>&1 -mkdir $DIR - -cp -r src $DIR -cp pom.xml $DIR - -( - cd $DIR - - find . -name '\.svn' -exec rm -rf {} \; - - ( - cd src - - mkdir main ; mv java main - - ( cd test ; mkdir java ; mv org java ) - - ) - -) diff --git a/telnet/project.properties b/telnet/project.properties deleted file mode 100644 index d8a8fc95..00000000 --- a/telnet/project.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright 2005 the original author or authors. -# -# 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. -### -maven.repo.remote=http://www.xbean.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven,http://emma.sourceforge.net/maven - -maven.compile.source=1.4 -maven.compile.target=1.4 -maven.compile.deprecation=true -maven.compile.debug=true -maven.compile.optimize=true - -maven.remote.group=xbean -maven.username=${user.name} -maven.repo.central=beaver.codehaus.org -maven.repo.central.directory=/dist - -maven.javadoc.source=1.4 -maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/ -maven.javadoc.additionalparam=-linksource - -maven.site.deploy.method=rsync -maven.site.deploy.clean=true -maven.emma.report.xml=true diff --git a/telnet/project.xml b/telnet/project.xml deleted file mode 100644 index 2875a3ed..00000000 --- a/telnet/project.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - 3 - - XBean :: Telnet - xbean-telnet - xbean - 2.0-SNAPSHOT - - XBean.org - http://xbean.org - - - org.xbean - - XBean: Telnet protocol and shell library - - - Telnet protocol and shell library - - - http://www.xbean.org/ - - www.xbean.org - /home/projects/xbean/public_html/maven - - - - xbean developers - mailto:dev-subscribe@xbean.org - mailto:dev-unsubscribe@xbean.org - - - xbean users - mailto:user-subscribe@xbean.org - mailto:user-unsubscribe@xbean.org - - - xbean source control messages - mailto:scm-subscribe@xbean.org - mailto:scm-unsubscribe@xbean.org - - - - - - groovy - groovy - 1.0-jsr-03 - - - emma - maven-emma-plugin - 0.6 - plugin - - - - - src/java - src/test - - - **/*Test.java - - - - - - maven-jxr-plugin - maven-javadoc-plugin - maven-junit-report-plugin - - - - diff --git a/telnet/src/java/org/xbean/telnet/Command.java b/telnet/src/main/java/org/xbean/telnet/Command.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/Command.java rename to telnet/src/main/java/org/xbean/telnet/Command.java diff --git a/telnet/src/java/org/xbean/telnet/Exit.java b/telnet/src/main/java/org/xbean/telnet/Exit.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/Exit.java rename to telnet/src/main/java/org/xbean/telnet/Exit.java diff --git a/telnet/src/java/org/xbean/telnet/GroovySh.java b/telnet/src/main/java/org/xbean/telnet/GroovySh.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/GroovySh.java rename to telnet/src/main/java/org/xbean/telnet/GroovySh.java diff --git a/telnet/src/java/org/xbean/telnet/Help.java b/telnet/src/main/java/org/xbean/telnet/Help.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/Help.java rename to telnet/src/main/java/org/xbean/telnet/Help.java diff --git a/telnet/src/java/org/xbean/telnet/Lookup.java b/telnet/src/main/java/org/xbean/telnet/Lookup.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/Lookup.java rename to telnet/src/main/java/org/xbean/telnet/Lookup.java diff --git a/telnet/src/java/org/xbean/telnet/TelnetCodes.java b/telnet/src/main/java/org/xbean/telnet/TelnetCodes.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TelnetCodes.java rename to telnet/src/main/java/org/xbean/telnet/TelnetCodes.java diff --git a/telnet/src/java/org/xbean/telnet/TelnetDaemon.java b/telnet/src/main/java/org/xbean/telnet/TelnetDaemon.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TelnetDaemon.java rename to telnet/src/main/java/org/xbean/telnet/TelnetDaemon.java diff --git a/telnet/src/java/org/xbean/telnet/TelnetInputStream.java b/telnet/src/main/java/org/xbean/telnet/TelnetInputStream.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TelnetInputStream.java rename to telnet/src/main/java/org/xbean/telnet/TelnetInputStream.java diff --git a/telnet/src/java/org/xbean/telnet/TelnetOption.java b/telnet/src/main/java/org/xbean/telnet/TelnetOption.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TelnetOption.java rename to telnet/src/main/java/org/xbean/telnet/TelnetOption.java diff --git a/telnet/src/java/org/xbean/telnet/TelnetPrintStream.java b/telnet/src/main/java/org/xbean/telnet/TelnetPrintStream.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TelnetPrintStream.java rename to telnet/src/main/java/org/xbean/telnet/TelnetPrintStream.java diff --git a/telnet/src/java/org/xbean/telnet/TelnetShell.java b/telnet/src/main/java/org/xbean/telnet/TelnetShell.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TelnetShell.java rename to telnet/src/main/java/org/xbean/telnet/TelnetShell.java diff --git a/telnet/src/java/org/xbean/telnet/Test.java b/telnet/src/main/java/org/xbean/telnet/Test.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/Test.java rename to telnet/src/main/java/org/xbean/telnet/Test.java diff --git a/telnet/src/java/org/xbean/telnet/TextConsole.java b/telnet/src/main/java/org/xbean/telnet/TextConsole.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/TextConsole.java rename to telnet/src/main/java/org/xbean/telnet/TextConsole.java diff --git a/telnet/src/java/org/xbean/telnet/Version.java b/telnet/src/main/java/org/xbean/telnet/Version.java similarity index 100% rename from telnet/src/java/org/xbean/telnet/Version.java rename to telnet/src/main/java/org/xbean/telnet/Version.java diff --git a/telnet/src/test/org/xbean/telnet/TelnetShellTest.java b/telnet/src/test/java/org/xbean/telnet/TelnetShellTest.java similarity index 100% rename from telnet/src/test/org/xbean/telnet/TelnetShellTest.java rename to telnet/src/test/java/org/xbean/telnet/TelnetShellTest.java From 9f84d66432421d859c75d97009aa7e3b50bb9b82 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 1 Nov 2005 11:01:03 +0000 Subject: [PATCH 045/736] Fix for handling arrays of qnames git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380464 13f79535-47bb-0310-9956-ffa450edef68 --- .../spring/context/impl/QNameHelper.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java index 861587cc..5dfa9157 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java @@ -22,12 +22,15 @@ import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.beans.factory.support.ManagedList; import org.w3c.dom.Element; import org.w3c.dom.Node; import javax.xml.namespace.QName; import java.beans.PropertyDescriptor; +import java.util.Iterator; +import java.util.List; /** * @@ -92,6 +95,27 @@ public static void coerceNamespaceAwarePropertyValues(AbstractBeanDefinition bd, propertyValues.addPropertyValue(name, createQName(element, (String) value)); } } + } else if (descriptor.getPropertyType().isAssignableFrom(QName[].class)) { + String name = descriptor.getName(); + MutablePropertyValues propertyValues = bd.getPropertyValues(); + PropertyValue propertyValue = propertyValues.getPropertyValue(name); + if (propertyValue != null) { + Object value = propertyValue.getValue(); + if (value instanceof List) { + List values = (List) value; + List newValues = new ManagedList(); + for (Iterator iter = values.iterator(); iter.hasNext();) { + Object v = iter.next(); + if (v instanceof String) { + newValues.add(createQName(element, (String) v)); + } else { + newValues.add(v); + } + } + propertyValues.removePropertyValue(propertyValue); + propertyValues.addPropertyValue(name, newValues); + } + } } } } From 3726c553367328fab6df45a4f639045ca8ae85e5 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 1 Nov 2005 17:30:01 +0000 Subject: [PATCH 046/736] Added empty resource directory and deleted cruft from m2 conversion git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380465 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/src/test/java/org/xbean/jmx/jmx-simple.xml | 11 ----------- jmx/src/test/java/org/xbean/jmx/jmx.xml | 17 ----------------- 2 files changed, 28 deletions(-) delete mode 100644 jmx/src/test/java/org/xbean/jmx/jmx-simple.xml delete mode 100644 jmx/src/test/java/org/xbean/jmx/jmx.xml diff --git a/jmx/src/test/java/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/java/org/xbean/jmx/jmx-simple.xml deleted file mode 100644 index 55215a79..00000000 --- a/jmx/src/test/java/org/xbean/jmx/jmx-simple.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/jmx/src/test/java/org/xbean/jmx/jmx.xml b/jmx/src/test/java/org/xbean/jmx/jmx.xml deleted file mode 100644 index 654db7dd..00000000 --- a/jmx/src/test/java/org/xbean/jmx/jmx.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - From b436526d3ccc54eb2492abe0173ed251b1ed4f78 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Wed, 2 Nov 2005 02:12:41 +0000 Subject: [PATCH 047/736] Added maven-one-plugin goal to publish to both our m1 and m2 remote repos git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380466 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 488f0b0c..15f6591f 100644 --- a/pom.xml +++ b/pom.xml @@ -181,12 +181,12 @@ xbean-repo XBean Central Repository - scpexe://xbean.org/home/projects/xbean/m2-repository + scpexe://xbean.org/home/projects/xbean/dist-m2 xbean-snapshots XBean Central Development Repository - scpexe://xbean.org/home/projects/xbean/m2-repository + scpexe://xbean.org/home/projects/xbean/dist-m2 xbean-website @@ -211,8 +211,12 @@ maven-one-plugin + + scpexe://xbean.org/dist + install-maven-one-repository + deploy-maven-one-repository @@ -221,8 +225,8 @@ org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-5 + wagon-ssh-external + 1.0-alpha-5 From 475c6e029495637155c3fefeec803e2ee885b342 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 2 Nov 2005 11:55:24 +0000 Subject: [PATCH 048/736] Add simple jndi context factory using xbean git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380467 13f79535-47bb-0310-9956-ffa450edef68 --- spring/pom.xml | 4 + .../impl/XBeanXmlBeanDefinitionReader.java | 2 +- .../context/impl/XBeanXmlBeanFactory.java | 75 +++ .../org/xbean/spring/jndi/DefaultContext.java | 452 ++++++++++++++++++ .../org/xbean/spring/jndi/NameParserImpl.java | 37 ++ .../xbean/spring/jndi/ReadOnlyContext.java | 408 ++++++++++++++++ .../jndi/SpringInitialContextFactory.java | 107 +++++ .../{ => impl}/NamedConstructorArgsTest.java | 0 .../java/org/xbean/spring/jndi/JndiTest.java | 22 + .../resources/org/xbean/spring/jndi/jndi.xml | 29 ++ 10 files changed, 1135 insertions(+), 1 deletion(-) create mode 100644 spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanFactory.java create mode 100644 spring/src/main/java/org/xbean/spring/jndi/DefaultContext.java create mode 100644 spring/src/main/java/org/xbean/spring/jndi/NameParserImpl.java create mode 100644 spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java create mode 100644 spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java rename spring/src/test/java/org/xbean/spring/context/{ => impl}/NamedConstructorArgsTest.java (100%) create mode 100644 spring/src/test/java/org/xbean/spring/jndi/JndiTest.java create mode 100644 spring/src/test/resources/org/xbean/spring/jndi/jndi.xml diff --git a/spring/pom.xml b/spring/pom.xml index 6ae2cf79..2704e12e 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -48,6 +48,10 @@ stax stax-api + + backport-util-concurrent + backport-util-concurrent + diff --git a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java index a1e3ba33..43536909 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java @@ -43,7 +43,7 @@ public class XBeanXmlBeanDefinitionReader extends XmlBeanDefinitionReader { private final List xmlPreprocessors; /** - * Creates a XBeanXmlBeanDefinitionReader for the specified applcationContext and beanFactory which will apply + * Creates a XBeanXmlBeanDefinitionReader for the specified applicationContext and beanFactory which will apply * the xmlPreprocessors before passing the DOM to Spring for processing. * @param applicationContext the application context for which the bean definitons will be loaded * @param beanFactory the beanFactory that services will be loaded diff --git a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanFactory.java b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanFactory.java new file mode 100644 index 00000000..646c5d40 --- /dev/null +++ b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanFactory.java @@ -0,0 +1,75 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.context.impl; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.core.io.Resource; + +import java.util.Collections; +import java.util.List; + +public class XBeanXmlBeanFactory extends DefaultListableBeanFactory { + + /** + * Create a new XBeanXmlBeanFactory with the given resource, + * which must be parsable using DOM. + * @param resource XML resource to load bean definitions from + * @throws BeansException in case of loading or parsing errors + */ + public XBeanXmlBeanFactory(Resource resource) throws BeansException { + this(resource, null, Collections.EMPTY_LIST); + } + + /** + * Create a new XBeanXmlBeanFactory with the given input stream, + * which must be parsable using DOM. + * @param resource XML resource to load bean definitions from + * @param parentBeanFactory parent bean factory + * @throws BeansException in case of loading or parsing errors + */ + public XBeanXmlBeanFactory(Resource resource, BeanFactory parentBeanFactory) throws BeansException { + this(resource, parentBeanFactory, Collections.EMPTY_LIST); + } + + /** + * Create a new XBeanXmlBeanFactory with the given input stream, + * which must be parsable using DOM. + * @param resource XML resource to load bean definitions from + * @param xmlPreprocessors the preprocessors to apply the DOM before passing to Spring for processing + * @throws BeansException in case of loading or parsing errors + */ + public XBeanXmlBeanFactory(Resource resource, List xmlPreprocessors) throws BeansException { + this(resource, null, xmlPreprocessors); + } + + /** + * Create a new XBeanXmlBeanFactory with the given input stream, + * which must be parsable using DOM. + * @param resource XML resource to load bean definitions from + * @param parentBeanFactory parent bean factory + * @param xmlPreprocessors the preprocessors to apply the DOM before passing to Spring for processing + * @throws BeansException in case of loading or parsing errors + */ + public XBeanXmlBeanFactory(Resource resource, BeanFactory parentBeanFactory, List xmlPreprocessors) throws BeansException { + super(parentBeanFactory); + XBeanXmlBeanDefinitionReader reader = new XBeanXmlBeanDefinitionReader(null, this, xmlPreprocessors); + reader.loadBeanDefinitions(resource); + } + +} diff --git a/spring/src/main/java/org/xbean/spring/jndi/DefaultContext.java b/spring/src/main/java/org/xbean/spring/jndi/DefaultContext.java new file mode 100644 index 00000000..c04757e6 --- /dev/null +++ b/spring/src/main/java/org/xbean/spring/jndi/DefaultContext.java @@ -0,0 +1,452 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * 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. + */ +package org.xbean.spring.jndi; + +import javax.naming.Binding; +import javax.naming.CompositeName; +import javax.naming.Context; +import javax.naming.LinkRef; +import javax.naming.Name; +import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; +import javax.naming.NameParser; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.NotContextException; +import javax.naming.OperationNotSupportedException; +import javax.naming.Reference; +import javax.naming.spi.NamingManager; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; + +/** + * A simple spring based JNDI context which is mutable + * + * @version $Revision: 657 $ + */ +public class DefaultContext implements Context, Serializable { + + private static final long serialVersionUID = -5754338187296859149L; + protected static final NameParser nameParser = new NameParserImpl(); + + private boolean freeze = false; + + protected final Hashtable environment; // environment for this context + protected final Map bindings; // bindings at my level + protected final Map treeBindings; // all bindings under me + + private boolean frozen = false; + private String nameInNamespace = ""; + public static final String SEPARATOR = "/"; + + public DefaultContext() { + environment = new Hashtable(); + bindings = new HashMap(); + treeBindings = new HashMap(); + } + + public DefaultContext(Hashtable env) { + if (env == null) { + this.environment = new Hashtable(); + } + else { + this.environment = new Hashtable(env); + } + this.bindings = new HashMap(); + this.treeBindings = new HashMap(); + } + + public DefaultContext(Hashtable environment, Map bindings) { + if (environment == null) { + this.environment = new Hashtable(); + } + else { + this.environment = new Hashtable(environment); + } + this.bindings = bindings; + treeBindings = new HashMap(); + frozen = true; + } + + public DefaultContext(Hashtable environment, Map bindings, String nameInNamespace) { + this(environment, bindings); + this.nameInNamespace = nameInNamespace; + } + + protected DefaultContext(DefaultContext clone, Hashtable env) { + this.bindings = clone.bindings; + this.treeBindings = clone.treeBindings; + this.environment = new Hashtable(env); + } + + protected DefaultContext(DefaultContext clone, Hashtable env, String nameInNamespace) { + this(clone, env); + this.nameInNamespace = nameInNamespace; + } + + public Object addToEnvironment(String propName, Object propVal) throws NamingException { + return environment.put(propName, propVal); + } + + public Hashtable getEnvironment() throws NamingException { + return (Hashtable) environment.clone(); + } + + public Object removeFromEnvironment(String propName) throws NamingException { + return environment.remove(propName); + } + + public Object lookup(String name) throws NamingException { + if (name.length() == 0) { + return this; + } + Object result = treeBindings.get(name); + if (result == null) { + result = bindings.get(name); + } + if (result == null) { + int pos = name.indexOf(':'); + if (pos > 0) { + String scheme = name.substring(0, pos); + Context ctx = NamingManager.getURLContext(scheme, environment); + if (ctx == null) { + throw new NamingException("scheme " + scheme + " not recognized"); + } + return ctx.lookup(name); + } + else { + // Split out the first name of the path + // and look for it in the bindings map. + CompositeName path = new CompositeName(name); + + if (path.size() == 0) { + return this; + } + else { + String first = path.get(0); + Object obj = bindings.get(first); + if (obj == null) { + throw new NameNotFoundException(name); + } + else if (obj instanceof Context && path.size() > 1) { + Context subContext = (Context) obj; + obj = subContext.lookup(path.getSuffix(1)); + } + return obj; + } + } + } + if (result instanceof LinkRef) { + LinkRef ref = (LinkRef) result; + result = lookup(ref.getLinkName()); + } + if (result instanceof Reference) { + try { + result = NamingManager.getObjectInstance(result, null, null, this.environment); + } + catch (NamingException e) { + throw e; + } + catch (Exception e) { + throw (NamingException) new NamingException("could not look up : " + name).initCause(e); + } + } + if (result instanceof DefaultContext) { + String prefix = getNameInNamespace(); + if (prefix.length() > 0) { + prefix = prefix + SEPARATOR; + } + result = new DefaultContext((DefaultContext) result, environment, prefix + name); + } + return result; + } + + public Object lookup(Name name) throws NamingException { + return lookup(name.toString()); + } + + public Object lookupLink(String name) throws NamingException { + return lookup(name); + } + + public Name composeName(Name name, Name prefix) throws NamingException { + Name result = (Name) prefix.clone(); + result.addAll(name); + return result; + } + + public String composeName(String name, String prefix) throws NamingException { + CompositeName result = new CompositeName(prefix); + result.addAll(new CompositeName(name)); + return result.toString(); + } + + public NamingEnumeration list(String name) throws NamingException { + Object o = lookup(name); + if (o == this) { + return new DefaultContext.ListEnumeration(); + } + else if (o instanceof Context) { + return ((Context) o).list(""); + } + else { + throw new NotContextException(); + } + } + + public NamingEnumeration listBindings(String name) throws NamingException { + Object o = lookup(name); + if (o == this) { + return new DefaultContext.ListBindingEnumeration(); + } + else if (o instanceof Context) { + return ((Context) o).listBindings(""); + } + else { + throw new NotContextException(); + } + } + + public Object lookupLink(Name name) throws NamingException { + return lookupLink(name.toString()); + } + + public NamingEnumeration list(Name name) throws NamingException { + return list(name.toString()); + } + + public NamingEnumeration listBindings(Name name) throws NamingException { + return listBindings(name.toString()); + } + + public void bind(Name name, Object value) throws NamingException { + bind(name.toString(), value); + } + + public void bind(String name, Object value) throws NamingException { + checkFrozen(); + internalBind(name, value); + } + + public void close() throws NamingException { + // ignore + } + + public Context createSubcontext(Name name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public Context createSubcontext(String name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void destroySubcontext(Name name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void destroySubcontext(String name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public String getNameInNamespace() throws NamingException { + return nameInNamespace; + } + + public NameParser getNameParser(Name name) throws NamingException { + return nameParser; + } + + public NameParser getNameParser(String name) throws NamingException { + return nameParser; + } + + public void rebind(Name name, Object value) throws NamingException { + rebind(name.toString(), value); + } + + public void rebind(String name, Object value) throws NamingException { + checkFrozen(); + internalBind(name, value, true); + } + + public void rename(Name oldName, Name newName) throws NamingException { + checkFrozen(); + Object value = lookup(oldName); + unbind(oldName); + bind(newName, value); + } + + public void rename(String oldName, String newName) throws NamingException { + Object value = lookup(oldName); + unbind(oldName); + bind(newName, value); + } + + public void unbind(Name name) throws NamingException { + unbind(name.toString()); + } + + public void unbind(String name) throws NamingException { + checkFrozen(); + internalBind(name, null, true); + } + + private abstract class LocalNamingEnumeration implements NamingEnumeration { + private Iterator i = bindings.entrySet().iterator(); + + public boolean hasMore() throws NamingException { + return i.hasNext(); + } + + public boolean hasMoreElements() { + return i.hasNext(); + } + + protected Map.Entry getNext() { + return (Map.Entry) i.next(); + } + + public void close() throws NamingException { + } + } + + private class ListEnumeration extends DefaultContext.LocalNamingEnumeration { + public Object next() throws NamingException { + return nextElement(); + } + + public Object nextElement() { + Map.Entry entry = getNext(); + return new NameClassPair((String) entry.getKey(), entry.getValue().getClass().getName()); + } + } + + private class ListBindingEnumeration extends DefaultContext.LocalNamingEnumeration { + public Object next() throws NamingException { + return nextElement(); + } + + public Object nextElement() { + Map.Entry entry = getNext(); + return new Binding((String) entry.getKey(), entry.getValue()); + } + } + + public Map getEntries() { + return new HashMap(bindings); + } + + public void setEntries(Map entries) throws NamingException { + if (entries != null) { + for (Iterator iter = entries.entrySet().iterator(); iter.hasNext();) { + Map.Entry entry = (Map.Entry) iter.next(); + String name = (String) entry.getKey(); + Object value = entry.getValue(); + internalBind(name, value); + } + } + } + + public boolean isFreeze() { + return freeze; + } + + public void setFreeze(boolean freeze) { + this.freeze = freeze; + } + + /** + * internalBind is intended for use only during setup or possibly by suitably synchronized superclasses. + * It binds every possible lookup into a map in each context. To do this, each context + * strips off one name segment and if necessary creates a new context for it. Then it asks that context + * to bind the remaining name. It returns a map containing all the bindings from the next context, plus + * the context it just created (if it in fact created it). (the names are suitably extended by the segment + * originally lopped off). + * + * @param name + * @param value + * @return + * @throws javax.naming.NamingException + */ + protected Map internalBind(String name, Object value) throws NamingException { + return internalBind(name, value, false); + + } + protected Map internalBind(String name, Object value, boolean allowRebind) throws NamingException { + + if (name == null || name.length() == 0){ + throw new NamingException("Invalid Name " + name); + } + if (frozen){ + throw new NamingException("Read only"); + } + + Map newBindings = new HashMap(); + int pos = name.indexOf('/'); + if (pos == -1) { + Object oldValue = treeBindings.put(name, value); + if (!allowRebind && oldValue != null) { + throw new NamingException("Something already bound at " + name); + } + bindings.put(name, value); + newBindings.put(name, value); + } + else { + String segment = name.substring(0, pos); + + if (segment == null || segment.length()==0){ + throw new NamingException("Invalid segment " + segment); + } + Object o = treeBindings.get(segment); + if (o == null) { + o = newContext(); + treeBindings.put(segment, o); + bindings.put(segment, o); + newBindings.put(segment, o); + } + else if (!(o instanceof DefaultContext)) { + throw new NamingException("Something already bound where a subcontext should go"); + } + DefaultContext defaultContext = (DefaultContext) o; + String remainder = name.substring(pos + 1); + Map subBindings = defaultContext.internalBind(remainder, value, allowRebind); + for (Iterator iterator = subBindings.entrySet().iterator(); iterator.hasNext();) { + Map.Entry entry = (Map.Entry) iterator.next(); + String subName = segment + "/" + (String) entry.getKey(); + Object bound = entry.getValue(); + treeBindings.put(subName, bound); + newBindings.put(subName, bound); + } + } + return newBindings; + } + + protected void checkFrozen() throws OperationNotSupportedException { + if (isFreeze()) { + throw new OperationNotSupportedException("JNDI context is frozen!"); + } + } + + protected DefaultContext newContext() { + return new DefaultContext(); + } + +} diff --git a/spring/src/main/java/org/xbean/spring/jndi/NameParserImpl.java b/spring/src/main/java/org/xbean/spring/jndi/NameParserImpl.java new file mode 100644 index 00000000..0e94fa45 --- /dev/null +++ b/spring/src/main/java/org/xbean/spring/jndi/NameParserImpl.java @@ -0,0 +1,37 @@ +/** +* ActiveMQ: The Open Source Message Fabric +* +* Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com +* +* 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. +* +**/ + +package org.xbean.spring.jndi; + +import javax.naming.CompositeName; +import javax.naming.Name; +import javax.naming.NameParser; +import javax.naming.NamingException; + +/** + * A default implementation of {@link NameParser} + * + * @version $Revision: 1.2 $ + */ +public class NameParserImpl implements NameParser { + + public Name parse(String name) throws NamingException { + return new CompositeName(name); + } +} diff --git a/spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java b/spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java new file mode 100644 index 00000000..522330b2 --- /dev/null +++ b/spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java @@ -0,0 +1,408 @@ +/** +* ActiveMQ: The Open Source Message Fabric +* +* Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com +* +* 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. +* +**/ + +package org.xbean.spring.jndi; + +import javax.naming.*; +import javax.naming.spi.NamingManager; +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; + +/** + * A read-only Context + *

+ * This version assumes it and all its subcontext are read-only and any attempt + * to modify (e.g. through bind) will result in an OperationNotSupportedException. + * Each Context in the tree builds a cache of the entries in all sub-contexts + * to optimise the performance of lookup. + *

+ *

This implementation is intended to optimise the performance of lookup(String) + * to about the level of a HashMap get. It has been observed that the scheme + * resolution phase performed by the JVM takes considerably longer, so for + * optimum performance lookups should be coded like:

+ * + * Context componentContext = (Context)new InitialContext().lookup("java:comp"); + * String envEntry = (String) componentContext.lookup("env/myEntry"); + * String envEntry2 = (String) componentContext.lookup("env/myEntry2"); + * + * + * @version $Revision: 1.2 $ $Date: 2005/08/27 03:52:39 $ + */ +public class ReadOnlyContext implements Context, Serializable { + private static final long serialVersionUID = -5754338187296859149L; + protected static final NameParser nameParser = new NameParserImpl(); + + protected final Hashtable environment; // environment for this context + protected final Map bindings; // bindings at my level + protected final Map treeBindings; // all bindings under me + + private boolean frozen = false; + private String nameInNamespace = ""; + public static final String SEPARATOR = "/"; + + public ReadOnlyContext() { + environment = new Hashtable(); + bindings = new HashMap(); + treeBindings = new HashMap(); + } + + public ReadOnlyContext(Hashtable env) { + if (env == null) { + this.environment = new Hashtable(); + } + else { + this.environment = new Hashtable(env); + } + this.bindings = Collections.EMPTY_MAP; + this.treeBindings = Collections.EMPTY_MAP; + } + + public ReadOnlyContext(Hashtable environment, Map bindings) { + if (environment == null) { + this.environment = new Hashtable(); + } + else { + this.environment = new Hashtable(environment); + } + this.bindings = bindings; + treeBindings = new HashMap(); + frozen = true; + } + + public ReadOnlyContext(Hashtable environment, Map bindings, String nameInNamespace) { + this(environment, bindings); + this.nameInNamespace = nameInNamespace; + } + + protected ReadOnlyContext(ReadOnlyContext clone, Hashtable env) { + this.bindings = clone.bindings; + this.treeBindings = clone.treeBindings; + this.environment = new Hashtable(env); + } + + protected ReadOnlyContext(ReadOnlyContext clone, Hashtable env, String nameInNamespace) { + this(clone, env); + this.nameInNamespace = nameInNamespace; + } + + public void freeze() { + frozen = true; + } + + boolean isFrozen() { + return frozen; + } + + /** + * internalBind is intended for use only during setup or possibly by suitably synchronized superclasses. + * It binds every possible lookup into a map in each context. To do this, each context + * strips off one name segment and if necessary creates a new context for it. Then it asks that context + * to bind the remaining name. It returns a map containing all the bindings from the next context, plus + * the context it just created (if it in fact created it). (the names are suitably extended by the segment + * originally lopped off). + * + * @param name + * @param value + * @return + * @throws javax.naming.NamingException + */ + protected Map internalBind(String name, Object value) throws NamingException { + Map newBindings = new HashMap(); + int pos = name.indexOf('/'); + if (pos == -1) { + if (treeBindings.put(name, value) != null) { + throw new NamingException("Something already bound at " + name); + } + bindings.put(name, value); + newBindings.put(name, value); + } + else { + String segment = name.substring(0, pos); + Object o = treeBindings.get(segment); + if (o == null) { + o = newContext(); + treeBindings.put(segment, o); + bindings.put(segment, o); + newBindings.put(segment, o); + } + else if (!(o instanceof ReadOnlyContext)) { + throw new NamingException("Something already bound where a subcontext should go"); + } + ReadOnlyContext readOnlyContext = (ReadOnlyContext) o; + String remainder = name.substring(pos + 1); + Map subBindings = readOnlyContext.internalBind(remainder, value); + for (Iterator iterator = subBindings.entrySet().iterator(); iterator.hasNext();) { + Map.Entry entry = (Map.Entry) iterator.next(); + String subName = segment + "/" + (String) entry.getKey(); + Object bound = entry.getValue(); + treeBindings.put(subName, bound); + newBindings.put(subName, bound); + } + } + return newBindings; + } + + protected ReadOnlyContext newContext() { + return new ReadOnlyContext(); + } + + public Object addToEnvironment(String propName, Object propVal) throws NamingException { + return environment.put(propName, propVal); + } + + public Hashtable getEnvironment() throws NamingException { + return (Hashtable) environment.clone(); + } + + public Object removeFromEnvironment(String propName) throws NamingException { + return environment.remove(propName); + } + + public Object lookup(String name) throws NamingException { + if (name.length() == 0) { + return this; + } + Object result = treeBindings.get(name); + if (result == null) { + result = bindings.get(name); + } + if (result == null) { + int pos = name.indexOf(':'); + if (pos > 0) { + String scheme = name.substring(0, pos); + Context ctx = NamingManager.getURLContext(scheme, environment); + if (ctx == null) { + throw new NamingException("scheme " + scheme + " not recognized"); + } + return ctx.lookup(name); + } + else { + // Split out the first name of the path + // and look for it in the bindings map. + CompositeName path = new CompositeName(name); + + if (path.size() == 0) { + return this; + } + else { + String first = path.get(0); + Object obj = bindings.get(first); + if (obj == null) { + throw new NameNotFoundException(name); + } + else if (obj instanceof Context && path.size() > 1) { + Context subContext = (Context) obj; + obj = subContext.lookup(path.getSuffix(1)); + } + return obj; + } + } + } + if (result instanceof LinkRef) { + LinkRef ref = (LinkRef) result; + result = lookup(ref.getLinkName()); + } + if (result instanceof Reference) { + try { + result = NamingManager.getObjectInstance(result, null, null, this.environment); + } + catch (NamingException e) { + throw e; + } + catch (Exception e) { + throw (NamingException) new NamingException("could not look up : " + name).initCause(e); + } + } + if (result instanceof ReadOnlyContext) { + String prefix = getNameInNamespace(); + if (prefix.length() > 0) { + prefix = prefix + SEPARATOR; + } + result = new ReadOnlyContext((ReadOnlyContext) result, environment, prefix + name); + } + return result; + } + + public Object lookup(Name name) throws NamingException { + return lookup(name.toString()); + } + + public Object lookupLink(String name) throws NamingException { + return lookup(name); + } + + public Name composeName(Name name, Name prefix) throws NamingException { + Name result = (Name) prefix.clone(); + result.addAll(name); + return result; + } + + public String composeName(String name, String prefix) throws NamingException { + CompositeName result = new CompositeName(prefix); + result.addAll(new CompositeName(name)); + return result.toString(); + } + + public NamingEnumeration list(String name) throws NamingException { + Object o = lookup(name); + if (o == this) { + return new ListEnumeration(); + } + else if (o instanceof Context) { + return ((Context) o).list(""); + } + else { + throw new NotContextException(); + } + } + + public NamingEnumeration listBindings(String name) throws NamingException { + Object o = lookup(name); + if (o == this) { + return new ListBindingEnumeration(); + } + else if (o instanceof Context) { + return ((Context) o).listBindings(""); + } + else { + throw new NotContextException(); + } + } + + public Object lookupLink(Name name) throws NamingException { + return lookupLink(name.toString()); + } + + public NamingEnumeration list(Name name) throws NamingException { + return list(name.toString()); + } + + public NamingEnumeration listBindings(Name name) throws NamingException { + return listBindings(name.toString()); + } + + public void bind(Name name, Object obj) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void bind(String name, Object obj) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void close() throws NamingException { + // ignore + } + + public Context createSubcontext(Name name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public Context createSubcontext(String name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void destroySubcontext(Name name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void destroySubcontext(String name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public String getNameInNamespace() throws NamingException { + return nameInNamespace; + } + + public NameParser getNameParser(Name name) throws NamingException { + return nameParser; + } + + public NameParser getNameParser(String name) throws NamingException { + return nameParser; + } + + public void rebind(Name name, Object obj) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void rebind(String name, Object obj) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void rename(Name oldName, Name newName) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void rename(String oldName, String newName) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void unbind(Name name) throws NamingException { + throw new OperationNotSupportedException(); + } + + public void unbind(String name) throws NamingException { + throw new OperationNotSupportedException(); + } + + private abstract class LocalNamingEnumeration implements NamingEnumeration { + private Iterator i = bindings.entrySet().iterator(); + + public boolean hasMore() throws NamingException { + return i.hasNext(); + } + + public boolean hasMoreElements() { + return i.hasNext(); + } + + protected Map.Entry getNext() { + return (Map.Entry) i.next(); + } + + public void close() throws NamingException { + } + } + + private class ListEnumeration extends LocalNamingEnumeration { + public Object next() throws NamingException { + return nextElement(); + } + + public Object nextElement() { + Map.Entry entry = getNext(); + return new NameClassPair((String) entry.getKey(), entry.getValue().getClass().getName()); + } + } + + private class ListBindingEnumeration extends LocalNamingEnumeration { + public Object next() throws NamingException { + return nextElement(); + } + + public Object nextElement() { + Map.Entry entry = getNext(); + return new Binding((String) entry.getKey(), entry.getValue()); + } + } +} diff --git a/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java b/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java new file mode 100644 index 00000000..701cd43c --- /dev/null +++ b/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java @@ -0,0 +1,107 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.jndi; + +import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceEditor; +import org.xbean.spring.context.impl.XBeanXmlBeanFactory; + +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.spi.InitialContextFactory; + +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; + +/** + * A simple JNDI initial context which loads the JNDI namespace from a spring.xml configuration file. + * The spring.xml configuration file can be specified by the {@link Context#PROVIDER_URL} property + * which can be any spring resource string (classpath://foo.xml, or file://foo/bar.xml or a URL) + * otherwise the jndi.xml file is found on the classpath. + * + * @version $Revision: 657 $ + */ +public class SpringInitialContextFactory implements InitialContextFactory { + private static final transient Log log = LogFactory.getLog(SpringInitialContextFactory.class); + + private static Map cache = new HashMap(); + + private static Context singleton; + + /** + * A factory method which can be used to initialise a singleton JNDI context from inside a Spring.xml + * such that future calls to new InitialContext() will reuse it + */ + public static Context makeInitialContext() { + singleton = new DefaultContext(); + return singleton; + } + + public Context getInitialContext(Hashtable environment) throws NamingException { + if (singleton != null) { + return singleton; + } + Resource resource = null; + Object value = environment.get(Context.PROVIDER_URL); + String key = "jndi.xml"; + if (value == null) { + resource = new ClassPathResource(key); + } + else { + if (value instanceof Resource) { + resource = (Resource) value; + } + else { + ResourceEditor editor = new ResourceEditor(); + key = value.toString(); + editor.setAsText(key); + resource = (Resource) editor.getValue(); + } + } + BeanFactory context = loadContext(resource, key); + Context answer = (Context) context.getBean("jndi"); + if (answer == null) { + log.warn("No JNDI context available in JNDI resource: " + resource); + answer = new ReadOnlyContext(environment, new ConcurrentHashMap()); + } + return answer; + } + + protected BeanFactory loadContext(Resource resource, String key) { + synchronized (cache) { + BeanFactory answer = (BeanFactory) cache.get(key); + if (answer == null) { + answer = createContext(resource); + cache.put(key, answer); + } + return answer; + } + } + + protected BeanFactory createContext(Resource resource) { + log.info("Loading JNDI context from: " + resource); + return new XBeanXmlBeanFactory(resource); + } +} diff --git a/spring/src/test/java/org/xbean/spring/context/NamedConstructorArgsTest.java b/spring/src/test/java/org/xbean/spring/context/impl/NamedConstructorArgsTest.java similarity index 100% rename from spring/src/test/java/org/xbean/spring/context/NamedConstructorArgsTest.java rename to spring/src/test/java/org/xbean/spring/context/impl/NamedConstructorArgsTest.java diff --git a/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java b/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java new file mode 100644 index 00000000..1d2818dd --- /dev/null +++ b/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java @@ -0,0 +1,22 @@ +package org.xbean.spring.jndi; + +import javax.naming.Context; +import javax.naming.InitialContext; + +import junit.framework.TestCase; + +public class JndiTest extends TestCase { + + protected void setUp() throws Exception { + System.setProperty(Context.INITIAL_CONTEXT_FACTORY, SpringInitialContextFactory.class.getName()); + System.setProperty(Context.PROVIDER_URL, "classpath:org/xbean/spring/jndi/jndi.xml"); + } + + public void testJndi() throws Exception { + InitialContext context = new InitialContext(); + assertNotNull(context); + Object restaurant = context.lookup("restaurant"); + assertNotNull(restaurant); + } + +} diff --git a/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml b/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml new file mode 100644 index 00000000..4078cbf6 --- /dev/null +++ b/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c67a6493bc8374c14304ed3076fbda9325c400cc Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 2 Nov 2005 11:59:54 +0000 Subject: [PATCH 049/736] Add simple jndi context factory using xbean git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380468 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/spring/jndi/ReadOnlyContext.java | 408 ------------------ .../jndi/SpringInitialContextFactory.java | 2 +- 2 files changed, 1 insertion(+), 409 deletions(-) delete mode 100644 spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java diff --git a/spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java b/spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java deleted file mode 100644 index 522330b2..00000000 --- a/spring/src/main/java/org/xbean/spring/jndi/ReadOnlyContext.java +++ /dev/null @@ -1,408 +0,0 @@ -/** -* ActiveMQ: The Open Source Message Fabric -* -* Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com -* -* 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. -* -**/ - -package org.xbean.spring.jndi; - -import javax.naming.*; -import javax.naming.spi.NamingManager; -import java.io.Serializable; -import java.util.Collections; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.Map; - -/** - * A read-only Context - *

- * This version assumes it and all its subcontext are read-only and any attempt - * to modify (e.g. through bind) will result in an OperationNotSupportedException. - * Each Context in the tree builds a cache of the entries in all sub-contexts - * to optimise the performance of lookup. - *

- *

This implementation is intended to optimise the performance of lookup(String) - * to about the level of a HashMap get. It has been observed that the scheme - * resolution phase performed by the JVM takes considerably longer, so for - * optimum performance lookups should be coded like:

- * - * Context componentContext = (Context)new InitialContext().lookup("java:comp"); - * String envEntry = (String) componentContext.lookup("env/myEntry"); - * String envEntry2 = (String) componentContext.lookup("env/myEntry2"); - * - * - * @version $Revision: 1.2 $ $Date: 2005/08/27 03:52:39 $ - */ -public class ReadOnlyContext implements Context, Serializable { - private static final long serialVersionUID = -5754338187296859149L; - protected static final NameParser nameParser = new NameParserImpl(); - - protected final Hashtable environment; // environment for this context - protected final Map bindings; // bindings at my level - protected final Map treeBindings; // all bindings under me - - private boolean frozen = false; - private String nameInNamespace = ""; - public static final String SEPARATOR = "/"; - - public ReadOnlyContext() { - environment = new Hashtable(); - bindings = new HashMap(); - treeBindings = new HashMap(); - } - - public ReadOnlyContext(Hashtable env) { - if (env == null) { - this.environment = new Hashtable(); - } - else { - this.environment = new Hashtable(env); - } - this.bindings = Collections.EMPTY_MAP; - this.treeBindings = Collections.EMPTY_MAP; - } - - public ReadOnlyContext(Hashtable environment, Map bindings) { - if (environment == null) { - this.environment = new Hashtable(); - } - else { - this.environment = new Hashtable(environment); - } - this.bindings = bindings; - treeBindings = new HashMap(); - frozen = true; - } - - public ReadOnlyContext(Hashtable environment, Map bindings, String nameInNamespace) { - this(environment, bindings); - this.nameInNamespace = nameInNamespace; - } - - protected ReadOnlyContext(ReadOnlyContext clone, Hashtable env) { - this.bindings = clone.bindings; - this.treeBindings = clone.treeBindings; - this.environment = new Hashtable(env); - } - - protected ReadOnlyContext(ReadOnlyContext clone, Hashtable env, String nameInNamespace) { - this(clone, env); - this.nameInNamespace = nameInNamespace; - } - - public void freeze() { - frozen = true; - } - - boolean isFrozen() { - return frozen; - } - - /** - * internalBind is intended for use only during setup or possibly by suitably synchronized superclasses. - * It binds every possible lookup into a map in each context. To do this, each context - * strips off one name segment and if necessary creates a new context for it. Then it asks that context - * to bind the remaining name. It returns a map containing all the bindings from the next context, plus - * the context it just created (if it in fact created it). (the names are suitably extended by the segment - * originally lopped off). - * - * @param name - * @param value - * @return - * @throws javax.naming.NamingException - */ - protected Map internalBind(String name, Object value) throws NamingException { - Map newBindings = new HashMap(); - int pos = name.indexOf('/'); - if (pos == -1) { - if (treeBindings.put(name, value) != null) { - throw new NamingException("Something already bound at " + name); - } - bindings.put(name, value); - newBindings.put(name, value); - } - else { - String segment = name.substring(0, pos); - Object o = treeBindings.get(segment); - if (o == null) { - o = newContext(); - treeBindings.put(segment, o); - bindings.put(segment, o); - newBindings.put(segment, o); - } - else if (!(o instanceof ReadOnlyContext)) { - throw new NamingException("Something already bound where a subcontext should go"); - } - ReadOnlyContext readOnlyContext = (ReadOnlyContext) o; - String remainder = name.substring(pos + 1); - Map subBindings = readOnlyContext.internalBind(remainder, value); - for (Iterator iterator = subBindings.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - String subName = segment + "/" + (String) entry.getKey(); - Object bound = entry.getValue(); - treeBindings.put(subName, bound); - newBindings.put(subName, bound); - } - } - return newBindings; - } - - protected ReadOnlyContext newContext() { - return new ReadOnlyContext(); - } - - public Object addToEnvironment(String propName, Object propVal) throws NamingException { - return environment.put(propName, propVal); - } - - public Hashtable getEnvironment() throws NamingException { - return (Hashtable) environment.clone(); - } - - public Object removeFromEnvironment(String propName) throws NamingException { - return environment.remove(propName); - } - - public Object lookup(String name) throws NamingException { - if (name.length() == 0) { - return this; - } - Object result = treeBindings.get(name); - if (result == null) { - result = bindings.get(name); - } - if (result == null) { - int pos = name.indexOf(':'); - if (pos > 0) { - String scheme = name.substring(0, pos); - Context ctx = NamingManager.getURLContext(scheme, environment); - if (ctx == null) { - throw new NamingException("scheme " + scheme + " not recognized"); - } - return ctx.lookup(name); - } - else { - // Split out the first name of the path - // and look for it in the bindings map. - CompositeName path = new CompositeName(name); - - if (path.size() == 0) { - return this; - } - else { - String first = path.get(0); - Object obj = bindings.get(first); - if (obj == null) { - throw new NameNotFoundException(name); - } - else if (obj instanceof Context && path.size() > 1) { - Context subContext = (Context) obj; - obj = subContext.lookup(path.getSuffix(1)); - } - return obj; - } - } - } - if (result instanceof LinkRef) { - LinkRef ref = (LinkRef) result; - result = lookup(ref.getLinkName()); - } - if (result instanceof Reference) { - try { - result = NamingManager.getObjectInstance(result, null, null, this.environment); - } - catch (NamingException e) { - throw e; - } - catch (Exception e) { - throw (NamingException) new NamingException("could not look up : " + name).initCause(e); - } - } - if (result instanceof ReadOnlyContext) { - String prefix = getNameInNamespace(); - if (prefix.length() > 0) { - prefix = prefix + SEPARATOR; - } - result = new ReadOnlyContext((ReadOnlyContext) result, environment, prefix + name); - } - return result; - } - - public Object lookup(Name name) throws NamingException { - return lookup(name.toString()); - } - - public Object lookupLink(String name) throws NamingException { - return lookup(name); - } - - public Name composeName(Name name, Name prefix) throws NamingException { - Name result = (Name) prefix.clone(); - result.addAll(name); - return result; - } - - public String composeName(String name, String prefix) throws NamingException { - CompositeName result = new CompositeName(prefix); - result.addAll(new CompositeName(name)); - return result.toString(); - } - - public NamingEnumeration list(String name) throws NamingException { - Object o = lookup(name); - if (o == this) { - return new ListEnumeration(); - } - else if (o instanceof Context) { - return ((Context) o).list(""); - } - else { - throw new NotContextException(); - } - } - - public NamingEnumeration listBindings(String name) throws NamingException { - Object o = lookup(name); - if (o == this) { - return new ListBindingEnumeration(); - } - else if (o instanceof Context) { - return ((Context) o).listBindings(""); - } - else { - throw new NotContextException(); - } - } - - public Object lookupLink(Name name) throws NamingException { - return lookupLink(name.toString()); - } - - public NamingEnumeration list(Name name) throws NamingException { - return list(name.toString()); - } - - public NamingEnumeration listBindings(Name name) throws NamingException { - return listBindings(name.toString()); - } - - public void bind(Name name, Object obj) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void bind(String name, Object obj) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void close() throws NamingException { - // ignore - } - - public Context createSubcontext(Name name) throws NamingException { - throw new OperationNotSupportedException(); - } - - public Context createSubcontext(String name) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void destroySubcontext(Name name) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void destroySubcontext(String name) throws NamingException { - throw new OperationNotSupportedException(); - } - - public String getNameInNamespace() throws NamingException { - return nameInNamespace; - } - - public NameParser getNameParser(Name name) throws NamingException { - return nameParser; - } - - public NameParser getNameParser(String name) throws NamingException { - return nameParser; - } - - public void rebind(Name name, Object obj) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void rebind(String name, Object obj) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void rename(Name oldName, Name newName) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void rename(String oldName, String newName) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void unbind(Name name) throws NamingException { - throw new OperationNotSupportedException(); - } - - public void unbind(String name) throws NamingException { - throw new OperationNotSupportedException(); - } - - private abstract class LocalNamingEnumeration implements NamingEnumeration { - private Iterator i = bindings.entrySet().iterator(); - - public boolean hasMore() throws NamingException { - return i.hasNext(); - } - - public boolean hasMoreElements() { - return i.hasNext(); - } - - protected Map.Entry getNext() { - return (Map.Entry) i.next(); - } - - public void close() throws NamingException { - } - } - - private class ListEnumeration extends LocalNamingEnumeration { - public Object next() throws NamingException { - return nextElement(); - } - - public Object nextElement() { - Map.Entry entry = getNext(); - return new NameClassPair((String) entry.getKey(), entry.getValue().getClass().getName()); - } - } - - private class ListBindingEnumeration extends LocalNamingEnumeration { - public Object next() throws NamingException { - return nextElement(); - } - - public Object nextElement() { - Map.Entry entry = getNext(); - return new Binding((String) entry.getKey(), entry.getValue()); - } - } -} diff --git a/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java b/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java index 701cd43c..d4c23ae6 100644 --- a/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java +++ b/spring/src/main/java/org/xbean/spring/jndi/SpringInitialContextFactory.java @@ -84,7 +84,7 @@ public Context getInitialContext(Hashtable environment) throws NamingException { Context answer = (Context) context.getBean("jndi"); if (answer == null) { log.warn("No JNDI context available in JNDI resource: " + resource); - answer = new ReadOnlyContext(environment, new ConcurrentHashMap()); + answer = new DefaultContext(environment, new ConcurrentHashMap()); } return answer; } From a00e5034e203931b1f4e7049afc23b54c4059d75 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Wed, 2 Nov 2005 21:02:26 +0000 Subject: [PATCH 050/736] Added custom RMI classloader for those of us that have spaces in our maven home paths. This has been disabled until surefire can fork tests. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380469 13f79535-47bb-0310-9956-ffa450edef68 --- kernel/pom.xml | 18 +++ .../org/xbean/rmi/RMIClassLoaderSpiImpl.java | 152 ++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 kernel/src/main/java/org/xbean/rmi/RMIClassLoaderSpiImpl.java diff --git a/kernel/pom.xml b/kernel/pom.xml index 0809763e..5796dce0 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -23,6 +23,24 @@ 4.0.0 xbean-kernel XBean :: Kernel + + + + + + + + backport-util-concurrent diff --git a/kernel/src/main/java/org/xbean/rmi/RMIClassLoaderSpiImpl.java b/kernel/src/main/java/org/xbean/rmi/RMIClassLoaderSpiImpl.java new file mode 100644 index 00000000..9707dfcd --- /dev/null +++ b/kernel/src/main/java/org/xbean/rmi/RMIClassLoaderSpiImpl.java @@ -0,0 +1,152 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.rmi; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.rmi.server.RMIClassLoader; +import java.rmi.server.RMIClassLoaderSpi; +import java.util.StringTokenizer; + + +/** + * An implementation of {@link java.rmi.server.RMIClassLoaderSpi} which provides normilzation + * of codebase URLs and delegates to the default {@link RMIClassLoaderSpi}. + * + * @version $Rev: 209990 $ $Date: 2005-07-09 21:24:52 -0700 (Sat, 09 Jul 2005) $ + */ +public class RMIClassLoaderSpiImpl extends RMIClassLoaderSpi { + + private static final RMIClassLoaderSpi delegate = RMIClassLoader.getDefaultProviderInstance(); + + public Class loadClass(String codebase, String name, ClassLoader defaultLoader) + throws MalformedURLException, ClassNotFoundException + { + if (codebase != null) { + codebase = normalizeCodebase(codebase); + } + + return delegate.loadClass(codebase, name, defaultLoader); + } + + public Class loadProxyClass(String codebase, String[] interfaces, ClassLoader defaultLoader) + throws MalformedURLException, ClassNotFoundException + { + if (codebase != null) { + codebase = normalizeCodebase(codebase); + } + + return delegate.loadProxyClass(codebase, interfaces, defaultLoader); + } + + public ClassLoader getClassLoader(String codebase) throws MalformedURLException { + + if (codebase != null) { + codebase = normalizeCodebase(codebase); + } + + return delegate.getClassLoader(codebase); + } + + public String getClassAnnotation(Class type) { + + Object obj = type.getClassLoader(); + if (obj instanceof ClassLoaderServerAware) { + ClassLoaderServerAware classLoader = (ClassLoaderServerAware) obj; + URL urls[] = classLoader.getClassLoaderServerURLs(); + if (null == urls) { + return delegate.getClassAnnotation(type); + } + StringBuffer codebase = new StringBuffer(); + for (int i = 0; i < urls.length; i++) { + URL url = normalizeURL(urls[i]); + if (codebase.length() != 0) { + codebase.append(' '); + } + codebase.append(url); + } + return codebase.toString(); + } + + return delegate.getClassAnnotation(type); + } + + static String normalizeCodebase(String input) throws MalformedURLException { + + StringBuffer codebase = new StringBuffer(); + StringBuffer working = new StringBuffer(); + StringTokenizer stok = new StringTokenizer(input, " \t\n\r\f", true); + + while (stok.hasMoreTokens()) { + String item = stok.nextToken(); + try { + // If we got this far then item is a valid url, so commit the current + // buffer and start collecting any trailing bits from where we are now + + updateCodebase(working, codebase); + } + catch (MalformedURLException ignore) { + // just keep going & append to the working buffer + } + + working.append(item); + } + + // Handle trailing elements + updateCodebase(working, codebase); + + return codebase.toString(); + } + + private static void updateCodebase(final StringBuffer working, final StringBuffer codebase) throws MalformedURLException { + + if (working.length() != 0) { + // Normalize the URL + URL url = normalizeURL(new URL(working.toString())); + + // Put spaces back in for URL delims + if (codebase.length() != 0) { + codebase.append(" "); + } + codebase.append(url); + + // Reset the working buffer + working.setLength(0); + } + } + + static URL normalizeURL(URL url) { + + if (url.getProtocol().equals("file")) { + String filename = url.getFile().replace('/', File.separatorChar); + File file = new File(filename); + try { + url = file.toURI().toURL(); + } + catch (MalformedURLException ignore) { + } + } + + return url; + } + + public interface ClassLoaderServerAware { + public URL[] getClassLoaderServerURLs(); + } +} + From 11150cc973e11ee889c6403ee93c64f6ad2d35f6 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 2 Nov 2005 21:12:52 +0000 Subject: [PATCH 051/736] Update the pom so that the generated sources are separated from the classes git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380470 13f79535-47bb-0310-9956-ffa450edef68 --- server/pom.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/pom.xml b/server/pom.xml index 30ca3ae1..5dfddbf8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -43,6 +43,14 @@ + + + target/generated + + + src/main/resources + + maven-antrun-plugin @@ -62,10 +70,6 @@ namespace="http://xbean.org/schemas/jmx" srcdir="src/main/java" metaInfDir="${basedir}/target/generated/"/> - - - - From 24577c735dc5b3f042b7c10273ace3a05937e4cd Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 2 Nov 2005 21:23:48 +0000 Subject: [PATCH 052/736] Update the pom so that the generated sources are separated from the classes git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380471 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 12 ++++++++---- spring/pom.xml | 15 +++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/jmx/pom.xml b/jmx/pom.xml index a26f39c0..9d167ac9 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -43,6 +43,14 @@ + + + target/generated + + + src/main/resources + + maven-antrun-plugin @@ -62,10 +70,6 @@ namespace="http://xbean.org/schemas/jmx" srcdir="src/main/java" metaInfDir="${basedir}/target/generated/"/> - - - - diff --git a/spring/pom.xml b/spring/pom.xml index 2704e12e..d1486c17 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -55,6 +55,14 @@ + + + src/test/resources + + + target/test-generated + + maven-antrun-plugin @@ -74,12 +82,7 @@ - - - - - + metaInfDir="${basedir}/target/test-generated/"/> From d2c2eb6a3f78bbda5f0bd0df76e0d512386677d5 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 2 Nov 2005 21:47:40 +0000 Subject: [PATCH 053/736] Add a few asserts to the test git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380472 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/src/test/java/org/xbean/jmx/JMXTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jmx/src/test/java/org/xbean/jmx/JMXTest.java b/jmx/src/test/java/org/xbean/jmx/JMXTest.java index 78d74574..71fad915 100644 --- a/jmx/src/test/java/org/xbean/jmx/JMXTest.java +++ b/jmx/src/test/java/org/xbean/jmx/JMXTest.java @@ -3,6 +3,8 @@ import junit.framework.TestCase; import org.xbean.spring.context.ClassPathXmlApplicationContext; +import java.util.List; + /** * $Rev$ */ @@ -15,6 +17,12 @@ public void testSimple() throws Exception { Object jmxExporter = context.getBean("jmxExporter"); assertNotNull(jmxExporter); + assertTrue(jmxExporter instanceof MBeanExporter); + List mbeans = ((MBeanExporter) jmxExporter).getMBeans(); + assertNotNull(mbeans); + assertEquals(2, mbeans.size()); + assertSame(jmxService, mbeans.get(0)); + assertSame(jmxService, mbeans.get(1)); } finally { context.destroy(); } From e856c7ab1274282e6866c032aea64b0fa8b79a96 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 2 Nov 2005 23:12:16 +0000 Subject: [PATCH 054/736] Copy generated resources to classes / test-classes directory git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380473 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 4 ++++ server/pom.xml | 4 ++++ spring/pom.xml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/jmx/pom.xml b/jmx/pom.xml index 9d167ac9..10f639e9 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -70,6 +70,10 @@ namespace="http://xbean.org/schemas/jmx" srcdir="src/main/java" metaInfDir="${basedir}/target/generated/"/> + + + + diff --git a/server/pom.xml b/server/pom.xml index 5dfddbf8..dc5f4659 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -70,6 +70,10 @@ namespace="http://xbean.org/schemas/jmx" srcdir="src/main/java" metaInfDir="${basedir}/target/generated/"/> + + + + diff --git a/spring/pom.xml b/spring/pom.xml index d1486c17..2b77a8a4 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -83,6 +83,10 @@ namespace="http://xbean.org/schemas/pizza" srcdir="src/test/java" metaInfDir="${basedir}/target/test-generated/"/> + + + + From e9d9f15047abf3e31613f126c7e2c2fea2c9d7c0 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Thu, 3 Nov 2005 04:47:39 +0000 Subject: [PATCH 055/736] Test to see if attribute is a list. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380474 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/spring/generator/XmlMetadataGenerator.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java b/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java index 6b3b43cc..f5c07615 100644 --- a/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java +++ b/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java @@ -16,8 +16,6 @@ */ package org.xbean.spring.generator; -import org.xbean.spring.context.impl.NamespaceHelper; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -26,6 +24,9 @@ import java.util.List; import java.util.Set; +import org.xbean.spring.context.impl.NamespaceHelper; + + /** * @author Dain Sundstrom * @version $Id$ @@ -131,7 +132,11 @@ private void generatePropertiesFilePropertyAliases(PrintWriter out, ElementMappi String propertyName = attributeMapping.getPropertyName(); String attributeName = attributeMapping.getAttributeName(); if (!propertyName.equals(attributeName)) { - out.println(element.getElementName() + ".alias." + attributeName + " = " + propertyName); + if (List.class.getName().equals(attributeMapping.getType().getName())) { + out.println(element.getElementName() + ".list." + attributeName + " = " + propertyName); + } else { + out.println(element.getElementName() + ".alias." + attributeName + " = " + propertyName); + } } } } From 04b232c81a5ac9a51d476694961fb9f994d81528 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 3 Nov 2005 14:04:52 +0000 Subject: [PATCH 056/736] Add a test for jndi git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380475 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/spring/jndi/DefaultContextTest.java | 69 +++++++++++++++++++ .../java/org/xbean/spring/jndi/JndiTest.java | 62 ++++++++++++++--- .../resources/org/xbean/spring/jndi/jndi.xml | 2 +- .../org/xbean/spring/jndi/spring.xml | 28 ++++++++ 4 files changed, 152 insertions(+), 9 deletions(-) create mode 100644 spring/src/test/java/org/xbean/spring/jndi/DefaultContextTest.java create mode 100644 spring/src/test/resources/org/xbean/spring/jndi/spring.xml diff --git a/spring/src/test/java/org/xbean/spring/jndi/DefaultContextTest.java b/spring/src/test/java/org/xbean/spring/jndi/DefaultContextTest.java new file mode 100644 index 00000000..d76d109b --- /dev/null +++ b/spring/src/test/java/org/xbean/spring/jndi/DefaultContextTest.java @@ -0,0 +1,69 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.jndi; + +import javax.naming.Context; +import javax.naming.NameNotFoundException; +import javax.naming.NamingException; + +import java.util.Hashtable; + +import junit.framework.TestCase; + +/** + * @version $Revision: 657 $ + */ +public class DefaultContextTest extends TestCase { + Context context = new DefaultContext(new Hashtable()); + + public void testSimpleName() throws Exception { + assertContextNamed("name"); + } + + public void testNestedName() throws Exception { + assertContextNamed("jdbc/name"); + } + + public void testDoubleNestedName() throws Exception { + assertContextNamed("jdbc/foo/name"); + } + + protected void assertContextNamed(String name) throws NamingException { + context.bind(name, "James"); + assertJNDILookup(name, "James"); + + context.rebind(name, "Rob"); + assertJNDILookup(name, "Rob"); + + context.unbind(name); + + try { + context.lookup(name); + fail("Should ave thrown NameNotFoundException!"); + } + catch (NameNotFoundException e) { + System.out.println("Caught expected exception: " + e); + } + } + + protected void assertJNDILookup(String name, String expected) throws NamingException { + Object value = context.lookup(name); + assertEquals("Lookup failed for: " + name, expected, value); + } + +} diff --git a/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java b/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java index 1d2818dd..cdcf87e7 100644 --- a/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java +++ b/spring/src/test/java/org/xbean/spring/jndi/JndiTest.java @@ -1,22 +1,68 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ package org.xbean.spring.jndi; +import org.springframework.beans.factory.BeanFactory; +import org.xbean.spring.context.ClassPathXmlApplicationContext; + import javax.naming.Context; import javax.naming.InitialContext; +import javax.naming.NamingException; + +import java.util.Hashtable; import junit.framework.TestCase; public class JndiTest extends TestCase { - protected void setUp() throws Exception { - System.setProperty(Context.INITIAL_CONTEXT_FACTORY, SpringInitialContextFactory.class.getName()); - System.setProperty(Context.PROVIDER_URL, "classpath:org/xbean/spring/jndi/jndi.xml"); + protected InitialContext createInitialContext() throws Exception { + Hashtable env = new Hashtable(); + env.put(Context.INITIAL_CONTEXT_FACTORY, SpringInitialContextFactory.class.getName()); + env.put(Context.PROVIDER_URL, "classpath:org/xbean/spring/jndi/jndi.xml"); + return new InitialContext(env); + } + + public void testSpringJNDILookup() throws Exception { + InitialContext context = createInitialContext(); + assertEntryExists(context, "test"); + assertEntryExists(context, "test/restaurant"); } - public void testJndi() throws Exception { - InitialContext context = new InitialContext(); - assertNotNull(context); - Object restaurant = context.lookup("restaurant"); - assertNotNull(restaurant); + public void testConfigureJndiInsideSpringXml() throws Exception { + // lets load a spring context + + BeanFactory factory = new ClassPathXmlApplicationContext("org/xbean/spring/jndi/spring.xml"); + Object test = factory.getBean("restaurant"); + assertNotNull("Should have found the test object", test); + Object jndi = factory.getBean("jndi"); + assertNotNull("Should have found the jndi object", jndi); + + Hashtable env = new Hashtable(); + env.put(Context.INITIAL_CONTEXT_FACTORY, SpringInitialContextFactory.class.getName()); + InitialContext context = new InitialContext(env); + assertEntryExists(context, "test"); + assertEntryExists(context, "test/restaurant"); + assertSame(test, context.lookup("test/restaurant")); } + protected void assertEntryExists(InitialContext context, String name) throws NamingException { + Object value = context.lookup(name); + assertNotNull(name + " should not be null", value); + } + } diff --git a/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml b/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml index 4078cbf6..37a1ccff 100644 --- a/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml +++ b/spring/src/test/resources/org/xbean/spring/jndi/jndi.xml @@ -4,7 +4,7 @@ - + diff --git a/spring/src/test/resources/org/xbean/spring/jndi/spring.xml b/spring/src/test/resources/org/xbean/spring/jndi/spring.xml new file mode 100644 index 00000000..520fbf06 --- /dev/null +++ b/spring/src/test/resources/org/xbean/spring/jndi/spring.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a3d80792096c35b0020ff79633289dc87abecf17 Mon Sep 17 00:00:00 2001 From: Daniel Diephouse Date: Fri, 4 Nov 2005 21:46:38 +0000 Subject: [PATCH 057/736] Check for NoClassDefFoundErrors as well. I have a user on Orion, and the Orion classloader was throwing these instead. I'm not sure if this is a 100% correct, but this change doesn't seem to affect anything... Anyone have insight on why this would be happening? git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380476 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/spring/context/impl/PropertyEditorHelper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring/src/main/java/org/xbean/spring/context/impl/PropertyEditorHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/PropertyEditorHelper.java index fd1d4a19..b131b4be 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/PropertyEditorHelper.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/PropertyEditorHelper.java @@ -51,6 +51,8 @@ public static Class loadClass(String name) { } catch (ClassNotFoundException e) { } + catch (NoClassDefFoundError e) { + } } try { return PropertyEditorHelper.class.getClassLoader().loadClass(name); @@ -59,6 +61,10 @@ public static Class loadClass(String name) { log.debug("Could not find class: " + name + " on the classpath"); return null; } + catch (NoClassDefFoundError e) { + log.debug("Could not load class: " + name + " on the classpath. " + e.getMessage()); + return null; + } } } From fff1eec79f6b0d44a0bca2bfd04138f11fe53356 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Tue, 8 Nov 2005 19:05:29 +0000 Subject: [PATCH 058/736] 2.0 has been released; we are now on 2.1 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380477 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15f6591f..cca91281 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ xbean pom XBean - 2.0-SNAPSHOT + 2.1-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org From 182491132cdfb4df7777a5cddb792f7e5b977660 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Wed, 9 Nov 2005 23:36:38 +0000 Subject: [PATCH 059/736] Reset version to 2.0-SNAPSHOT to prepare for rerelease of 2.0 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380479 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cca91281..15f6591f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ xbean pom XBean - 2.1-SNAPSHOT + 2.0-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org From 435b836051b294b6ca2aeda4fa82c1074332450a Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Wed, 9 Nov 2005 23:50:37 +0000 Subject: [PATCH 060/736] Added new role for myself git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380480 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 15f6591f..55c26ae4 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,7 @@ Commiter Despot + Release Boy -8 From 80fde6e7dfe8fb607f98d622f7cd31deef9d5910 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 9 Nov 2005 23:56:16 +0000 Subject: [PATCH 061/736] o release management configuration git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380481 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 55c26ae4..684386bf 100644 --- a/pom.xml +++ b/pom.xml @@ -207,6 +207,16 @@ + + + + maven-release-plugin + + https://svn.codehaus.org/xbean/tags + + + + maven-one-plugin From 76603bbbe3e0d441af4f1ea2681c0f2b42ffeaef Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 10 Nov 2005 00:16:34 +0000 Subject: [PATCH 062/736] Split normal and snapshot repos git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380482 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 684386bf..8d8ab1e1 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ xbean-snapshots XBean Central Development Repository - scpexe://xbean.org/home/projects/xbean/dist-m2 + scpexe://xbean.org/home/projects/xbean/dist-m2-snapshot xbean-website From 6447ce4b6b3aa6f6fe507cabef21b261aaa4343c Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 10 Nov 2005 00:31:10 +0000 Subject: [PATCH 063/736] [maven-release-plugin] prepare release xbean-2.0 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380483 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 24 ++----- jmx/pom.xml | 82 +++++++++-------------- kernel/pom.xml | 49 +++----------- pom.xml | 161 ++++++++++++++++++---------------------------- server/pom.xml | 83 +++++++++--------------- spring/pom.xml | 108 +++++++++++++------------------ 6 files changed, 180 insertions(+), 327 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index fe5a8975..1314fc26 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -1,27 +1,11 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-classpath XBean :: ClassPath - - + 2.0 + \ No newline at end of file diff --git a/jmx/pom.xml b/jmx/pom.xml index 10f639e9..ba3d0fde 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -1,47 +1,13 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-jmx XBean :: JMX - - - commons-logging - commons-logging - - - mx4j - mx4j - - - org.xbean - xbean-kernel - - - org.xbean - xbean-spring - - - + 2.0 @@ -57,32 +23,44 @@ process-classes + + run + - + - - + + - - - + - + - - run - - - + + + mx4j + mx4j + + + commons-logging + commons-logging + + + org.xbean + xbean-kernel + + + org.xbean + xbean-spring + + + \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 5796dce0..61d033b3 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -1,52 +1,19 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-kernel XBean :: Kernel - - - - - - - - + 2.0 + - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd + backport-util-concurrent + backport-util-concurrent + 2.0_01_pd - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8d8ab1e1..73c93409 100644 --- a/pom.xml +++ b/pom.xml @@ -1,46 +1,26 @@ - - 4.0.0 org.xbean xbean pom XBean - 2.0-SNAPSHOT + 2.0 XBean is a plugin based server archtecutre. http://xbean.org - jira http://jira.codehaus.org/browse/XB - continuum - mail - - + false + false
dev@xbean.org
 - xbean developers @@ -58,7 +38,6 @@ mailto:scm-unsubscribe@xbean.org - adc @@ -89,7 +68,6 @@ -8 - The Apache Software License, Version 2.0 @@ -97,18 +75,72 @@ repo - - scm:svn:https://svn.codehaus.org/xbean/trunk/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ - https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.0/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.0/ + https://svn.codehaus.org/xbean/tags/xbean-2.0/ - XBean http://xbean.org/ - + + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-alpha-5 + + + + + + maven-release-plugin + + https://svn.codehaus.org/xbean/tags + + + + + + + maven-one-plugin + + + + install-maven-one-repository + deploy-maven-one-repository + + + scpexe://xbean.org/dist + + + + + + + + classpath + jmx + kernel + server + spring + + + + snapshots + Maven Central Plugins Development Repository + http://snapshots.maven.codehaus.org/maven2 + + + + + junit + junit + 3.8.1 + test + + @@ -168,16 +200,6 @@ - - - - junit - junit - 3.8.1 - test - - - xbean-repo @@ -194,59 +216,4 @@ scpexe://xbean.org/home/projects/xbean/public_html/maven/ - - - classpath - jmx - kernel - server - spring - - - - - - - - - - maven-release-plugin - - https://svn.codehaus.org/xbean/tags - - - - - - - maven-one-plugin - - - - scpexe://xbean.org/dist - - - install-maven-one-repository - deploy-maven-one-repository - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-5 - - - - - - - snapshots - Maven Central Plugins Development Repository - http://snapshots.maven.codehaus.org/maven2 - - - + \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index dc5f4659..427cde66 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,47 +1,13 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-server XBean :: Server - - - cglib - cglib-nodep - test - - - commons-logging - commons-logging - - - org.xbean - xbean-kernel - - - org.xbean - xbean-spring - - + 2.0 @@ -57,32 +23,45 @@ process-classes + + run + - + - - + + - - - + - + - - run - - - + + + cglib + cglib-nodep + test + + + commons-logging + commons-logging + + + org.xbean + xbean-kernel + + + org.xbean + xbean-spring + + + \ No newline at end of file diff --git a/spring/pom.xml b/spring/pom.xml index 2b77a8a4..abd106ed 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -1,59 +1,13 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-spring XBean :: Spring - - - ant - ant - - - commons-logging - commons-logging - - - mx4j - mx4j - - - qdox - qdox - - - springframework - spring - - - stax - stax-api - - - backport-util-concurrent - backport-util-concurrent - - - + 2.0 @@ -69,33 +23,57 @@ process-classes + + run + - + - - - + + + - - - + - + - - run - - - + + + springframework + spring + + + mx4j + mx4j + + + commons-logging + commons-logging + + + ant + ant + + + backport-util-concurrent + backport-util-concurrent + + + stax + stax-api + + + qdox + qdox + + + \ No newline at end of file From b242cf2cb181bc17ceedc5feaa7cc961d3d0519a Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 10 Nov 2005 00:42:35 +0000 Subject: [PATCH 064/736] Rollback to 154 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380484 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 24 +++++-- jmx/pom.xml | 82 ++++++++++++++--------- kernel/pom.xml | 49 +++++++++++--- pom.xml | 161 ++++++++++++++++++++++++++++------------------ server/pom.xml | 83 +++++++++++++++--------- spring/pom.xml | 108 ++++++++++++++++++------------- 6 files changed, 327 insertions(+), 180 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index 1314fc26..fe5a8975 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -1,11 +1,27 @@ + + - xbean org.xbean - 2.0 + xbean + 2.0-SNAPSHOT 4.0.0 xbean-classpath XBean :: ClassPath - 2.0 - \ No newline at end of file + + diff --git a/jmx/pom.xml b/jmx/pom.xml index ba3d0fde..10f639e9 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -1,13 +1,47 @@ + + - xbean org.xbean - 2.0 + xbean + 2.0-SNAPSHOT 4.0.0 xbean-jmx XBean :: JMX - 2.0 + + + commons-logging + commons-logging + + + mx4j + mx4j + + + org.xbean + xbean-kernel + + + org.xbean + xbean-spring + + + @@ -23,44 +57,32 @@ process-classes - - run - - + - - + + - + + + - + + + run + - - - mx4j - mx4j - - - commons-logging - commons-logging - - - org.xbean - xbean-kernel - - - org.xbean - xbean-spring - - - \ No newline at end of file + + diff --git a/kernel/pom.xml b/kernel/pom.xml index 61d033b3..5796dce0 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -1,19 +1,52 @@ + + - xbean org.xbean - 2.0 + xbean + 2.0-SNAPSHOT 4.0.0 xbean-kernel XBean :: Kernel - 2.0 - + + + + + + + + - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd + backport-util-concurrent + backport-util-concurrent + 2.0_01_pd - \ No newline at end of file + + diff --git a/pom.xml b/pom.xml index 73c93409..8d8ab1e1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,46 @@ + + 4.0.0 org.xbean xbean pom XBean - 2.0 + 2.0-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org + jira http://jira.codehaus.org/browse/XB + continuum - false - false + mail + +
dev@xbean.org
 + xbean developers @@ -38,6 +58,7 @@ mailto:scm-unsubscribe@xbean.org + adc @@ -68,6 +89,7 @@ -8 + The Apache Software License, Version 2.0 @@ -75,72 +97,18 @@ repo + - scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.0/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.0/ - https://svn.codehaus.org/xbean/tags/xbean-2.0/ + scm:svn:https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ + https://svn.codehaus.org/xbean/trunk/ + XBean http://xbean.org/ - - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-5 - - - - - - maven-release-plugin - - https://svn.codehaus.org/xbean/tags - - - - - - - maven-one-plugin - - - - install-maven-one-repository - deploy-maven-one-repository - - - scpexe://xbean.org/dist - - - - - - - - classpath - jmx - kernel - server - spring - - - - snapshots - Maven Central Plugins Development Repository - http://snapshots.maven.codehaus.org/maven2 - - - - - junit - junit - 3.8.1 - test - - + @@ -200,6 +168,16 @@ + + + + junit + junit + 3.8.1 + test + + + xbean-repo @@ -216,4 +194,59 @@ scpexe://xbean.org/home/projects/xbean/public_html/maven/ - \ No newline at end of file + + + classpath + jmx + kernel + server + spring + + + + + + + + + + maven-release-plugin + + https://svn.codehaus.org/xbean/tags + + + + + + + maven-one-plugin + + + + scpexe://xbean.org/dist + + + install-maven-one-repository + deploy-maven-one-repository + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-alpha-5 + + + + + + + snapshots + Maven Central Plugins Development Repository + http://snapshots.maven.codehaus.org/maven2 + + + diff --git a/server/pom.xml b/server/pom.xml index 427cde66..dc5f4659 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,13 +1,47 @@ + + - xbean org.xbean - 2.0 + xbean + 2.0-SNAPSHOT 4.0.0 xbean-server XBean :: Server - 2.0 + + + cglib + cglib-nodep + test + + + commons-logging + commons-logging + + + org.xbean + xbean-kernel + + + org.xbean + xbean-spring + + @@ -23,45 +57,32 @@ process-classes - - run - - + - - + + - + + + - + + + run + - - - cglib - cglib-nodep - test - - - commons-logging - commons-logging - - - org.xbean - xbean-kernel - - - org.xbean - xbean-spring - - - \ No newline at end of file + + diff --git a/spring/pom.xml b/spring/pom.xml index abd106ed..2b77a8a4 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -1,13 +1,59 @@ + + - xbean org.xbean - 2.0 + xbean + 2.0-SNAPSHOT 4.0.0 xbean-spring XBean :: Spring - 2.0 + + + ant + ant + + + commons-logging + commons-logging + + + mx4j + mx4j + + + qdox + qdox + + + springframework + spring + + + stax + stax-api + + + backport-util-concurrent + backport-util-concurrent + + + @@ -23,57 +69,33 @@ process-classes - - run - - + - - - + + + - + + + - + + + run + - - - springframework - spring - - - mx4j - mx4j - - - commons-logging - commons-logging - - - ant - ant - - - backport-util-concurrent - backport-util-concurrent - - - stax - stax-api - - - qdox - qdox - - - \ No newline at end of file + + From 2f82f9df9bd02b7c788f8203d71e14c22ceb002c Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 10 Nov 2005 00:52:43 +0000 Subject: [PATCH 065/736] [maven-release-plugin] prepare release xbean-2.0 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380485 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 24 ++----- jmx/pom.xml | 82 +++++++++-------------- kernel/pom.xml | 49 +++----------- pom.xml | 161 ++++++++++++++++++---------------------------- server/pom.xml | 83 +++++++++--------------- spring/pom.xml | 108 +++++++++++++------------------ 6 files changed, 180 insertions(+), 327 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index fe5a8975..1314fc26 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -1,27 +1,11 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-classpath XBean :: ClassPath - - + 2.0 + \ No newline at end of file diff --git a/jmx/pom.xml b/jmx/pom.xml index 10f639e9..ba3d0fde 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -1,47 +1,13 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-jmx XBean :: JMX - - - commons-logging - commons-logging - - - mx4j - mx4j - - - org.xbean - xbean-kernel - - - org.xbean - xbean-spring - - - + 2.0 @@ -57,32 +23,44 @@ process-classes + + run + - + - - + + - - - + - + - - run - - - + + + mx4j + mx4j + + + commons-logging + commons-logging + + + org.xbean + xbean-kernel + + + org.xbean + xbean-spring + + + \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 5796dce0..61d033b3 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -1,52 +1,19 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-kernel XBean :: Kernel - - - - - - - - + 2.0 + - backport-util-concurrent - backport-util-concurrent - 2.0_01_pd + backport-util-concurrent + backport-util-concurrent + 2.0_01_pd - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8d8ab1e1..73c93409 100644 --- a/pom.xml +++ b/pom.xml @@ -1,46 +1,26 @@ - - 4.0.0 org.xbean xbean pom XBean - 2.0-SNAPSHOT + 2.0 XBean is a plugin based server archtecutre. http://xbean.org - jira http://jira.codehaus.org/browse/XB - continuum - mail - - + false + false
dev@xbean.org
 - xbean developers @@ -58,7 +38,6 @@ mailto:scm-unsubscribe@xbean.org - adc @@ -89,7 +68,6 @@ -8 - The Apache Software License, Version 2.0 @@ -97,18 +75,72 @@ repo - - scm:svn:https://svn.codehaus.org/xbean/trunk/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ - https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.0/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.0/ + https://svn.codehaus.org/xbean/tags/xbean-2.0/ - XBean http://xbean.org/ - + + + + org.apache.maven.wagon + wagon-ssh-external + 1.0-alpha-5 + + + + + + maven-release-plugin + + https://svn.codehaus.org/xbean/tags + + + + + + + maven-one-plugin + + + + install-maven-one-repository + deploy-maven-one-repository + + + scpexe://xbean.org/dist + + + + + + + + classpath + jmx + kernel + server + spring + + + + snapshots + Maven Central Plugins Development Repository + http://snapshots.maven.codehaus.org/maven2 + + + + + junit + junit + 3.8.1 + test + + @@ -168,16 +200,6 @@ - - - - junit - junit - 3.8.1 - test - - - xbean-repo @@ -194,59 +216,4 @@ scpexe://xbean.org/home/projects/xbean/public_html/maven/ - - - classpath - jmx - kernel - server - spring - - - - - - - - - - maven-release-plugin - - https://svn.codehaus.org/xbean/tags - - - - - - - maven-one-plugin - - - - scpexe://xbean.org/dist - - - install-maven-one-repository - deploy-maven-one-repository - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-5 - - - - - - - snapshots - Maven Central Plugins Development Repository - http://snapshots.maven.codehaus.org/maven2 - - - + \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index dc5f4659..427cde66 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,47 +1,13 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-server XBean :: Server - - - cglib - cglib-nodep - test - - - commons-logging - commons-logging - - - org.xbean - xbean-kernel - - - org.xbean - xbean-spring - - + 2.0 @@ -57,32 +23,45 @@ process-classes + + run + - + - - + + - - - + - + - - run - - - + + + cglib + cglib-nodep + test + + + commons-logging + commons-logging + + + org.xbean + xbean-kernel + + + org.xbean + xbean-spring + + + \ No newline at end of file diff --git a/spring/pom.xml b/spring/pom.xml index 2b77a8a4..abd106ed 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -1,59 +1,13 @@ - - - org.xbean xbean - 2.0-SNAPSHOT + org.xbean + 2.0 4.0.0 xbean-spring XBean :: Spring - - - ant - ant - - - commons-logging - commons-logging - - - mx4j - mx4j - - - qdox - qdox - - - springframework - spring - - - stax - stax-api - - - backport-util-concurrent - backport-util-concurrent - - - + 2.0 @@ -69,33 +23,57 @@ process-classes + + run + - + - - - + + + - - - + - + - - run - - - + + + springframework + spring + + + mx4j + mx4j + + + commons-logging + commons-logging + + + ant + ant + + + backport-util-concurrent + backport-util-concurrent + + + stax + stax-api + + + qdox + qdox + + + \ No newline at end of file From 17edcba30cdfff4883aec80d44f2e92a7de8b0c5 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 10 Nov 2005 00:53:38 +0000 Subject: [PATCH 066/736] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380487 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 4 ++-- jmx/pom.xml | 6 ++++-- kernel/pom.xml | 4 ++-- pom.xml | 8 ++++---- server/pom.xml | 6 ++++-- spring/pom.xml | 4 ++-- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index 1314fc26..e9fe1a28 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -2,10 +2,10 @@ xbean org.xbean - 2.0 + 2.1-SNAPSHOT 4.0.0 xbean-classpath XBean :: ClassPath - 2.0 + 2.1-SNAPSHOT \ No newline at end of file diff --git a/jmx/pom.xml b/jmx/pom.xml index ba3d0fde..6d48bdca 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.0 + 2.1-SNAPSHOT 4.0.0 xbean-jmx XBean :: JMX - 2.0 + 2.1-SNAPSHOT @@ -57,10 +57,12 @@ org.xbean xbean-kernel + 2.1-SNAPSHOT org.xbean xbean-spring + 2.1-SNAPSHOT \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 61d033b3..7c8c3cd5 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.0 + 2.1-SNAPSHOT 4.0.0 xbean-kernel XBean :: Kernel - 2.0 + 2.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 73c93409..f4298181 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xbean pom XBean - 2.0 + 2.1-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org @@ -76,9 +76,9 @@ - scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.0/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.0/ - https://svn.codehaus.org/xbean/tags/xbean-2.0/ + scm:svn:https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ + https://svn.codehaus.org/xbean/trunk/ XBean diff --git a/server/pom.xml b/server/pom.xml index 427cde66..ef4a4063 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.0 + 2.1-SNAPSHOT 4.0.0 xbean-server XBean :: Server - 2.0 + 2.1-SNAPSHOT @@ -58,10 +58,12 @@ org.xbean xbean-kernel + 2.1-SNAPSHOT org.xbean xbean-spring + 2.1-SNAPSHOT \ No newline at end of file diff --git a/spring/pom.xml b/spring/pom.xml index abd106ed..5b8d9485 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.0 + 2.1-SNAPSHOT 4.0.0 xbean-spring XBean :: Spring - 2.0 + 2.1-SNAPSHOT From 749d28e7cb8233ff91f3a76430fb0597cb3067bf Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Sat, 12 Nov 2005 17:23:16 +0000 Subject: [PATCH 067/736] Workaround for those people who have spaces in their classpath. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380488 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/kernel/ServiceStateTest.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/kernel/src/test/java/org/xbean/kernel/ServiceStateTest.java b/kernel/src/test/java/org/xbean/kernel/ServiceStateTest.java index dd66aa4d..cf77fea9 100644 --- a/kernel/src/test/java/org/xbean/kernel/ServiceStateTest.java +++ b/kernel/src/test/java/org/xbean/kernel/ServiceStateTest.java @@ -17,6 +17,7 @@ package org.xbean.kernel; import java.rmi.MarshalledObject; +import java.net.MalformedURLException; import junit.framework.TestCase; @@ -131,10 +132,20 @@ public void testParseServiceState() { * @throws Exception if a problem occurs */ public void testSerialization() throws Exception { - assertSame(ServiceState.STARTING, copyServiceState(ServiceState.STARTING)); - assertSame(ServiceState.RUNNING, copyServiceState(ServiceState.RUNNING)); - assertSame(ServiceState.STOPPING, copyServiceState(ServiceState.STOPPING)); - assertSame(ServiceState.STOPPED, copyServiceState(ServiceState.STOPPED)); + try { + assertSame(ServiceState.STARTING, copyServiceState(ServiceState.STARTING)); + assertSame(ServiceState.RUNNING, copyServiceState(ServiceState.RUNNING)); + assertSame(ServiceState.STOPPING, copyServiceState(ServiceState.STOPPING)); + assertSame(ServiceState.STOPPED, copyServiceState(ServiceState.STOPPED)); + } catch (MalformedURLException ignore) { + // TODO + // Some people may have spaces in their classpath. + // To fix this we need to register an RMI class loader, e.g. + // org.xbean.rmi.RMIClassLoaderSpiImpl, that handles spaces + // in a classpath but this needs to be done at JVM startup. + // Apparently when surefire allows forking of tests, we + // can get this to work. Until then, we ingore this specific error. + } } private ServiceState copyServiceState(ServiceState original) throws Exception { From 4362a23ef99e4f3fe94eb6a276d2403731f61fab Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Sat, 12 Nov 2005 18:40:30 +0000 Subject: [PATCH 068/736] Fix file resolution on windows git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380489 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/xbean/server/spring/main/SpringBootstrap.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java b/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java index 514af375..3332cb27 100644 --- a/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java +++ b/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java @@ -234,7 +234,10 @@ public Main loadMain() { // load the configuration file SpringApplicationContext factory; - File file = new File(baseDirectory.toURI().resolve(configurationFile)); + File file = new File(configurationFile); + if (!file.isAbsolute()) { + file = new File(baseDirectory.toURI().resolve(configurationFile)); + } if (file.canRead()) { try { // configuration file is on the local file system From e80119afc8f6877c13e2955885c85731dead0b5d Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Sat, 12 Nov 2005 18:44:42 +0000 Subject: [PATCH 069/736] Test both relative and absolute path to config file. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380490 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/server/spring/main/SpringBootstrap.java | 4 ++-- .../org/xbean/server/spring/main/SpringBootstrapTest.java | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java b/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java index 3332cb27..ec946bfa 100644 --- a/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java +++ b/server/src/main/java/org/xbean/server/spring/main/SpringBootstrap.java @@ -236,8 +236,8 @@ public Main loadMain() { SpringApplicationContext factory; File file = new File(configurationFile); if (!file.isAbsolute()) { - file = new File(baseDirectory.toURI().resolve(configurationFile)); - } + file = new File(baseDirectory, configurationFile); + } if (file.canRead()) { try { // configuration file is on the local file system diff --git a/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java b/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java index f9e81ff5..bd098b1c 100644 --- a/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java +++ b/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java @@ -36,12 +36,18 @@ public void testClasspathBootstrap() throws Exception{ assertBootable(springBootstrap); } - public void testFileBootstrap() throws Exception{ + public void testFileBootstrapWithAbsoluteConfigPath() throws Exception { springBootstrap.setConfigurationFile(basedir + "/src/main/resources/META-INF/xbean-bootstrap.xml"); springBootstrap.setServerBaseDirectory(basedir); assertBootable(springBootstrap); } + public void testFileBootstrapWithRelativeConfigPath() throws Exception { + springBootstrap.setConfigurationFile("/src/main/resources/META-INF/xbean-bootstrap.xml"); + springBootstrap.setServerBaseDirectory(basedir); + assertBootable(springBootstrap); + } + private static void assertBootable(SpringBootstrap springBootstrap) { // load the main instance KernelMain main = (KernelMain) springBootstrap.loadMain(); From 09b93b5d088b00e0705c29137183d6398441b806 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Sat, 12 Nov 2005 21:13:26 +0000 Subject: [PATCH 070/736] testFileBootstrapWithRelativeConfigPath should test a relative path git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380491 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/xbean/server/spring/main/SpringBootstrapTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java b/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java index bd098b1c..b9a9f063 100644 --- a/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java +++ b/server/src/test/java/org/xbean/server/spring/main/SpringBootstrapTest.java @@ -43,7 +43,7 @@ public void testFileBootstrapWithAbsoluteConfigPath() throws Exception { } public void testFileBootstrapWithRelativeConfigPath() throws Exception { - springBootstrap.setConfigurationFile("/src/main/resources/META-INF/xbean-bootstrap.xml"); + springBootstrap.setConfigurationFile("src/main/resources/META-INF/xbean-bootstrap.xml"); springBootstrap.setServerBaseDirectory(basedir); assertBootable(springBootstrap); } From 7aefc79bab6c2fcfbc4fd52754e4f36f5daf79f5 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Sun, 13 Nov 2005 20:48:03 +0000 Subject: [PATCH 071/736] Fix possible NPE git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380492 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/xbean/spring/context/impl/QNameHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java b/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java index 5dfa9157..710ebbf9 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/QNameHelper.java @@ -84,6 +84,10 @@ public static void coerceQNamePropertyValues(QNameReflectionParams params) { public static void coerceNamespaceAwarePropertyValues(AbstractBeanDefinition bd, Element element, PropertyDescriptor[] descriptors, int i) { PropertyDescriptor descriptor = descriptors[i]; + // When the property is an indexed property, the getPropertyType can return null. + if (descriptor.getPropertyType() == null) { + return; + } if (descriptor.getPropertyType().isAssignableFrom(QName.class)) { String name = descriptor.getName(); MutablePropertyValues propertyValues = bd.getPropertyValues(); From 217e3a5807e36ed09e3b67ed530a1223a9bd67ca Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 17 Nov 2005 17:23:41 +0000 Subject: [PATCH 072/736] Stubbed out OSGi loader based on maven git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380493 13f79535-47bb-0310-9956-ffa450edef68 --- osgi/pom.xml | 17 ++ .../main/java/org/xbean/osgi/Artifact.java | 32 +++ .../org/xbean/osgi/BundleClassLoader.java | 48 ++++ .../main/java/org/xbean/osgi/Dependency.java | 52 ++++ .../org/xbean/osgi/MavenBundleManager.java | 229 ++++++++++++++++++ .../src/main/java/org/xbean/osgi/Project.java | 79 ++++++ .../test/java/org/xbean/osgi/OSGiTest.java | 103 ++++++++ pom.xml | 9 +- 8 files changed, 568 insertions(+), 1 deletion(-) create mode 100644 osgi/pom.xml create mode 100644 osgi/src/main/java/org/xbean/osgi/Artifact.java create mode 100644 osgi/src/main/java/org/xbean/osgi/BundleClassLoader.java create mode 100644 osgi/src/main/java/org/xbean/osgi/Dependency.java create mode 100644 osgi/src/main/java/org/xbean/osgi/MavenBundleManager.java create mode 100644 osgi/src/main/java/org/xbean/osgi/Project.java create mode 100644 osgi/src/test/java/org/xbean/osgi/OSGiTest.java diff --git a/osgi/pom.xml b/osgi/pom.xml new file mode 100644 index 00000000..3b4f5c79 --- /dev/null +++ b/osgi/pom.xml @@ -0,0 +1,17 @@ + + + xbean + org.xbean + 2.1-SNAPSHOT + + 4.0.0 + xbean-osgi + XBean :: OSGi + 2.1-SNAPSHOT + + + org.eclipse.equinox + osgi + + + diff --git a/osgi/src/main/java/org/xbean/osgi/Artifact.java b/osgi/src/main/java/org/xbean/osgi/Artifact.java new file mode 100644 index 00000000..6827caf9 --- /dev/null +++ b/osgi/src/main/java/org/xbean/osgi/Artifact.java @@ -0,0 +1,32 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.osgi; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 2.0 + */ +public interface Artifact { + String getGroupId(); + + String getArtifactId(); + + String getVersion(); + + String getType(); +} diff --git a/osgi/src/main/java/org/xbean/osgi/BundleClassLoader.java b/osgi/src/main/java/org/xbean/osgi/BundleClassLoader.java new file mode 100644 index 00000000..afe6d108 --- /dev/null +++ b/osgi/src/main/java/org/xbean/osgi/BundleClassLoader.java @@ -0,0 +1,48 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.osgi; + +import org.osgi.framework.Bundle; + +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 2.0 + */ +public class BundleClassLoader extends ClassLoader { + private final Bundle bundle; + + public BundleClassLoader(Bundle bundle) { + this.bundle = bundle; + } + + public Class loadClass(String name) throws ClassNotFoundException { + return bundle.loadClass(name); + } + + public URL getResource(String name) { + return bundle.getResource(name); + } + + protected Enumeration findResources(String name) throws IOException { + return bundle.getResources(name); + } +} diff --git a/osgi/src/main/java/org/xbean/osgi/Dependency.java b/osgi/src/main/java/org/xbean/osgi/Dependency.java new file mode 100644 index 00000000..cba198cd --- /dev/null +++ b/osgi/src/main/java/org/xbean/osgi/Dependency.java @@ -0,0 +1,52 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.osgi; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 2.0 + */ +public class Dependency implements Artifact { + private final String groupId; + private final String artifactId; + private final String version; + private final String type; + + public Dependency(String groupId, String artifactId, String version, String type) { + this.groupId = groupId; + this.artifactId = artifactId; + this.version = version; + this.type = type; + } + + public String getGroupId() { + return groupId; + } + + public String getArtifactId() { + return artifactId; + } + + public String getVersion() { + return version; + } + + public String getType() { + return type; + } +} diff --git a/osgi/src/main/java/org/xbean/osgi/MavenBundleManager.java b/osgi/src/main/java/org/xbean/osgi/MavenBundleManager.java new file mode 100644 index 00000000..8dcfa3e3 --- /dev/null +++ b/osgi/src/main/java/org/xbean/osgi/MavenBundleManager.java @@ -0,0 +1,229 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.osgi; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 2.0 + */ +public class MavenBundleManager { + private final BundleContext bundleContext; + private final File localRepository; + + public MavenBundleManager(BundleContext bundleContext, File localRepository) { + this.bundleContext = bundleContext; + this.localRepository = localRepository; + } + + public Project loadProject(Artifact artifact) { + if (artifact instanceof Project) { + return (Project) artifact; + } else { + return new Project(artifact.getGroupId(), + artifact.getArtifactId(), + artifact.getVersion(), + artifact.getType(), + Collections.EMPTY_SET); + } + } + + public Project loadProject(String groupId, String artifactId, String version) { + return new Project(groupId, artifactId, version, "jar", Collections.EMPTY_SET); + } + + public Bundle installBundle(String groupId, String artifactId, String version) throws Exception { + return installBundle(loadProject(groupId, artifactId, version)); + } + + public Bundle installBundle(Artifact artifact) throws Exception { + String symbolicName = artifact.getGroupId() + "." + artifact.getArtifactId(); + String bundleVersion = coerceToOsgiVersion(artifact.getVersion()); + + // check if we already loaded this bundle + Bundle[] bundles = bundleContext.getBundles(); + for (int i = 0; i < bundles.length; i++) { + Bundle bundle = bundles[i]; + if (symbolicName.equals(bundle.getSymbolicName()) && + bundleVersion.equals(bundle.getHeaders().get(Constants.BUNDLE_VERSION))) { + return bundle; + } + } + + // load the project object model for this artiface + Project project = loadProject(artifact); + + // build an OSGi manifest for the project + Manifest manifest = createOsgiManifest(project); + + // create a jar in memory for the manifest + ByteArrayOutputStream out = new ByteArrayOutputStream(); + JarOutputStream jarOut = new JarOutputStream(out, manifest); + jarOut.close(); + out.close(); + ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); + + // install the in memory jar + Bundle bundle = bundleContext.installBundle(symbolicName, in); + + // install bundles for all of the dependencies + for (Iterator iterator = project.getDependencies().iterator(); iterator.hasNext();) { + Artifact dependency = (Artifact) iterator.next(); + installBundle(dependency); + } + + return bundle; + } + + public Manifest createOsgiManifest(Project project) throws IOException { + String groupId = project.getGroupId(); + String artifactId = project.getArtifactId(); + String version = project.getVersion(); + String jar = groupId.replace('.', '/') + "/" + artifactId + "/" + version + "/" + project.getJar(); + + StringBuffer requireBundle = new StringBuffer(); + for (Iterator iterator = project.getDependencies().iterator(); iterator.hasNext();) { + Artifact dependency = (Artifact) iterator.next(); + if (requireBundle.length() > 0) requireBundle.append(','); + + requireBundle.append(dependency.getGroupId()).append('.').append(dependency.getArtifactId()); + requireBundle.append(";visibility:=reexport;bundle-version:=").append(coerceToOsgiVersion(dependency.getVersion())); + + } + + String jarPath = new File(localRepository, jar).getAbsolutePath(); + StringBuffer exports = createExportList(jarPath); + + Manifest manifest = new Manifest(); + Attributes attributes = manifest.getMainAttributes(); + attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0"); + attributes.putValue(Constants.BUNDLE_MANIFESTVERSION, "2"); + attributes.putValue(Constants.BUNDLE_VENDOR, groupId); + attributes.putValue(Constants.BUNDLE_NAME, artifactId); + attributes.putValue(Constants.BUNDLE_VERSION, coerceToOsgiVersion(version)); + attributes.putValue(Constants.BUNDLE_SYMBOLICNAME, groupId + "." + artifactId); + attributes.putValue("Eclipse-AutoStart", "true"); + + + attributes.putValue(Constants.BUNDLE_CLASSPATH, ".,external:" + jarPath); + + attributes.putValue(Constants.EXPORT_PACKAGE, exports.toString()); + if (requireBundle != null && requireBundle.length() > 0) { + attributes.putValue(Constants.REQUIRE_BUNDLE, requireBundle.toString()); + } + + return manifest; + } + + private static String coerceToOsgiVersion(String version) { + int partsFound = 0; + String[] versionParts = new String[] { "0", "0", "0"}; + StringBuffer qualifier = new StringBuffer(); + for (StringTokenizer stringTokenizer = new StringTokenizer(version, ".-"); stringTokenizer.hasMoreTokens();) { + String part = stringTokenizer.nextToken(); + if (partsFound < 4) { + try { + Integer.parseInt(part); + versionParts[partsFound++] = part; + } catch (NumberFormatException e) { + partsFound = 4; + qualifier.append(coerceToOsgiQualifier(part)); + } + } else { + if (qualifier.length() > 0) qualifier.append("_"); + qualifier.append(coerceToOsgiQualifier(part)); + } + } + + StringBuffer osgiVersion = new StringBuffer(); + osgiVersion.append(versionParts[0]).append(".").append(versionParts[1]).append(".").append(versionParts[2]); + if (qualifier.length() > 0) { + osgiVersion.append(".").append(qualifier); + } + return osgiVersion.toString(); + } + + private static String coerceToOsgiQualifier(String qualifier) { + char[] chars = qualifier.toCharArray(); + for (int i = 0; i < chars.length; i++) { + char c = chars[i]; + if (!Character.isLetterOrDigit(c) && c != '_' && c != '-') { + chars[i] = '_'; + } + } + return new String(chars); + } + + + private static StringBuffer createExportList(String jarPath) throws IOException { + Set packages = new HashSet(); + FileInputStream in = null; + try { + in = new FileInputStream(jarPath); + JarInputStream jarIn = new JarInputStream(in); + for (JarEntry jarEntry = jarIn.getNextJarEntry(); jarEntry != null; jarEntry = jarIn.getNextJarEntry()) { + String packageName = jarEntry.getName(); + if (!jarEntry.isDirectory()) { + int index = packageName.lastIndexOf("/"); + // we can't export the default package + if (index > 0) { + packageName = packageName.substring(0, index); + if (!packageName.equals("META-INF")) { + packageName = packageName.replace('/', '.'); + packages.add(packageName); + } + } + } + } + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + } + } + } + + StringBuffer exports = new StringBuffer(); + for (Iterator iterator = packages.iterator(); iterator.hasNext();) { + String packageName = (String) iterator.next(); + if (exports.length() > 0) exports.append(";"); + exports.append(packageName); + } + return exports; + } +} diff --git a/osgi/src/main/java/org/xbean/osgi/Project.java b/osgi/src/main/java/org/xbean/osgi/Project.java new file mode 100644 index 00000000..e4a3f14b --- /dev/null +++ b/osgi/src/main/java/org/xbean/osgi/Project.java @@ -0,0 +1,79 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.osgi; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.Collections; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 2.0 + */ +public class Project implements Artifact { + private final String groupId; + private final String artifactId; + private final String version; + private final String type; + private final String jar; + private final Set dependencies; + + public Project(String groupId, String artifactId, String version, String type, Set dependencies) { + this(groupId, artifactId, version, type, artifactId + "-" + version + "." + type, dependencies); + } + + public Project(String groupId, String artifactId, String version, String type, String jar, Set dependencies) { + this.groupId = groupId; + this.artifactId = artifactId; + this.version = version; + this.type = type; + this.jar = jar; + + Set deps = new HashSet(); + for (Iterator iterator = dependencies.iterator(); iterator.hasNext();) { + Artifact dependency = (Artifact) iterator.next(); + deps.add(dependency); + } + this.dependencies = Collections.unmodifiableSet(deps); + } + + public String getGroupId() { + return groupId; + } + + public String getArtifactId() { + return artifactId; + } + + public String getVersion() { + return version; + } + + public String getType() { + return type; + } + + public String getJar() { + return jar; + } + + public Set getDependencies() { + return dependencies; + } +} diff --git a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java new file mode 100644 index 00000000..52881398 --- /dev/null +++ b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java @@ -0,0 +1,103 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.osgi; + +import junit.framework.TestCase; +import org.eclipse.core.runtime.adaptor.EclipseAdaptor; +import org.eclipse.core.runtime.adaptor.LocationManager; +import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor; +import org.eclipse.osgi.framework.internal.core.OSGi; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Bundle; + +import java.io.File; +import java.util.Collections; + +/** + * @author Dain Sundstrom + * @version $Id$ + * @since 2.0 + */ +public class OSGiTest extends TestCase { + private static final String basedir = System.getProperties().getProperty("basedir", "."); + private OSGi osgi; + private BundleContext bundleContext; + private MavenBundleManager mavenBundleManager; + + protected void setUp() throws Exception { + super.setUp(); + System.setProperty("osgi.clean", "true"); + + File osgiDir = new File(basedir, "target/osgi"); + osgiDir.mkdirs(); + System.setProperty("osgi.configuration.area", osgiDir.getAbsolutePath()); + System.setProperty("osgi.install.area", osgiDir.getAbsolutePath()); + LocationManager.initializeLocations(); + + FrameworkAdaptor adaptor = new EclipseAdaptor(null); + osgi = new OSGi(adaptor); + osgi.launch(); + bundleContext = osgi.getBundleContext(); + mavenBundleManager = new MavenBundleManager(bundleContext, new File("/Users/dain/.m2/repository/")); + } + + protected void tearDown() throws Exception { + super.tearDown(); + osgi.shutdown(); + } + + public void testAddBundel() throws Exception { + Project project; + Bundle bundle; + BundleClassLoader bundleClassLoader; + Class clazz = null; + + project = mavenBundleManager.loadProject("org.apache.geronimo.specs", "geronimo-spec-servlet", "2.4-rc4"); + bundle = mavenBundleManager.installBundle(project); + bundleClassLoader = new BundleClassLoader(bundle); + + clazz = bundle.loadClass("javax.servlet.http.HttpServlet"); + assertNotNull(clazz); + + clazz = bundleClassLoader.loadClass("javax.servlet.http.HttpServlet"); + assertNotNull(clazz); + + assertSame(bundle, mavenBundleManager.installBundle(project)); + + project = new Project("org.apache.geronimo.specs", + "geronimo-spec-jsp", + "2.0-rc4", + "jar", + Collections.singleton(new Dependency("org.apache.geronimo.specs", "geronimo-spec-servlet", "2.4-rc4", "jar"))); + bundle = mavenBundleManager.installBundle(project); + bundleClassLoader = new BundleClassLoader(bundle); + + clazz = bundle.loadClass("javax.servlet.http.HttpServlet"); + assertNotNull(clazz); + + clazz = bundleClassLoader.loadClass("javax.servlet.http.HttpServlet"); + assertNotNull(clazz); + + clazz = bundle.loadClass("javax.servlet.jsp.HttpJspPage"); + assertNotNull(clazz); + + clazz = bundleClassLoader.loadClass("javax.servlet.jsp.HttpJspPage"); + assertNotNull(clazz); + + assertSame(bundle, mavenBundleManager.installBundle(project)); + } +} diff --git a/pom.xml b/pom.xml index f4298181..fb497c1b 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,7 @@ deploy-maven-one-repository + xbean-maven1 scpexe://xbean.org/dist @@ -123,6 +124,7 @@ classpath jmx kernel + osgi server spring @@ -173,6 +175,11 @@ mx4j 3.0.1 + + org.eclipse.equinox + osgi + 3.1.1 + qdox qdox @@ -216,4 +223,4 @@ scpexe://xbean.org/home/projects/xbean/public_html/maven/ - \ No newline at end of file + From 50b7a166343cc3e551739adb25ea14a9dee533a8 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Fri, 18 Nov 2005 00:45:14 +0000 Subject: [PATCH 073/736] Replace hard coded path to the maven repo on my laptop with a calculate path based on the user.home system property git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380494 13f79535-47bb-0310-9956-ffa450edef68 --- osgi/src/test/java/org/xbean/osgi/OSGiTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java index 52881398..e7f99056 100644 --- a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java +++ b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java @@ -52,7 +52,7 @@ protected void setUp() throws Exception { osgi = new OSGi(adaptor); osgi.launch(); bundleContext = osgi.getBundleContext(); - mavenBundleManager = new MavenBundleManager(bundleContext, new File("/Users/dain/.m2/repository/")); + mavenBundleManager = new MavenBundleManager(bundleContext, new File(System.getProperty("user.home"), ".m2/repository")); } protected void tearDown() throws Exception { From f441868d0c7c05693d7f532b828a413b1b28c550 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Fri, 18 Nov 2005 22:40:15 +0000 Subject: [PATCH 074/736] Change tested jars to be jars need to build xbean itself git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380495 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/java/org/xbean/osgi/OSGiTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java index e7f99056..3ea72dde 100644 --- a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java +++ b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java @@ -66,36 +66,36 @@ public void testAddBundel() throws Exception { BundleClassLoader bundleClassLoader; Class clazz = null; - project = mavenBundleManager.loadProject("org.apache.geronimo.specs", "geronimo-spec-servlet", "2.4-rc4"); + project = mavenBundleManager.loadProject("springframework", "spring", "1.2.4"); bundle = mavenBundleManager.installBundle(project); bundleClassLoader = new BundleClassLoader(bundle); - clazz = bundle.loadClass("javax.servlet.http.HttpServlet"); + clazz = bundle.loadClass("org.springframework.beans.factory.xml.DefaultXmlBeanDefinitionParser"); assertNotNull(clazz); - clazz = bundleClassLoader.loadClass("javax.servlet.http.HttpServlet"); + clazz = bundleClassLoader.loadClass("org.springframework.beans.factory.xml.DefaultXmlBeanDefinitionParser"); assertNotNull(clazz); assertSame(bundle, mavenBundleManager.installBundle(project)); - project = new Project("org.apache.geronimo.specs", - "geronimo-spec-jsp", - "2.0-rc4", + project = new Project("org.xbean", + "xbean-spring", + "2.1-SNAPSHOT", "jar", - Collections.singleton(new Dependency("org.apache.geronimo.specs", "geronimo-spec-servlet", "2.4-rc4", "jar"))); + Collections.singleton(new Dependency("springframework", "spring", "1.2.4", "jar"))); bundle = mavenBundleManager.installBundle(project); bundleClassLoader = new BundleClassLoader(bundle); - clazz = bundle.loadClass("javax.servlet.http.HttpServlet"); + clazz = bundle.loadClass("org.springframework.beans.factory.xml.DefaultXmlBeanDefinitionParser"); assertNotNull(clazz); - clazz = bundleClassLoader.loadClass("javax.servlet.http.HttpServlet"); + clazz = bundleClassLoader.loadClass("org.springframework.beans.factory.xml.DefaultXmlBeanDefinitionParser"); assertNotNull(clazz); - clazz = bundle.loadClass("javax.servlet.jsp.HttpJspPage"); + clazz = bundle.loadClass("org.xbean.spring.context.impl.XBeanXmlBeanDefinitionParser"); assertNotNull(clazz); - clazz = bundleClassLoader.loadClass("javax.servlet.jsp.HttpJspPage"); + clazz = bundleClassLoader.loadClass("org.xbean.spring.context.impl.XBeanXmlBeanDefinitionParser"); assertNotNull(clazz); assertSame(bundle, mavenBundleManager.installBundle(project)); From 9fc9ccec99c02b7779ac87689a92ab2b268f0af2 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 28 Nov 2005 17:12:26 +0000 Subject: [PATCH 075/736] Fix class loader problem: the thread context classloader is set to the application context class loader, but this is done earlier. Therefore we have to change it on the fly. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380496 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/spring/configuration/ClassLoaderXmlPreprocessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/main/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java b/server/src/main/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java index 5a2db339..f641dbfc 100644 --- a/server/src/main/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java +++ b/server/src/main/java/org/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java @@ -100,5 +100,6 @@ public void preprocess(SpringApplicationContext applicationContext, XmlBeanDefin // assign the class loader to the xml reader and the application context reader.setBeanClassLoader(classLoader); applicationContext.setClassLoader(classLoader); + Thread.currentThread().setContextClassLoader(classLoader); } } From 13a171fef2028811f5fa90203238ed443cf72fe3 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Mon, 28 Nov 2005 20:08:40 +0000 Subject: [PATCH 076/736] Updated repo lists and wagon version. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380497 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb497c1b..39207e1f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,10 +7,12 @@ 2.1-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org + jira http://jira.codehaus.org/browse/XB + continuum @@ -21,23 +23,27 @@ + xbean developers mailto:dev-subscribe@xbean.org mailto:dev-unsubscribe@xbean.org + xbean users mailto:user-subscribe@xbean.org mailto:user-unsubscribe@xbean.org + xbean source control messages mailto:scm-subscribe@xbean.org mailto:scm-unsubscribe@xbean.org + adc @@ -68,6 +74,7 @@ -8 + The Apache Software License, Version 2.0 @@ -75,23 +82,27 @@ repo + scm:svn:https://svn.codehaus.org/xbean/trunk/ scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ https://svn.codehaus.org/xbean/trunk/ + XBean http://xbean.org/ + org.apache.maven.wagon wagon-ssh-external - 1.0-alpha-5 + 1.0-alpha-6-SNAPSHOT + @@ -102,6 +113,7 @@ + maven-one-plugin @@ -120,6 +132,7 @@ + classpath jmx @@ -128,6 +141,26 @@ server spring + + + + + true + + snapshots + Maven SNAPSHOT Repository + http://snapshots.maven.codehaus.org/maven2 + + + + true + + org.livetribe + LiveTribe Repository + http://repo.livetribe.org/maven2-snapshot + + + snapshots @@ -135,6 +168,7 @@ http://snapshots.maven.codehaus.org/maven2 + junit @@ -143,6 +177,7 @@ test + @@ -160,6 +195,11 @@ cglib-nodep 2.1_2 + + commons-beanutils + commons-beanutils + 1.7.0 + commons-logging commons-logging @@ -170,6 +210,11 @@ groovy-1.0-jsr 03 + + org.livetribe + livetribe-jmx + 1.0-SNAPSHOT + mx4j mx4j @@ -207,17 +252,20 @@ + xbean-repo XBean Central Repository scpexe://xbean.org/home/projects/xbean/dist-m2 + xbean-snapshots XBean Central Development Repository scpexe://xbean.org/home/projects/xbean/dist-m2-snapshot + xbean-website scpexe://xbean.org/home/projects/xbean/public_html/maven/ From 5f363b107374759cd1683e6fb548447406326fe3 Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Mon, 12 Dec 2005 03:37:55 +0000 Subject: [PATCH 077/736] Intermediate checkin git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380498 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 143 ++++++------ .../main/java/org/xbean/jmx/BeanPairing.java | 68 ++++++ .../main/java/org/xbean/jmx/EventAdapter.java | 134 ++++++++---- .../main/java/org/xbean/jmx/JMXException.java | 48 ++-- .../java/org/xbean/jmx/JMXServiceMonitor.java | 125 ----------- .../java/org/xbean/jmx/JMXStrategyFinder.java | 21 +- jmx/src/main/java/org/xbean/jmx/MBean.java | 46 ---- .../java/org/xbean/jmx/MBeanExporter.java | 126 +++++++++-- .../main/java/org/xbean/jmx/MBeanHolder.java | 127 +++++++++++ .../org/xbean/jmx/MBeanInfoGenerator.java | 28 +++ .../assembler/JavaBeanMBeanInfoGenerator.java | 24 ++ .../xbean/jmx/DummyMBeanInfoGenerator.java | 30 +++ .../test/java/org/xbean/jmx/JMXService.java | 94 +++++++- jmx/src/test/java/org/xbean/jmx/JMXTest.java | 206 +++++++++++++++++- .../org/xbean/jmx/jmx-custom-assembler.xml | 19 ++ .../org/xbean/jmx/jmx-listener-multiple.xml | 21 ++ .../resources/org/xbean/jmx/jmx-listener.xml | 20 ++ .../org/xbean/jmx/jmx-simple-multiple.xml | 19 ++ .../resources/org/xbean/jmx/jmx-simple.xml | 24 +- jmx/src/test/resources/org/xbean/jmx/jmx.xml | 22 +- 20 files changed, 993 insertions(+), 352 deletions(-) create mode 100644 jmx/src/main/java/org/xbean/jmx/BeanPairing.java delete mode 100644 jmx/src/main/java/org/xbean/jmx/JMXServiceMonitor.java delete mode 100644 jmx/src/main/java/org/xbean/jmx/MBean.java create mode 100644 jmx/src/main/java/org/xbean/jmx/MBeanHolder.java create mode 100644 jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java create mode 100644 jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java create mode 100644 jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java create mode 100644 jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml create mode 100644 jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml create mode 100644 jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml create mode 100644 jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml diff --git a/jmx/pom.xml b/jmx/pom.xml index 6d48bdca..0330c871 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -1,68 +1,81 @@ - - xbean - org.xbean + + xbean + org.xbean + 2.1-SNAPSHOT + + + 4.0.0 + xbean-jmx + XBean :: JMX 2.1-SNAPSHOT - - 4.0.0 - xbean-jmx - XBean :: JMX - 2.1-SNAPSHOT - - - - target/generated - - - src/main/resources - - - - - maven-antrun-plugin - - - process-classes - - run - - - - - - - - - - - - - - - - - - - - - - - mx4j - mx4j - - - commons-logging - commons-logging - - - org.xbean - xbean-kernel - 2.1-SNAPSHOT - - - org.xbean - xbean-spring - 2.1-SNAPSHOT - - + + + + + target/generated + + + src/main/resources + + + + + + maven-antrun-plugin + + + process-classes + + run + + + + + + + + + + + + + + + + + + + + + + + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + + + mx4j + mx4j + + + org.livetribe + livetribe-jmx + + + org.xbean + xbean-kernel + 2.1-SNAPSHOT + + + org.xbean + xbean-spring + 2.1-SNAPSHOT + + \ No newline at end of file diff --git a/jmx/src/main/java/org/xbean/jmx/BeanPairing.java b/jmx/src/main/java/org/xbean/jmx/BeanPairing.java new file mode 100644 index 00000000..12b26eda --- /dev/null +++ b/jmx/src/main/java/org/xbean/jmx/BeanPairing.java @@ -0,0 +1,68 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import javax.management.MBeanInfo; +import javax.management.ObjectName; + + +/** + * @version $Revision: $ $Date: $ + * @org.xbean.XBean element="beanPairing" + */ +public class BeanPairing { + private Class beanClass; + private Class generatorClass; + + /** + * @org.xbean.Property alias="beanClass" + */ + public void setBeanClass(Class beanClass) { + this.beanClass = beanClass; + } + + public Class getBeanClass() { + return beanClass; + } + + /** + * @org.xbean.Property alias="generatorClass" + */ + public void setGeneratorClass(Class generatorClass) { + this.generatorClass = generatorClass; + } + + public Class getGeneratorClass() { + return generatorClass; + } + + public MBeanInfo createMBeanInfo(Object bean, ObjectName objectName) { + try { + MBeanInfoGenerator generator = (MBeanInfoGenerator) getGeneratorClass().newInstance(); + return generator.createMBeanInfo(bean, objectName); + } + catch (InstantiationException x) { + throw new JMXException(x); + } + catch (IllegalAccessException x) { + throw new JMXException(x); + } + catch (ClassCastException x) { + throw new JMXException(x); + } + } +} diff --git a/jmx/src/main/java/org/xbean/jmx/EventAdapter.java b/jmx/src/main/java/org/xbean/jmx/EventAdapter.java index 8569b5a2..0c1c9d09 100644 --- a/jmx/src/main/java/org/xbean/jmx/EventAdapter.java +++ b/jmx/src/main/java/org/xbean/jmx/EventAdapter.java @@ -1,24 +1,48 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ package org.xbean.jmx; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import javax.management.Notification; + /** + * @version $Revision: $ $Date: $ * @org.xbean.XBean element="listen" */ public class EventAdapter { - private Object source; - private Class targetClass; + private Object bean; + private Class listenerClass; private String addMethodName; private String removeMethodName; private Object listener; - public void setSource(Object source) { - this.source = source; + public void setBean(Object bean) { + this.bean = bean; } - public void setTargetClass(Class targetClass) { - this.targetClass = targetClass; + /** + * @org.xbean.Property alias="listener" + */ + public void setListenerClass(Class listenerClass) { + this.listenerClass = listenerClass; } public void setAddMethodName(String addMethodName) { @@ -29,54 +53,76 @@ public void setRemoveMethodName(String removeMethodName) { this.removeMethodName = removeMethodName; } - /** - * @org.xbean.InitMethod - */ - public void start() { + public void bindListener(Object mbeanAdapter) { + listener = Proxy.newProxyInstance(listenerClass.getClassLoader(), new Class[]{listenerClass}, new EventInvocationHandler(mbeanAdapter)); + String methodName = addMethodName; + if (methodName == null) methodName = "add" + getSimpleClassName(listenerClass); try { - listener = targetClass.newInstance(); - Class[] interfaces = targetClass.getInterfaces(); - boolean found = false; - for (int i = 0; i < interfaces.length; ++i) { - try { - Method addMethod = source.getClass().getMethod(addMethodName, new Class[]{interfaces[i]}); - addMethod.invoke(source, new Object[]{listener}); - found = true; - break; - } catch (NoSuchMethodException ignored) { - } - } - if (!found) throw new JMXException("Could not find " + addMethodName + " in class " + targetClass.getName()); - } catch (InstantiationException x) { + Method addMethod = bean.getClass().getMethod(methodName, new Class[]{listenerClass}); + addMethod.invoke(bean, new Object[]{listener}); + } + catch (NoSuchMethodException x) { throw new JMXException(x); - } catch (IllegalAccessException x) { + } + catch (IllegalAccessException x) { throw new JMXException(x); - } catch (InvocationTargetException x) { + } + catch (InvocationTargetException x) { throw new JMXException(x.getCause()); } } - /** - * @org.xbean.DestroyMethod - */ - public void stop() { + public void unbindListener() { + String methodName = removeMethodName; + if (methodName == null) methodName = "remove" + getSimpleClassName(listenerClass); try { - Class[] interfaces = targetClass.getInterfaces(); - boolean found = false; - for (int i = 0; i < interfaces.length; ++i) { - try { - Method removeMethod = source.getClass().getMethod(removeMethodName, new Class[]{interfaces[i]}); - removeMethod.invoke(source, new Object[]{listener}); - found = true; - break; - } catch (NoSuchMethodException ignored) { - } - } - if (!found) throw new JMXException("Could not find " + removeMethodName + " in class " + targetClass.getName()); - } catch (IllegalAccessException x) { + Method addMethod = bean.getClass().getMethod(methodName, new Class[]{listenerClass}); + addMethod.invoke(bean, new Object[]{listener}); + } + catch (NoSuchMethodException x) { + throw new JMXException(x); + } + catch (IllegalAccessException x) { throw new JMXException(x); - } catch (InvocationTargetException x) { + } + catch (InvocationTargetException x) { throw new JMXException(x.getCause()); } } + + private String getSimpleClassName(Class cls) { + String name = cls.getName(); + return name.substring(name.lastIndexOf('.') + 1); + } + + private static class EventInvocationHandler implements InvocationHandler { + private final Object emitter; + + public EventInvocationHandler(Object emitter) { + this.emitter = emitter; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if (method.getDeclaringClass() == Object.class) return method.invoke(this, args); + + Object event = args[0]; + Notification notification = new Notification(event.getClass().getName(), emitter, 0, System.currentTimeMillis()); + notification.setUserData(event); + + try { + Method send = emitter.getClass().getMethod("sendNotification", new Class[]{Notification.class}); + send.invoke(emitter, new Object[]{notification}); + return null; + } + catch (NoSuchMethodException x) { + throw new JMXException(x); + } + catch (IllegalAccessException x) { + throw new JMXException(x); + } + catch (InvocationTargetException x) { + throw new JMXException(x.getCause()); + } + } + } } diff --git a/jmx/src/main/java/org/xbean/jmx/JMXException.java b/jmx/src/main/java/org/xbean/jmx/JMXException.java index 70f4704c..e7c40ff8 100644 --- a/jmx/src/main/java/org/xbean/jmx/JMXException.java +++ b/jmx/src/main/java/org/xbean/jmx/JMXException.java @@ -1,29 +1,37 @@ -/* - * © Copyright 2004 Hewlett-Packard +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. */ package org.xbean.jmx; /** - * $Rev$ + * @version $Revision: $ $Date: $ */ -public class JMXException extends RuntimeException -{ - public JMXException() - { - } +public class JMXException extends RuntimeException { + public JMXException() { + } - public JMXException(String message) - { - super(message); - } + public JMXException(String message) { + super(message); + } - public JMXException(String message, Throwable cause) - { - super(message, cause); - } + public JMXException(String message, Throwable cause) { + super(message, cause); + } - public JMXException(Throwable cause) - { - super(cause); - } + public JMXException(Throwable cause) { + super(cause); + } } diff --git a/jmx/src/main/java/org/xbean/jmx/JMXServiceMonitor.java b/jmx/src/main/java/org/xbean/jmx/JMXServiceMonitor.java deleted file mode 100644 index 32f85cdf..00000000 --- a/jmx/src/main/java/org/xbean/jmx/JMXServiceMonitor.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * - * Copyright 2005 (C) The original author or authors. - * - * 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. - */ -package org.xbean.jmx; - -import java.util.HashMap; -import java.util.Map; -import javax.management.InstanceAlreadyExistsException; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.NotCompliantMBeanException; - -import org.xbean.jmx.config.JMXServiceConfig; -import org.xbean.kernel.Kernel; -import org.xbean.kernel.NullServiceMonitor; -import org.xbean.kernel.ServiceEvent; -import org.xbean.kernel.ServiceName; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; - - -/** - * @version $Revision: $ $Date: $ - */ -public class JMXServiceMonitor extends NullServiceMonitor { - - private final static Log log = LogFactory.getLog(JMXServiceMonitor.class); - private final static JMXStrategyFinder FINDER = new JMXStrategyFinder("META-INF/org.xbean.jmx.StrategyFinder/"); - private final Map configurations = new HashMap(); - private final Map strategies = new HashMap(); - private final MBeanServer server; - - public JMXServiceMonitor(Kernel kernel, MBeanServer server) { - if (kernel == null) throw new IllegalArgumentException("kernel is null"); - if (server == null) throw new IllegalArgumentException("server is null"); - - kernel.addServiceMonitor(this); - this.server = server; - } - - /** - * {@inheritDoc} - */ - public void serviceStarting(ServiceEvent serviceEvent) { - Cache entry = (Cache) configurations.get(serviceEvent.getServiceName()); - if (entry != null) { - try { - server.registerMBean(entry.strategy.wrapService(serviceEvent.getService(), entry.configuration), - entry.configuration.getObjectName()); - } catch (InstanceAlreadyExistsException doNothing) { - log.error("Starting " + serviceEvent.getServiceName(), doNothing); - } catch (MBeanRegistrationException doNothing) { - log.error("Starting " + serviceEvent.getServiceName(), doNothing); - } catch (NotCompliantMBeanException doNothing) { - log.error("Starting " + serviceEvent.getServiceName(), doNothing); - } catch (JMXServiceException doNothing) { - log.error("Starting " + serviceEvent.getServiceName(), doNothing); - } - } - } - - /** - * {@inheritDoc} - */ - public void serviceStopping(ServiceEvent serviceEvent) { - Cache entry = (Cache) configurations.get(serviceEvent.getServiceName()); - if (entry != null) { - try { - server.unregisterMBean(entry.configuration.getObjectName()); - entry.strategy.unwrapService(serviceEvent.getService(), entry.configuration); - } catch (InstanceNotFoundException doNothing) { - log.error("Starting " + serviceEvent.getServiceName(), doNothing); - } catch (MBeanRegistrationException doNothing) { - log.error("Starting " + serviceEvent.getServiceName(), doNothing); - } - } - } - - /** - * Add a service configuration to the monitor. The method loads the wrapping - * strategy, if it has not been loaded already. - * - * @param service of the service to be wrapped. - * @param config the details of how the service is to be wrapped. - * @throws JMXServiceException if no wrapping strategy exists for the config. - */ - public void addServiceConfig(ServiceName service, JMXServiceConfig config) throws JMXServiceException { - try { - String name = config.getStrategy(); - JMXWrappingStrategy strategy = (JMXWrappingStrategy) strategies.get(name); - if (strategy == null) { - strategy = FINDER.newInstance(name); - strategies.put(name, strategy); - } - configurations.put(service, new Cache(config, strategy)); - } catch (JMXServiceException doNothing) { - log.error("Adding " + service, doNothing); - throw doNothing; - } - } - - private class Cache { - final JMXServiceConfig configuration; - final JMXWrappingStrategy strategy; - - public Cache(JMXServiceConfig configuration, JMXWrappingStrategy strategy) { - this.configuration = configuration; - this.strategy = strategy; - } - } -} diff --git a/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java b/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java index a47a9363..a042c5ec 100644 --- a/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java +++ b/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java @@ -54,13 +54,17 @@ public JMXWrappingStrategy newInstance(String key) throws JMXServiceException { } result = (JMXWrappingStrategy) clazz.newInstance(); } - } catch (ClassNotFoundException doNothing) { + } + catch (ClassNotFoundException doNothing) { throw new JMXServiceException(doNothing); - } catch (IOException doNothing) { + } + catch (IOException doNothing) { throw new JMXServiceException(doNothing); - } catch (InstantiationException doNothing) { + } + catch (InstantiationException doNothing) { throw new JMXServiceException(doNothing); - } catch (IllegalAccessException doNothing) { + } + catch (IllegalAccessException doNothing) { throw new JMXServiceException(doNothing); } return result; @@ -74,7 +78,8 @@ private Class loadClass(Properties properties) throws ClassNotFoundException, IO } try { return Thread.currentThread().getContextClassLoader().loadClass(className); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { return JMXStrategyFinder.class.getClassLoader().loadClass(className); } } @@ -96,10 +101,12 @@ private Properties doFindServiceWrapperProperies(String key) throws IOException Properties properties = new Properties(); properties.load(reader); return properties; - } finally { + } + finally { try { reader.close(); - } catch (Exception e) { + } + catch (Exception e) { } } } diff --git a/jmx/src/main/java/org/xbean/jmx/MBean.java b/jmx/src/main/java/org/xbean/jmx/MBean.java deleted file mode 100644 index 8797e4eb..00000000 --- a/jmx/src/main/java/org/xbean/jmx/MBean.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.xbean.jmx; - -/** - * @org.xbean.XBean element="mbean" - */ -public class MBean { - private Object bean; - private String objectName; - private Class mbeanClass; - private EventAdapter eventAdapter; - - public Object getBean() { - return bean; - } - - public void setBean(Object bean) { - this.bean = bean; - } - - public String getObjectName() { - return objectName; - } - - public void setObjectName(String objectName) { - this.objectName = objectName; - } - - /** - * @org.xbean.Property alias="mbean" - */ - public Class getMBeanClass() { - return mbeanClass; - } - - public void setMBeanClass(Class mbeanClass) { - this.mbeanClass = mbeanClass; - } - - public EventAdapter getEventAdapter() { - return eventAdapter; - } - - public void setEventAdapter(EventAdapter eventAdapter) { - this.eventAdapter = eventAdapter; - } -} diff --git a/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java b/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java index 9dbe3f64..b2228a02 100644 --- a/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java +++ b/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java @@ -1,58 +1,156 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ package org.xbean.jmx; -import javax.management.MBeanServer; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; +import javax.management.InstanceNotFoundException; +import javax.management.JMException; +import javax.management.MBeanInfo; +import javax.management.MBeanRegistrationException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.xbean.jmx.assembler.JavaBeanMBeanInfoGenerator; + /** * Exports services to an MBeanServer for management. + * + * @version $Revision: $ $Date: $ * @org.xbean.XBean element="export" */ public class MBeanExporter { private MBeanServer mbeanServer; + private List mbeanInfos; private List mbeans; private List connectors; + private Map registeredMBeans = new HashMap(); /** - * @org.xbean.Property alias="mbeanServer" + * @org.xbean.Property alias="mbeanserver" */ - public MBeanServer getMBeanServer() { - return mbeanServer; + public void setMbeanServer(MBeanServer mbeanServer) { + this.mbeanServer = mbeanServer; } - public void setMBeanServer(MBeanServer mbeanServer) { - this.mbeanServer = mbeanServer; + public MBeanServer getMbeanServer() { + return mbeanServer; } /** - * @org.xbean.Property alias="mbeans" + * @org.xbean.Property alias="mbeaninfos" */ - public List getMBeans() { - return mbeans; + public void setMbeanInfos(List mbeanInfos) { + this.mbeanInfos = mbeanInfos; } - public void setMBeans(List mbeans) { + public List getMbeanInfos() { + return mbeanInfos; + } + + /** + * @org.xbean.Property alias="mbeans" + */ + public void setMbeans(List mbeans) { this.mbeans = mbeans; } - public List getConnectors() { - return connectors; + public List getMbeans() { + return mbeans; } public void setConnectors(List connectors) { this.connectors = connectors; } + public List getConnectors() { + return connectors; + } + /** * @org.xbean.InitMethod */ public void start() { - System.out.println("start"); + try { + MBeanServer server = findMBeanServer(); + List mbeanElements = getMbeans(); + for (int i = 0; i < mbeanElements.size(); i++) { + MBeanHolder mbean = (MBeanHolder) mbeanElements.get(i); + + ObjectName objectName = mbean.createObjectName(); + MBeanInfo metadata = createMBeanInfo(mbean, objectName); + Object mbeanAdapter = mbean.createMBeanAdapter(metadata, objectName); + server.registerMBean(mbeanAdapter, objectName); + mbean.bindListeners(mbeanAdapter); + registeredMBeans.put(objectName, mbean); + } + } + catch (JMException x) { + throw new JMXException(x); + } } /** * @org.xbean.DestroyMethod */ public void stop() { - System.out.println("stop"); + MBeanServer server = findMBeanServer(); + for (Iterator iterator = registeredMBeans.entrySet().iterator(); iterator.hasNext();) { + Map.Entry entry = (Map.Entry) iterator.next(); + try { + server.unregisterMBean((ObjectName) entry.getKey()); + ((MBeanHolder) entry.getValue()).unbindListeners(); + } + catch (InstanceNotFoundException ignored) { + } + catch (MBeanRegistrationException x) { + throw new JMXException(x); + } + } + } + + protected MBeanServer findMBeanServer() { + MBeanServer server = getMbeanServer(); + if (server != null) return server; + + // TODO: handle JDK 5 Platform MBeanServer if data member is null + throw new JMXException("Cannot find MBeanServer"); + } + + private MBeanInfo createMBeanInfo(MBeanHolder mbean, ObjectName objectName) { + MBeanInfo metadata = null; + Class beanClass = mbean.getBean().getClass(); + List infos = getMbeanInfos(); + if (infos != null) { + while (metadata == null && beanClass != Object.class) { + for (int j = 0; j < infos.size(); j++) { + BeanPairing beanPairing = (BeanPairing) infos.get(j); + if (beanPairing.getBeanClass().isAssignableFrom(beanClass)) { + metadata = beanPairing.createMBeanInfo(mbean.getBean(), objectName); + return metadata; + } + } + beanClass = beanClass.getSuperclass(); + } + } + // No specialized assembler found, use a default one + return new JavaBeanMBeanInfoGenerator().createMBeanInfo(mbean.getBean(), objectName); } } diff --git a/jmx/src/main/java/org/xbean/jmx/MBeanHolder.java b/jmx/src/main/java/org/xbean/jmx/MBeanHolder.java new file mode 100644 index 00000000..4017195f --- /dev/null +++ b/jmx/src/main/java/org/xbean/jmx/MBeanHolder.java @@ -0,0 +1,127 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.List; +import javax.management.MBeanInfo; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import org.livetribe.jmx.DynamicMBeanAdapter; + + +/** + * @version $Revision: $ $Date: $ + * @org.xbean.XBean element="mbean" + */ +public class MBeanHolder { + private Object bean; + private String objectName; + private Class mbeanClass; + private List eventAdapters; + + public void setBean(Object bean) { + this.bean = bean; + } + + public Object getBean() { + return bean; + } + + /** + * @org.xbean.Property alias="objectname" + */ + public void setObjectName(String objectName) { + this.objectName = objectName; + } + + private String getObjectName() { + return objectName; + } + + public void setMbeanClass(Class mbeanClass) { + this.mbeanClass = mbeanClass; + } + + private Class getMbeanClass() { + return mbeanClass; + } + + /** + * @org.xbean.Property alias="listeners" + */ + public void setEventAdapters(List adapters) { + this.eventAdapters = adapters; + } + + private List getEventAdapters() { + return eventAdapters; + } + + public ObjectName createObjectName() { + String name = getObjectName(); + try { + return ObjectName.getInstance(name); + } + catch (MalformedObjectNameException x) { + throw new JMXException(x); + } + } + + protected Object createMBeanAdapter(MBeanInfo mbeanInfo, ObjectName objectName) { + try { + Class adapterClass = getMbeanClass(); + if (adapterClass == null) adapterClass = DynamicMBeanAdapter.class; + Constructor ctor = adapterClass.getConstructor(new Class[]{Object.class, MBeanInfo.class}); + return ctor.newInstance(new Object[]{getBean(), mbeanInfo}); + } + catch (NoSuchMethodException x) { + throw new JMXException(x); + } + catch (InstantiationException x) { + throw new JMXException(x); + } + catch (IllegalAccessException x) { + throw new JMXException(x); + } + catch (InvocationTargetException x) { + throw new JMXException(x.getCause()); + } + } + + public void bindListeners(Object mbeanAdapter) { + List adapters = getEventAdapters(); + if (adapters != null) { + for (int i = 0; i < adapters.size(); i++) { + EventAdapter adapter = (EventAdapter) adapters.get(i); + adapter.bindListener(mbeanAdapter); + } + } + } + + public void unbindListeners() { + List adapters = getEventAdapters(); + if (adapters != null) { + for (int i = 0; i < adapters.size(); i++) { + EventAdapter adapter = (EventAdapter) adapters.get(i); + adapter.unbindListener(); + } + } + } +} diff --git a/jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java b/jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java new file mode 100644 index 00000000..c87597d2 --- /dev/null +++ b/jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java @@ -0,0 +1,28 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import javax.management.MBeanInfo; +import javax.management.ObjectName; + + +/** + * @version $Revision: $ $Date: $ + */ +public interface MBeanInfoGenerator { + public MBeanInfo createMBeanInfo(Object bean, ObjectName objectName); +} diff --git a/jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java b/jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java new file mode 100644 index 00000000..93755634 --- /dev/null +++ b/jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java @@ -0,0 +1,24 @@ +package org.xbean.jmx.assembler; + +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanConstructorInfo; +import javax.management.MBeanInfo; +import javax.management.MBeanOperationInfo; +import javax.management.ObjectName; + +import org.livetribe.jmx.MBeanUtils; +import org.xbean.jmx.MBeanInfoGenerator; + + +/** + * @version $Revision: $ $Date: $ + */ +public class JavaBeanMBeanInfoGenerator implements MBeanInfoGenerator { + public MBeanInfo createMBeanInfo(Object bean, ObjectName objectName) { + MBeanAttributeInfo[] attributes = MBeanUtils.getMBeanAttributeInfo(bean); + MBeanConstructorInfo[] constructors = MBeanUtils.getMBeanConstructorInfo(bean); + MBeanOperationInfo[] operations = MBeanUtils.getMBeanOperationInfo(bean); + + return new MBeanInfo(bean.getClass().getName(), null, attributes, constructors, operations, null); + } +} diff --git a/jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java b/jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java new file mode 100644 index 00000000..6ebe5eb3 --- /dev/null +++ b/jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java @@ -0,0 +1,30 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ +package org.xbean.jmx; + +import javax.management.MBeanInfo; +import javax.management.ObjectName; + + +/** + * @version $Revision: $ $Date: $ + */ +public class DummyMBeanInfoGenerator implements MBeanInfoGenerator { + public MBeanInfo createMBeanInfo(Object bean, ObjectName objectName) { + return new MBeanInfo(bean.getClass().getName(), "dummy", null, null, null, null); + } +} diff --git a/jmx/src/test/java/org/xbean/jmx/JMXService.java b/jmx/src/test/java/org/xbean/jmx/JMXService.java index 18ff6455..fce969d3 100644 --- a/jmx/src/test/java/org/xbean/jmx/JMXService.java +++ b/jmx/src/test/java/org/xbean/jmx/JMXService.java @@ -1,8 +1,96 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ package org.xbean.jmx; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.List; + + /** - * $Rev$ + * @version $Revision: $ $Date: $ */ -public class JMXService -{ +public class JMXService { + private List listeners = new ArrayList(); + private int attr1; + private Integer attr2; + private boolean dog; + + public JMXService() { + } + + public JMXService(int attr1, Integer attr2, boolean dog) { + this.attr1 = attr1; + this.attr2 = attr2; + this.dog = dog; + } + + public int getAttr1() { + return attr1; + } + + public void setAttr1(int attr1) { + this.attr1 = attr1; + } + + public Integer getAttr2() { + return attr2; + } + + public void setAttr2(Integer attr2) { + this.attr2 = attr2; + } + + public boolean isDog() { + return dog; + } + + public void setDog(boolean dog) { + this.dog = dog; + } + + public String getFoo() { + return "BAR"; + } + + public void setBar(String bar) { + if (!"FOO".equals(bar)) throw new IllegalArgumentException("Only FOO is accepted"); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + listeners.add(listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + listeners.remove(listener); + } + + public void firePropertyChange() { + Long oldValue = new Long(System.currentTimeMillis()); + Long newValue = new Long(oldValue.longValue() - 1L); + PropertyChangeEvent event = new PropertyChangeEvent(this, "property", oldValue, newValue); + for (int i = 0; i < listeners.size(); i++) { + PropertyChangeListener listener = (PropertyChangeListener) listeners.get(i); + listener.propertyChange(event); + } + } + + public List getPropertyChangeListeners() { + return listeners; + } } diff --git a/jmx/src/test/java/org/xbean/jmx/JMXTest.java b/jmx/src/test/java/org/xbean/jmx/JMXTest.java index 71fad915..cc788d8a 100644 --- a/jmx/src/test/java/org/xbean/jmx/JMXTest.java +++ b/jmx/src/test/java/org/xbean/jmx/JMXTest.java @@ -1,30 +1,218 @@ +/** + * + * Copyright 2005 (C) The original author or authors. + * + * 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. + */ package org.xbean.jmx; +import javax.management.MBeanServer; +import javax.management.Notification; +import javax.management.NotificationListener; +import javax.management.ObjectName; +import javax.management.AttributeNotFoundException; +import javax.management.Attribute; + import junit.framework.TestCase; import org.xbean.spring.context.ClassPathXmlApplicationContext; -import java.util.List; /** - * $Rev$ + * @version $Revision: $ $Date: $ */ public class JMXTest extends TestCase { + public void testSimple() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple.xml"); try { Object jmxService = context.getBean("jmxService"); assertNotNull(jmxService); - Object jmxExporter = context.getBean("jmxExporter"); + Object server = context.getBean("mbeanServer"); + assertNotNull(server); + + MBeanExporter jmxExporter = (MBeanExporter) context.getBean("jmxExporter"); assertNotNull(jmxExporter); - assertTrue(jmxExporter instanceof MBeanExporter); - List mbeans = ((MBeanExporter) jmxExporter).getMBeans(); - assertNotNull(mbeans); - assertEquals(2, mbeans.size()); - assertSame(jmxService, mbeans.get(0)); - assertSame(jmxService, mbeans.get(1)); + + MBeanServer mbeanServer = jmxExporter.getMbeanServer(); + assertNotNull(mbeanServer); + assertSame(server, mbeanServer); + assertEquals("org.xbean", mbeanServer.getDefaultDomain()); + + ObjectName objectName = ObjectName.getInstance(":type=JMXService"); + assertTrue(mbeanServer.isRegistered(objectName)); + + assertEquals("BAR", mbeanServer.getAttribute(objectName, "foo")); + try { + mbeanServer.setAttribute(objectName, new Attribute("foo", "CDR")); + fail("Should have thrown an AttributeNotFoundException"); + } catch (AttributeNotFoundException doNothing) { + } + + // iniital value should have been set by spring + assertEquals(new Integer(32), mbeanServer.getAttribute(objectName, "attr1")); + mbeanServer.setAttribute(objectName, new Attribute("attr1", new Integer(5))); + assertEquals(new Integer(5), mbeanServer.getAttribute(objectName, "attr1")); + + // iniital value should have been set by spring + assertEquals(new Integer(64), mbeanServer.getAttribute(objectName, "attr2")); + mbeanServer.setAttribute(objectName, new Attribute("attr2", new Integer(7))); + assertEquals(new Integer(7), mbeanServer.getAttribute(objectName, "attr2")); + + mbeanServer.setAttribute(objectName, new Attribute("dog", Boolean.FALSE)); + assertEquals(Boolean.FALSE, mbeanServer.getAttribute(objectName, "dog")); + mbeanServer.setAttribute(objectName, new Attribute("dog", Boolean.TRUE)); + assertEquals(Boolean.TRUE, mbeanServer.getAttribute(objectName, "dog")); + + mbeanServer.setAttribute(objectName, new Attribute("bar", "FOO")); + try { + mbeanServer.getAttribute(objectName, "bar"); + fail("Should have thrown an AttributeNotFoundException"); + } catch (AttributeNotFoundException doNothing) { + } + } finally { context.destroy(); } } + + public void testSimpleMultiple() throws Exception { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple-multiple.xml"); + try { + Object jmxService1 = context.getBean("jmxService1"); + assertNotNull(jmxService1); + + Object jmxService2 = context.getBean("jmxService2"); + assertNotNull(jmxService2); + + MBeanExporter jmxExporter = (MBeanExporter) context.getBean("jmxExporter"); + assertNotNull(jmxExporter); + + MBeanServer mbeanServer = jmxExporter.getMbeanServer(); + assertNotNull(mbeanServer); + + ObjectName objectName11 = ObjectName.getInstance(":type=JMXService1,id=1"); + ObjectName objectName12 = ObjectName.getInstance(":type=JMXService1,id=2"); + ObjectName objectName21 = ObjectName.getInstance(":type=JMXService2,id=1"); + assertTrue(mbeanServer.isRegistered(objectName11)); + assertTrue(mbeanServer.isRegistered(objectName12)); + assertTrue(mbeanServer.isRegistered(objectName21)); + } + finally { + context.destroy(); + } + } + + public void testCustomAssembler() throws Exception { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-custom-assembler.xml"); + try { + Object jmxService = context.getBean("jmxService"); + assertNotNull(jmxService); + + MBeanExporter jmxExporter = (MBeanExporter) context.getBean("jmxExporter"); + assertNotNull(jmxExporter); + + MBeanServer mbeanServer = jmxExporter.getMbeanServer(); + assertNotNull(mbeanServer); + + ObjectName objectName = ObjectName.getInstance(":type=JMXService"); + assertTrue(mbeanServer.isRegistered(objectName)); + javax.management.MBeanInfo mbeanInfo = mbeanServer.getMBeanInfo(objectName); + assertEquals("dummy", mbeanInfo.getDescription()); + } + finally { + context.destroy(); + } + } + + public void testListener() throws Exception { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-listener.xml"); + try { + JMXService jmxService = (JMXService) context.getBean("jmxService"); + assertNotNull(jmxService); + + assertEquals(1, jmxService.getPropertyChangeListeners().size()); + MBeanExporter jmxExporter = (MBeanExporter) context.getBean("jmxExporter"); + assertNotNull(jmxExporter); + + MBeanServer mbeanServer = jmxExporter.getMbeanServer(); + assertNotNull(mbeanServer); + + ObjectName objectName = ObjectName.getInstance(":type=JMXService"); + assertTrue(mbeanServer.isRegistered(objectName)); + + final Reference notified = new Reference(Boolean.FALSE); + mbeanServer.addNotificationListener(objectName, new NotificationListener() { + public void handleNotification(Notification notification, Object handback) { + notified.set(Boolean.TRUE); + } + }, null, null); + + jmxService.firePropertyChange(); + + assertEquals(Boolean.TRUE, notified.get()); + } + finally { + context.destroy(); + } + } + + public void testListenerMultiple() throws Exception { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-listener-multiple.xml"); + try { + JMXService jmxService = (JMXService) context.getBean("jmxService"); + assertNotNull(jmxService); + + assertEquals(2, jmxService.getPropertyChangeListeners().size()); + MBeanExporter jmxExporter = (MBeanExporter) context.getBean("jmxExporter"); + assertNotNull(jmxExporter); + + MBeanServer mbeanServer = jmxExporter.getMbeanServer(); + assertNotNull(mbeanServer); + + ObjectName objectName = ObjectName.getInstance(":type=JMXService"); + assertTrue(mbeanServer.isRegistered(objectName)); + + final Reference notified = new Reference(new Integer(0)); + mbeanServer.addNotificationListener(objectName, new NotificationListener() { + public void handleNotification(Notification notification, Object handback) { + Integer oldValue = (Integer) notified.get(); + notified.set(new Integer(oldValue.intValue() + 1)); + } + }, null, null); + + jmxService.firePropertyChange(); + + assertEquals(2, ((Integer) notified.get()).intValue()); + } + finally { + context.destroy(); + } + } + + private static class Reference { + private Object reference; + + public Reference(Object reference) { + this.reference = reference; + } + + public Object get() { + return reference; + } + + public void set(Object reference) { + this.reference = reference; + } + } } diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml b/jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml new file mode 100644 index 00000000..b57df510 --- /dev/null +++ b/jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml b/jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml new file mode 100644 index 00000000..d2db8e94 --- /dev/null +++ b/jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml b/jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml new file mode 100644 index 00000000..1ba06d5a --- /dev/null +++ b/jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml b/jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml new file mode 100644 index 00000000..8503864c --- /dev/null +++ b/jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml index 55215a79..73bd6016 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml +++ b/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml @@ -1,11 +1,19 @@ - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx.xml b/jmx/src/test/resources/org/xbean/jmx/jmx.xml index 654db7dd..d5365587 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx.xml +++ b/jmx/src/test/resources/org/xbean/jmx/jmx.xml @@ -1,17 +1,17 @@ - + - - - - - - - + + + + + + + From b989fd5deb2d392dc695bdd6125f8f1e5ee24fad Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 12 Dec 2005 13:26:40 +0000 Subject: [PATCH 078/736] added an initial cut of the SCA support for XBean git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380499 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 9 + sca/README.txt | 5 + sca/pom.xml | 53 +++++ .../org/xbean/sca/IntrospectionSupport.java | 122 +++++++++++ .../org/xbean/sca/ScaBeanPostProcessor.java | 192 ++++++++++++++++++ .../java/org/xbean/sca/LifecyclePojo.java | 38 ++++ .../java/org/xbean/sca/ScaLifecycleTest.java | 62 ++++++ .../java/org/xbean/sca/SpringTestSupport.java | 53 +++++ sca/src/test/resources/log4j.properties | 18 ++ .../resources/org/xbean/sca/lifecycle.xml | 13 ++ 10 files changed, 565 insertions(+) create mode 100644 sca/README.txt create mode 100644 sca/pom.xml create mode 100644 sca/src/main/java/org/xbean/sca/IntrospectionSupport.java create mode 100644 sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java create mode 100644 sca/src/test/java/org/xbean/sca/LifecyclePojo.java create mode 100644 sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java create mode 100644 sca/src/test/java/org/xbean/sca/SpringTestSupport.java create mode 100755 sca/src/test/resources/log4j.properties create mode 100644 sca/src/test/resources/org/xbean/sca/lifecycle.xml diff --git a/pom.xml b/pom.xml index 39207e1f..c340bf36 100644 --- a/pom.xml +++ b/pom.xml @@ -159,6 +159,10 @@ LiveTribe Repository http://repo.livetribe.org/maven2-snapshot + + codehaus + http://dist.codehaus.org/ + @@ -250,6 +254,11 @@ xbean-spring ${version} + + lingo + sca-api + SNAPSHOT + diff --git a/sca/README.txt b/sca/README.txt new file mode 100644 index 00000000..3f33bdad --- /dev/null +++ b/sca/README.txt @@ -0,0 +1,5 @@ +This module contains the Spring additions for XBean which add support for the SCA Annotations for + +* lifecycle via @Init and @Destroy +* dependency injection via @Property and @Reference and @ComponentName +* custom SCA dependency injection meechanisms like @ComponentMetaData @Component @SessionID diff --git a/sca/pom.xml b/sca/pom.xml new file mode 100644 index 00000000..f3a2f151 --- /dev/null +++ b/sca/pom.xml @@ -0,0 +1,53 @@ + + + xbean + org.xbean + 2.1-SNAPSHOT + + 4.0.0 + xbean-sca + XBean :: SCA + 2.1-SNAPSHOT + + + + src/test/resources + + + target/test-generated + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + springframework + spring + + + lingo + sca-api + + + mx4j + mx4j + + + commons-logging + commons-logging + + + backport-util-concurrent + backport-util-concurrent + + + \ No newline at end of file diff --git a/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java b/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java new file mode 100644 index 00000000..d6e732df --- /dev/null +++ b/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java @@ -0,0 +1,122 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanInitializationException; + +import java.beans.BeanInfo; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * Useful base class for introspection of POJOs + * + * @version $Revision$ + */ +public abstract class IntrospectionSupport { + + protected static final Object[] EMPTY_ARGUMENTS = {}; + + protected BeanInfo getBeanInfo(Object bean) { + BeanInfo beanInfo; + try { + beanInfo = Introspector.getBeanInfo(bean.getClass()); + } + catch (IntrospectionException e) { + throw new BeanInitializationException("Failed to introspect: " + bean + ". Reason: " + e, e); + } + return beanInfo; + } + + protected void invokeMethod(Object bean, Method method, Object[] arguments) { + try { + method.invoke(bean, arguments); + } + catch (Exception e) { + throw new BeanInitializationException("Failed to invoke: " + method + ". Reason: " + e, e); + } + } + + protected void setField(Object bean, Field field, Object value) { + try { + field.set(bean, value); + } + catch (Exception e) { + throw new BeanInitializationException("Failed to set field: " + field + " to value: " + value + ". Reason: " + e, e); + } + } + + protected List findMethodsWithAnnotation(Object bean, Class annotation) { + List answer = new ArrayList(); + appendMethodsWithAnnotation(bean.getClass(), answer, annotation); + return answer; + } + + protected void appendMethodsWithAnnotation(Class type, List list, Class annotation) { + Method[] methods = type.getDeclaredMethods(); + for (int i = 0; i < methods.length; i++) { + Method method = methods[i]; + if (hasAnnotation(method, annotation)) { + list.add(method); + } + } + if (!type.equals(Object.class)) { + appendMethodsWithAnnotation(type.getSuperclass(), list, annotation); + } + } + + /** + * Returns true if the given method has the annotation + */ + protected boolean hasAnnotation(Method method, Class annotation) { + return method.getAnnotation(annotation) != null; + } + + protected boolean hasAnnotation(Field field, Class annotation) { + return field.getAnnotation(annotation) != null; + } + + protected void invokeVoidMethods(Object bean, List methods) throws BeansException { + for (Iterator iter = methods.iterator(); iter.hasNext();) { + Method method = (Method) iter.next(); + Class[] parameterTypes = method.getParameterTypes(); + if (parameterTypes.length == 0) { + try { + method.invoke(bean, EMPTY_ARGUMENTS); + } + catch (IllegalArgumentException e) { + throw new BeanInitializationException("Should never happen when calling no-parameter method. " + e, e); + } + catch (IllegalAccessException e) { + throw new BeanInitializationException(e.getMessage(), e); + } + catch (InvocationTargetException e) { + throw new BeanInitializationException(e.getMessage(), e); + } + } + } + } + +} diff --git a/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java b/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java new file mode 100644 index 00000000..aa203828 --- /dev/null +++ b/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java @@ -0,0 +1,192 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.ModuleContext; +import org.osoa.sca.annotations.ComponentMetaData; +import org.osoa.sca.annotations.ComponentName; +import org.osoa.sca.annotations.Context; +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.Init; +import org.osoa.sca.annotations.Property; +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.SessionID; +import org.osoa.sca.model.Component; +import org.springframework.beans.BeansException; +import org.springframework.beans.MutablePropertyValues; +import org.springframework.beans.factory.BeanInitializationException; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor; + +import java.beans.BeanInfo; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.List; + +/** + * Performs SCA based dependency injection rules. + * + * @version $Revision$ + */ +public class ScaBeanPostProcessor extends IntrospectionSupport implements DestructionAwareBeanPostProcessor, BeanFactoryPostProcessor { + + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + return bean; + } + + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + List methods = findMethodsWithAnnotation(bean, Init.class); + invokeVoidMethods(bean, methods); + processFields(bean, beanName); + processProperties(bean, beanName); + return bean; + } + + public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { + List methods = findMethodsWithAnnotation(bean, Destroy.class); + invokeVoidMethods(bean, methods); + } + + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { + String[] beanNames = beanFactory.getBeanDefinitionNames(); + for (int i = 0; i < beanNames.length; i++) { + String beanName = beanNames[i]; + BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName); + postProcessBeanDefinition(beanFactory, beanName, beanDefinition); + } + } + + // Implementation methods + // ------------------------------------------------------------------------- + protected void postProcessBeanDefinition(ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition definition) throws BeansException { + BeanInfo beanInfo = getBeanInfo(beanFactory.getType(beanName)); + PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); + for (int i = 0; i < descriptors.length; i++) { + PropertyDescriptor descriptor = descriptors[i]; + processProperty(beanName, definition, descriptor); + } + } + + protected void processProperty(String beanName, BeanDefinition definition, PropertyDescriptor descriptor) throws BeansException { + Method method = descriptor.getWriteMethod(); + if (method != null) { + // TODO should we handle the property.name() attribute? + // maybe add this to XBean code generator... + + Property property = method.getAnnotation(Property.class); + if (property.required()) { + // TODO use property.name()? + String propertyName = descriptor.getName(); + MutablePropertyValues propertyValues = definition.getPropertyValues(); + if (!propertyValues.contains(propertyName)) { + throw new BeanInitializationException("Mandatory property: " + propertyName + " not specified"); + } + } + + Reference reference = method.getAnnotation(Reference.class); + if (reference.required()) { + // TODO use reference.name()? + String propertyName = descriptor.getName(); + MutablePropertyValues propertyValues = definition.getPropertyValues(); + if (!propertyValues.contains(propertyName)) { + throw new BeanInitializationException("Mandatory reference: " + propertyName + " not specified"); + } + } + } + } + + protected void processProperties(Object bean, String beanName) throws BeansException { + BeanInfo beanInfo = getBeanInfo(bean); + PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); + for (int i = 0; i < descriptors.length; i++) { + PropertyDescriptor descriptor = descriptors[i]; + processProperty(bean, beanName, descriptor); + } + } + + protected void processProperty(Object bean, String beanName, PropertyDescriptor descriptor) throws BeansException { + Method method = descriptor.getWriteMethod(); + if (method != null) { + if (hasAnnotation(method, ComponentName.class)) { + Object[] arguments = new Object[] { beanName }; + invokeMethod(bean, method, arguments); + } + if (hasAnnotation(method, ComponentMetaData.class)) { + Object[] arguments = new Object[] { getComponentMetaData(bean, beanName) }; + invokeMethod(bean, method, arguments); + } + if (hasAnnotation(method, Context.class)) { + Object[] arguments = new Object[] { getComponentContext(bean, beanName) }; + invokeMethod(bean, method, arguments); + } + if (hasAnnotation(method, SessionID.class)) { + Object[] arguments = new Object[] { getBeanSessionID(bean, beanName) }; + invokeMethod(bean, method, arguments); + } + } + } + + protected void processFields(Object bean, String beanName) throws BeansException { + Class type = bean.getClass(); + while (true) { + Field[] declaredFields = type.getDeclaredFields(); + for (int i = 0; i < declaredFields.length; i++) { + Field field = declaredFields[i]; + processField(bean, beanName, field); + } + if (type.equals(Object.class)) { + break; + } + else { + type = type.getSuperclass(); + } + } + } + + protected void processField(Object bean, String beanName, Field field) { + if (hasAnnotation(field, ComponentName.class)) { + setField(bean, field, beanName); + } + if (hasAnnotation(field, ComponentMetaData.class)) { + setField(bean, field, getComponentMetaData(bean, beanName)); + } + if (hasAnnotation(field, Context.class)) { + setField(bean, field, getComponentContext(bean, beanName)); + } + if (hasAnnotation(field, SessionID.class)) { + setField(bean, field, getBeanSessionID(bean, beanName)); + } + + } + + protected Component getComponentMetaData(Object bean, String beanName) { + throw new RuntimeException("TODO: Not Implemented yet"); + } + + protected ModuleContext getComponentContext(Object bean, String beanName) { + throw new RuntimeException("TODO: Not Implemented yet"); + } + + protected Object getBeanSessionID(Object bean, String beanName) throws BeansException { + throw new RuntimeException("TODO: Not Implemented yet"); + } + +} diff --git a/sca/src/test/java/org/xbean/sca/LifecyclePojo.java b/sca/src/test/java/org/xbean/sca/LifecyclePojo.java new file mode 100644 index 00000000..a34e5899 --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/LifecyclePojo.java @@ -0,0 +1,38 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.annotations.Destroy; +import org.osoa.sca.annotations.Init; + +/** + * + * @version $Revision$ + */ +public class LifecyclePojo { + + @Init + public void start() throws Exception { + ScaLifecycleTest.onInitCalled(); + } + + @Destroy + public void stop() throws Exception { + ScaLifecycleTest.onDestroyCalled(); + } +} diff --git a/sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java b/sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java new file mode 100644 index 00000000..cc2dbf0f --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java @@ -0,0 +1,62 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @version $Revision$ + */ +public class ScaLifecycleTest extends SpringTestSupport { + + private static int initCounter; + private static int destroyCounter; + + public void testLifecycle() throws Exception { + getBean("lifecycle"); + + assertTrue("Should have invoked the initCounter: " + initCounter, initCounter > 0); + } + + protected AbstractApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/sca/lifecycle.xml"); + } + + protected void setUp() throws Exception { + initCounter = destroyCounter = 0; + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + + assertTrue("Should have invoked the destroyCounter: " + destroyCounter, destroyCounter > 0); + } + + public static void onInitCalled() { + System.out.println("@Init called"); + ++initCounter; + } + + public static void onDestroyCalled() { + System.out.println("@Destroy called"); + ++destroyCounter; + } +} diff --git a/sca/src/test/java/org/xbean/sca/SpringTestSupport.java b/sca/src/test/java/org/xbean/sca/SpringTestSupport.java new file mode 100644 index 00000000..c578294d --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/SpringTestSupport.java @@ -0,0 +1,53 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.context.support.AbstractApplicationContext; + +import junit.framework.TestCase; + +/** + * + * @version $Revision$ + */ +public abstract class SpringTestSupport extends TestCase { + + protected AbstractApplicationContext context; + + protected void setUp() throws Exception { + super.setUp(); + context = createApplicationContext(); + } + + protected abstract AbstractApplicationContext createApplicationContext(); + + protected void tearDown() throws Exception { + if (context != null) { + context.destroy(); + context = null; + } + super.tearDown(); + } + + protected Object getBean(String beanName) throws Exception { + assertTrue("ApplicationContext should contain bean: " + beanName, context.containsBean(beanName)); + Object answer = context.getBean(beanName); + return answer; + } + +} diff --git a/sca/src/test/resources/log4j.properties b/sca/src/test/resources/log4j.properties new file mode 100755 index 00000000..47e7ad32 --- /dev/null +++ b/sca/src/test/resources/log4j.properties @@ -0,0 +1,18 @@ +# +# The logging properties used during tests.. +# +log4j.rootLogger=INFO, out + +log4j.logger.org.activemq.spring=WARN + +# CONSOLE appender not used by default +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.out=org.apache.log4j.FileAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.out.file=target/test-run.log +log4j.appender.out.append=true diff --git a/sca/src/test/resources/org/xbean/sca/lifecycle.xml b/sca/src/test/resources/org/xbean/sca/lifecycle.xml new file mode 100644 index 00000000..caf5e24a --- /dev/null +++ b/sca/src/test/resources/org/xbean/sca/lifecycle.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From b56a8967e832c5560157f31db7457c8fc732ca8d Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 12 Dec 2005 13:40:50 +0000 Subject: [PATCH 079/736] added test cases for dependency injection tests git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380500 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/sca/IntrospectionSupport.java | 3 ++ .../org/xbean/sca/FieldInjectionPojo.java | 49 +++++++++++++++++++ .../org/xbean/sca/FieldInjectionTest.java | 39 +++++++++++++++ .../java/org/xbean/sca/LifecyclePojo.java | 4 +- ...aLifecycleTest.java => LifecycleTest.java} | 2 +- .../org/xbean/sca/PropertyInjectionPojo.java | 48 ++++++++++++++++++ .../org/xbean/sca/PropertyInjectionTest.java | 39 +++++++++++++++ .../org/xbean/sca/field-injection.xml | 13 +++++ .../org/xbean/sca/property-injection.xml | 13 +++++ 9 files changed, 207 insertions(+), 3 deletions(-) create mode 100644 sca/src/test/java/org/xbean/sca/FieldInjectionPojo.java create mode 100644 sca/src/test/java/org/xbean/sca/FieldInjectionTest.java rename sca/src/test/java/org/xbean/sca/{ScaLifecycleTest.java => LifecycleTest.java} (96%) create mode 100644 sca/src/test/java/org/xbean/sca/PropertyInjectionPojo.java create mode 100644 sca/src/test/java/org/xbean/sca/PropertyInjectionTest.java create mode 100644 sca/src/test/resources/org/xbean/sca/field-injection.xml create mode 100644 sca/src/test/resources/org/xbean/sca/property-injection.xml diff --git a/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java b/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java index d6e732df..d2aa3c6a 100644 --- a/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java +++ b/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java @@ -61,6 +61,9 @@ protected void invokeMethod(Object bean, Method method, Object[] arguments) { protected void setField(Object bean, Field field, Object value) { try { + if (! field.isAccessible()) { + field.setAccessible(true); + } field.set(bean, value); } catch (Exception e) { diff --git a/sca/src/test/java/org/xbean/sca/FieldInjectionPojo.java b/sca/src/test/java/org/xbean/sca/FieldInjectionPojo.java new file mode 100644 index 00000000..5b091e9d --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/FieldInjectionPojo.java @@ -0,0 +1,49 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.annotations.ComponentName; + +/** + * + * @version $Revision$ + */ +public class FieldInjectionPojo { + + @ComponentName + private String componenetName; + + private String sessionID; + + public String getComponenetName() { + return componenetName; + } + + public void setComponenetName(String componenetName) { + this.componenetName = componenetName; + } + + public String getSessionID() { + return sessionID; + } + + public void setSessionID(String sessionID) { + this.sessionID = sessionID; + } + +} diff --git a/sca/src/test/java/org/xbean/sca/FieldInjectionTest.java b/sca/src/test/java/org/xbean/sca/FieldInjectionTest.java new file mode 100644 index 00000000..ea5afa26 --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/FieldInjectionTest.java @@ -0,0 +1,39 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @version $Revision$ + */ +public class FieldInjectionTest extends SpringTestSupport { + + + public void testComponentName() throws Exception { + FieldInjectionPojo pojo = (FieldInjectionPojo) getBean("injection"); + assertEquals("componentName", "injection", pojo.getComponenetName()); + } + + protected AbstractApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/sca/field-injection.xml"); + } + +} diff --git a/sca/src/test/java/org/xbean/sca/LifecyclePojo.java b/sca/src/test/java/org/xbean/sca/LifecyclePojo.java index a34e5899..dc105e37 100644 --- a/sca/src/test/java/org/xbean/sca/LifecyclePojo.java +++ b/sca/src/test/java/org/xbean/sca/LifecyclePojo.java @@ -28,11 +28,11 @@ public class LifecyclePojo { @Init public void start() throws Exception { - ScaLifecycleTest.onInitCalled(); + LifecycleTest.onInitCalled(); } @Destroy public void stop() throws Exception { - ScaLifecycleTest.onDestroyCalled(); + LifecycleTest.onDestroyCalled(); } } diff --git a/sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java b/sca/src/test/java/org/xbean/sca/LifecycleTest.java similarity index 96% rename from sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java rename to sca/src/test/java/org/xbean/sca/LifecycleTest.java index cc2dbf0f..2890a452 100644 --- a/sca/src/test/java/org/xbean/sca/ScaLifecycleTest.java +++ b/sca/src/test/java/org/xbean/sca/LifecycleTest.java @@ -24,7 +24,7 @@ * * @version $Revision$ */ -public class ScaLifecycleTest extends SpringTestSupport { +public class LifecycleTest extends SpringTestSupport { private static int initCounter; private static int destroyCounter; diff --git a/sca/src/test/java/org/xbean/sca/PropertyInjectionPojo.java b/sca/src/test/java/org/xbean/sca/PropertyInjectionPojo.java new file mode 100644 index 00000000..ef7a7b91 --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/PropertyInjectionPojo.java @@ -0,0 +1,48 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.annotations.ComponentName; + +/** + * + * @version $Revision$ + */ +public class PropertyInjectionPojo { + + private String sessionID; + private String componenetName; + + public String getComponenetName() { + return componenetName; + } + + @ComponentName + public void setComponenetName(String componenetName) { + this.componenetName = componenetName; + } + + public String getSessionID() { + return sessionID; + } + + public void setSessionID(String sessionID) { + this.sessionID = sessionID; + } + +} diff --git a/sca/src/test/java/org/xbean/sca/PropertyInjectionTest.java b/sca/src/test/java/org/xbean/sca/PropertyInjectionTest.java new file mode 100644 index 00000000..655fa214 --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/PropertyInjectionTest.java @@ -0,0 +1,39 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @version $Revision$ + */ +public class PropertyInjectionTest extends SpringTestSupport { + + + public void testComponentName() throws Exception { + PropertyInjectionPojo pojo = (PropertyInjectionPojo) getBean("injection"); + assertEquals("componentName", "injection", pojo.getComponenetName()); + } + + protected AbstractApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/sca/property-injection.xml"); + } + +} diff --git a/sca/src/test/resources/org/xbean/sca/field-injection.xml b/sca/src/test/resources/org/xbean/sca/field-injection.xml new file mode 100644 index 00000000..12541cd0 --- /dev/null +++ b/sca/src/test/resources/org/xbean/sca/field-injection.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/sca/src/test/resources/org/xbean/sca/property-injection.xml b/sca/src/test/resources/org/xbean/sca/property-injection.xml new file mode 100644 index 00000000..0beab175 --- /dev/null +++ b/sca/src/test/resources/org/xbean/sca/property-injection.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From a5e7fc77dfb7d48ee05f8d50f34d961859a0d899 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 12 Dec 2005 14:08:59 +0000 Subject: [PATCH 080/736] more SCA test cases for mandatory properties and references git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380501 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/xbean/sca/IntrospectionSupport.java | 6 +-- .../org/xbean/sca/ScaBeanPostProcessor.java | 33 +++++++------ .../org/xbean/sca/MandatoryPropertyPojo.java | 49 +++++++++++++++++++ .../org/xbean/sca/MandatoryReferencePojo.java | 49 +++++++++++++++++++ .../org/xbean/sca/MissingPropertyTest.java | 46 +++++++++++++++++ .../org/xbean/sca/MissingReferenceTest.java | 46 +++++++++++++++++ .../test/java/org/xbean/sca/PropertyTest.java | 39 +++++++++++++++ .../org/xbean/sca/missing-property.xml | 13 +++++ .../org/xbean/sca/missing-reference.xml | 13 +++++ .../test/resources/org/xbean/sca/property.xml | 16 ++++++ 10 files changed, 293 insertions(+), 17 deletions(-) create mode 100644 sca/src/test/java/org/xbean/sca/MandatoryPropertyPojo.java create mode 100644 sca/src/test/java/org/xbean/sca/MandatoryReferencePojo.java create mode 100644 sca/src/test/java/org/xbean/sca/MissingPropertyTest.java create mode 100644 sca/src/test/java/org/xbean/sca/MissingReferenceTest.java create mode 100644 sca/src/test/java/org/xbean/sca/PropertyTest.java create mode 100644 sca/src/test/resources/org/xbean/sca/missing-property.xml create mode 100644 sca/src/test/resources/org/xbean/sca/missing-reference.xml create mode 100644 sca/src/test/resources/org/xbean/sca/property.xml diff --git a/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java b/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java index d2aa3c6a..e57603c1 100644 --- a/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java +++ b/sca/src/main/java/org/xbean/sca/IntrospectionSupport.java @@ -39,13 +39,13 @@ public abstract class IntrospectionSupport { protected static final Object[] EMPTY_ARGUMENTS = {}; - protected BeanInfo getBeanInfo(Object bean) { + protected BeanInfo getBeanInfo(Class type) { BeanInfo beanInfo; try { - beanInfo = Introspector.getBeanInfo(bean.getClass()); + beanInfo = Introspector.getBeanInfo(type); } catch (IntrospectionException e) { - throw new BeanInitializationException("Failed to introspect: " + bean + ". Reason: " + e, e); + throw new BeanInitializationException("Failed to introspect: " + type.getName() + ". Reason: " + e, e); } return beanInfo; } diff --git a/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java b/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java index aa203828..33e61e6f 100644 --- a/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java +++ b/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java @@ -77,7 +77,8 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) // Implementation methods // ------------------------------------------------------------------------- protected void postProcessBeanDefinition(ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition definition) throws BeansException { - BeanInfo beanInfo = getBeanInfo(beanFactory.getType(beanName)); + Class type = beanFactory.getType(beanName); + BeanInfo beanInfo = getBeanInfo(type); PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); for (int i = 0; i < descriptors.length; i++) { PropertyDescriptor descriptor = descriptors[i]; @@ -92,29 +93,33 @@ protected void processProperty(String beanName, BeanDefinition definition, Prope // maybe add this to XBean code generator... Property property = method.getAnnotation(Property.class); - if (property.required()) { - // TODO use property.name()? - String propertyName = descriptor.getName(); - MutablePropertyValues propertyValues = definition.getPropertyValues(); - if (!propertyValues.contains(propertyName)) { - throw new BeanInitializationException("Mandatory property: " + propertyName + " not specified"); + if (property != null) { + if (property.required()) { + // TODO use property.name()? + String propertyName = descriptor.getName(); + MutablePropertyValues propertyValues = definition.getPropertyValues(); + if (!propertyValues.contains(propertyName)) { + throw new BeanInitializationException("Mandatory property: " + propertyName + " not specified on bean: " + beanName); + } } } Reference reference = method.getAnnotation(Reference.class); - if (reference.required()) { - // TODO use reference.name()? - String propertyName = descriptor.getName(); - MutablePropertyValues propertyValues = definition.getPropertyValues(); - if (!propertyValues.contains(propertyName)) { - throw new BeanInitializationException("Mandatory reference: " + propertyName + " not specified"); + if (reference != null) { + if (reference.required()) { + // TODO use reference.name()? + String propertyName = descriptor.getName(); + MutablePropertyValues propertyValues = definition.getPropertyValues(); + if (!propertyValues.contains(propertyName)) { + throw new BeanInitializationException("Mandatory reference: " + propertyName + " not specified on bean: " + beanName); + } } } } } protected void processProperties(Object bean, String beanName) throws BeansException { - BeanInfo beanInfo = getBeanInfo(bean); + BeanInfo beanInfo = getBeanInfo(bean.getClass()); PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors(); for (int i = 0; i < descriptors.length; i++) { PropertyDescriptor descriptor = descriptors[i]; diff --git a/sca/src/test/java/org/xbean/sca/MandatoryPropertyPojo.java b/sca/src/test/java/org/xbean/sca/MandatoryPropertyPojo.java new file mode 100644 index 00000000..1a70b2de --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/MandatoryPropertyPojo.java @@ -0,0 +1,49 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.annotations.Property; + +/** + * + * @version $Revision$ + */ +public class MandatoryPropertyPojo { + + private String cheese; + private boolean beer; + + public String getCheese() { + return cheese; + } + + @Property(required = true) + public void setCheese(String cheese) { + this.cheese = cheese; + } + + public boolean isBeer() { + return beer; + } + + @Property(required = false) + public void setBeer(boolean beer) { + this.beer = beer; + } + +} diff --git a/sca/src/test/java/org/xbean/sca/MandatoryReferencePojo.java b/sca/src/test/java/org/xbean/sca/MandatoryReferencePojo.java new file mode 100644 index 00000000..2c30d06f --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/MandatoryReferencePojo.java @@ -0,0 +1,49 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.annotations.Reference; + +/** + * + * @version $Revision$ + */ +public class MandatoryReferencePojo { + + private String cheese; + private boolean beer; + + public String getCheese() { + return cheese; + } + + @Reference(required = true) + public void setCheese(String cheese) { + this.cheese = cheese; + } + + public boolean isBeer() { + return beer; + } + + @Reference(required = false) + public void setBeer(boolean beer) { + this.beer = beer; + } + +} diff --git a/sca/src/test/java/org/xbean/sca/MissingPropertyTest.java b/sca/src/test/java/org/xbean/sca/MissingPropertyTest.java new file mode 100644 index 00000000..a82c1694 --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/MissingPropertyTest.java @@ -0,0 +1,46 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.beans.factory.BeanInitializationException; +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @version $Revision$ + */ +public class MissingPropertyTest extends SpringTestSupport { + + public void testMissingProperty() throws Exception { + assertTrue("Should not have created a valid context", context == null); + } + + protected AbstractApplicationContext createApplicationContext() { + try { + ClassPathXmlApplicationContext answer = new ClassPathXmlApplicationContext("org/xbean/sca/missing-property.xml"); + fail("Should have failed to process the context"); + return answer; + } + catch (BeanInitializationException e) { + System.out.println("Caught expected validation exception: " + e); + return null; + } + } + +} diff --git a/sca/src/test/java/org/xbean/sca/MissingReferenceTest.java b/sca/src/test/java/org/xbean/sca/MissingReferenceTest.java new file mode 100644 index 00000000..9419881a --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/MissingReferenceTest.java @@ -0,0 +1,46 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.beans.factory.BeanInitializationException; +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @version $Revision$ + */ +public class MissingReferenceTest extends SpringTestSupport { + + public void testMissingResource() throws Exception { + assertTrue("Should not have created a valid context", context == null); + } + + protected AbstractApplicationContext createApplicationContext() { + try { + ClassPathXmlApplicationContext answer = new ClassPathXmlApplicationContext("org/xbean/sca/missing-reference.xml"); + fail("Should have failed to process the context"); + return answer; + } + catch (BeanInitializationException e) { + System.out.println("Caught expected validation exception: " + e); + return null; + } + } + +} diff --git a/sca/src/test/java/org/xbean/sca/PropertyTest.java b/sca/src/test/java/org/xbean/sca/PropertyTest.java new file mode 100644 index 00000000..1ceb7e2c --- /dev/null +++ b/sca/src/test/java/org/xbean/sca/PropertyTest.java @@ -0,0 +1,39 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @version $Revision$ + */ +public class PropertyTest extends SpringTestSupport { + + public void testProperties() throws Exception { + MandatoryPropertyPojo pojo = (MandatoryPropertyPojo) getBean("pojo"); + assertEquals("getCheese()", "Edam", pojo.getCheese()); + assertEquals("isBeer()",true, pojo.isBeer()); + } + + protected AbstractApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/sca/property.xml"); + } + +} diff --git a/sca/src/test/resources/org/xbean/sca/missing-property.xml b/sca/src/test/resources/org/xbean/sca/missing-property.xml new file mode 100644 index 00000000..a35ecc6f --- /dev/null +++ b/sca/src/test/resources/org/xbean/sca/missing-property.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/sca/src/test/resources/org/xbean/sca/missing-reference.xml b/sca/src/test/resources/org/xbean/sca/missing-reference.xml new file mode 100644 index 00000000..9817c967 --- /dev/null +++ b/sca/src/test/resources/org/xbean/sca/missing-reference.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/sca/src/test/resources/org/xbean/sca/property.xml b/sca/src/test/resources/org/xbean/sca/property.xml new file mode 100644 index 00000000..2a34e9d1 --- /dev/null +++ b/sca/src/test/resources/org/xbean/sca/property.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + From b65eeaff2a56ce177f65e0b40c92dd58dca941aa Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 12 Dec 2005 15:13:17 +0000 Subject: [PATCH 081/736] added a plugin to the actual SCA runtime being used git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380502 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/xbean/sca/ScaAdapter.java | 36 ++++++++ .../org/xbean/sca/ScaBeanPostProcessor.java | 50 +++++++---- .../org/xbean/sca/impl/DefaultComponent.java | 87 +++++++++++++++++++ .../org/xbean/sca/impl/DefaultScaAdapter.java | 62 +++++++++++++ 4 files changed, 217 insertions(+), 18 deletions(-) create mode 100644 sca/src/main/java/org/xbean/sca/ScaAdapter.java create mode 100644 sca/src/main/java/org/xbean/sca/impl/DefaultComponent.java create mode 100644 sca/src/main/java/org/xbean/sca/impl/DefaultScaAdapter.java diff --git a/sca/src/main/java/org/xbean/sca/ScaAdapter.java b/sca/src/main/java/org/xbean/sca/ScaAdapter.java new file mode 100644 index 00000000..035492d7 --- /dev/null +++ b/sca/src/main/java/org/xbean/sca/ScaAdapter.java @@ -0,0 +1,36 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca; + +import org.osoa.sca.ModuleContext; +import org.osoa.sca.model.Component; + +/** + * A pluggable strategy for connecting XBean to some SCA runtime + * + * @version $Revision$ + */ +public interface ScaAdapter { + + ModuleContext getComponentContext(Object bean, String beanName); + + Component getComponentMetaData(Object bean, String beanName); + + Object getBeanSessionID(Object bean, String beanName); + +} diff --git a/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java b/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java index 33e61e6f..a423813f 100644 --- a/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java +++ b/sca/src/main/java/org/xbean/sca/ScaBeanPostProcessor.java @@ -17,7 +17,6 @@ **/ package org.xbean.sca; -import org.osoa.sca.ModuleContext; import org.osoa.sca.annotations.ComponentMetaData; import org.osoa.sca.annotations.ComponentName; import org.osoa.sca.annotations.Context; @@ -26,7 +25,6 @@ import org.osoa.sca.annotations.Property; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.SessionID; -import org.osoa.sca.model.Component; import org.springframework.beans.BeansException; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.BeanInitializationException; @@ -34,6 +32,7 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor; +import org.xbean.sca.impl.DefaultScaAdapter; import java.beans.BeanInfo; import java.beans.PropertyDescriptor; @@ -48,6 +47,15 @@ */ public class ScaBeanPostProcessor extends IntrospectionSupport implements DestructionAwareBeanPostProcessor, BeanFactoryPostProcessor { + private ScaAdapter scaAdapter; + + public ScaBeanPostProcessor() { + } + + public ScaBeanPostProcessor(ScaAdapter scaAdapter) { + this.scaAdapter = scaAdapter; + } + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } @@ -74,6 +82,20 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) } } + // Properties + // ------------------------------------------------------------------------- + + public ScaAdapter getScaAdapter() { + if (scaAdapter == null) { + scaAdapter = createScaAdapter(); + } + return scaAdapter; + } + + public void setScaAdapter(ScaAdapter scaAdapter) { + this.scaAdapter = scaAdapter; + } + // Implementation methods // ------------------------------------------------------------------------- protected void postProcessBeanDefinition(ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition definition) throws BeansException { @@ -135,15 +157,15 @@ protected void processProperty(Object bean, String beanName, PropertyDescriptor invokeMethod(bean, method, arguments); } if (hasAnnotation(method, ComponentMetaData.class)) { - Object[] arguments = new Object[] { getComponentMetaData(bean, beanName) }; + Object[] arguments = new Object[] { getScaAdapter().getComponentMetaData(bean, beanName) }; invokeMethod(bean, method, arguments); } if (hasAnnotation(method, Context.class)) { - Object[] arguments = new Object[] { getComponentContext(bean, beanName) }; + Object[] arguments = new Object[] { getScaAdapter().getComponentContext(bean, beanName) }; invokeMethod(bean, method, arguments); } if (hasAnnotation(method, SessionID.class)) { - Object[] arguments = new Object[] { getBeanSessionID(bean, beanName) }; + Object[] arguments = new Object[] { getScaAdapter().getBeanSessionID(bean, beanName) }; invokeMethod(bean, method, arguments); } } @@ -171,27 +193,19 @@ protected void processField(Object bean, String beanName, Field field) { setField(bean, field, beanName); } if (hasAnnotation(field, ComponentMetaData.class)) { - setField(bean, field, getComponentMetaData(bean, beanName)); + setField(bean, field, getScaAdapter().getComponentMetaData(bean, beanName)); } if (hasAnnotation(field, Context.class)) { - setField(bean, field, getComponentContext(bean, beanName)); + setField(bean, field, getScaAdapter().getComponentContext(bean, beanName)); } if (hasAnnotation(field, SessionID.class)) { - setField(bean, field, getBeanSessionID(bean, beanName)); + setField(bean, field, getScaAdapter().getBeanSessionID(bean, beanName)); } } - protected Component getComponentMetaData(Object bean, String beanName) { - throw new RuntimeException("TODO: Not Implemented yet"); - } - - protected ModuleContext getComponentContext(Object bean, String beanName) { - throw new RuntimeException("TODO: Not Implemented yet"); - } - - protected Object getBeanSessionID(Object bean, String beanName) throws BeansException { - throw new RuntimeException("TODO: Not Implemented yet"); + protected ScaAdapter createScaAdapter() { + return new DefaultScaAdapter(); } } diff --git a/sca/src/main/java/org/xbean/sca/impl/DefaultComponent.java b/sca/src/main/java/org/xbean/sca/impl/DefaultComponent.java new file mode 100644 index 00000000..55326281 --- /dev/null +++ b/sca/src/main/java/org/xbean/sca/impl/DefaultComponent.java @@ -0,0 +1,87 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca.impl; + +import org.osoa.sca.model.*; + +/** + * + * @version $Revision$ + */ +public abstract class DefaultComponent implements Component { + + private String name; + private Implementation implementation; + private PropertyValues propertyValues; + private ReferenceValues referenceValues; +/* + private Sequence any; + private Sequence anyAttribute; +*/ + + public Implementation getImplementation() { + return implementation; + } + + public void setImplementation(Implementation implementation) { + this.implementation = implementation; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public PropertyValues getPropertyValues() { + return propertyValues; + } + + public void setPropertyValues(PropertyValues propertyValues) { + this.propertyValues = propertyValues; + } + + public ReferenceValues getReferenceValues() { + return referenceValues; + } + + public void setReferenceValues(ReferenceValues referenceValues) { + this.referenceValues = referenceValues; + } + +/* + public Sequence getAny() { + return any; + } + + public void setAny(Sequence any) { + this.any = any; + } + + public Sequence getAnyAttribute() { + return anyAttribute; + } + + public void setAnyAttribute(Sequence anyAttribute) { + this.anyAttribute = anyAttribute; + } +*/ + +} diff --git a/sca/src/main/java/org/xbean/sca/impl/DefaultScaAdapter.java b/sca/src/main/java/org/xbean/sca/impl/DefaultScaAdapter.java new file mode 100644 index 00000000..288b5bb5 --- /dev/null +++ b/sca/src/main/java/org/xbean/sca/impl/DefaultScaAdapter.java @@ -0,0 +1,62 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.sca.impl; + +import org.osoa.sca.ModuleContext; +import org.osoa.sca.annotations.Context; +import org.osoa.sca.model.Component; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanInitializationException; +import org.xbean.sca.ScaAdapter; + +/** + * A simple implementation of {@link ScaAdapter} + * + * @version $Revision$ + */ +public class DefaultScaAdapter implements ScaAdapter { + private ModuleContext moduleContext; + + public Component getComponentMetaData(Object bean, String beanName) { + throw new RuntimeException("TODO: Not Implemented yet"); + } + + public ModuleContext getComponentContext(Object bean, String beanName) { + ModuleContext answer = getModuleContext(); + if (answer == null) { + throw new BeanInitializationException("No moduleContext property is configured so cannot inject its value into bean: " + beanName); + } + return answer; + + } + + public Object getBeanSessionID(Object bean, String beanName) throws BeansException { + throw new RuntimeException("TODO: Not Implemented yet"); + } + + // Properties + // ------------------------------------------------------------------------- + public ModuleContext getModuleContext() { + return moduleContext; + } + + @Context + public void setModuleContext(ModuleContext moduleContext) { + this.moduleContext = moduleContext; + } +} From c727d83a06b6ed33f6f8dcc3894617a695f75dcb Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Tue, 13 Dec 2005 21:16:28 +0000 Subject: [PATCH 082/736] Fixed problem w/ spaces in M2 repo path. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380503 13f79535-47bb-0310-9956-ffa450edef68 --- osgi/src/test/java/org/xbean/osgi/OSGiTest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java index 3ea72dde..dcb4e2eb 100644 --- a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java +++ b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java @@ -26,6 +26,8 @@ import java.io.File; import java.util.Collections; +import java.net.URLDecoder; + /** * @author Dain Sundstrom @@ -40,12 +42,14 @@ public class OSGiTest extends TestCase { protected void setUp() throws Exception { super.setUp(); + System.setProperty("osgi.clean", "true"); File osgiDir = new File(basedir, "target/osgi"); osgiDir.mkdirs(); System.setProperty("osgi.configuration.area", osgiDir.getAbsolutePath()); System.setProperty("osgi.install.area", osgiDir.getAbsolutePath()); + System.setProperty("osgi.framework", URLDecoder.decode(EclipseAdaptor.class.getProtectionDomain().getCodeSource().getLocation().toExternalForm(), "UTF-8")); LocationManager.initializeLocations(); FrameworkAdaptor adaptor = new EclipseAdaptor(null); @@ -79,10 +83,10 @@ public void testAddBundel() throws Exception { assertSame(bundle, mavenBundleManager.installBundle(project)); project = new Project("org.xbean", - "xbean-spring", - "2.1-SNAPSHOT", - "jar", - Collections.singleton(new Dependency("springframework", "spring", "1.2.4", "jar"))); + "xbean-spring", + "2.1-SNAPSHOT", + "jar", + Collections.singleton(new Dependency("springframework", "spring", "1.2.4", "jar"))); bundle = mavenBundleManager.installBundle(project); bundleClassLoader = new BundleClassLoader(bundle); From 60217ff99df166e8cef24ebc0fd9afee8a24f167 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 14 Dec 2005 23:25:11 +0000 Subject: [PATCH 083/736] o fixing the classpath in the ant run plugin so that the goop will generate git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380504 13f79535-47bb-0310-9956-ffa450edef68 --- spring/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring/pom.xml b/spring/pom.xml index 5b8d9485..133f84da 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -32,7 +32,7 @@ - + @@ -76,4 +76,4 @@ qdox - \ No newline at end of file + From 0b40ef7111332830624807d5705d61d820a59806 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Thu, 15 Dec 2005 18:15:32 +0000 Subject: [PATCH 084/736] Fixed build problems... classpath in ant plugin should use maven.runtime.classpath git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380505 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 4 ++-- server/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jmx/pom.xml b/jmx/pom.xml index 0330c871..5133ba3a 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -34,7 +34,7 @@ - + 2.1-SNAPSHOT - \ No newline at end of file + diff --git a/server/pom.xml b/server/pom.xml index ef4a4063..cf0a731e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -31,7 +31,7 @@ - + @@ -66,4 +66,4 @@ 2.1-SNAPSHOT - \ No newline at end of file + From 909973705847dbe85f5ffffebaf64385d8c25248 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Sat, 31 Dec 2005 00:05:27 +0000 Subject: [PATCH 085/736] Update poms to avoid relocation warnings on springframework. Update osgi test accordingly. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380507 13f79535-47bb-0310-9956-ffa450edef68 --- osgi/src/test/java/org/xbean/osgi/OSGiTest.java | 4 ++-- pom.xml | 2 +- sca/pom.xml | 4 ++-- spring/pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java index dcb4e2eb..ef90b6e0 100644 --- a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java +++ b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java @@ -70,7 +70,7 @@ public void testAddBundel() throws Exception { BundleClassLoader bundleClassLoader; Class clazz = null; - project = mavenBundleManager.loadProject("springframework", "spring", "1.2.4"); + project = mavenBundleManager.loadProject("org.springframework", "spring", "1.2.4"); bundle = mavenBundleManager.installBundle(project); bundleClassLoader = new BundleClassLoader(bundle); @@ -86,7 +86,7 @@ public void testAddBundel() throws Exception { "xbean-spring", "2.1-SNAPSHOT", "jar", - Collections.singleton(new Dependency("springframework", "spring", "1.2.4", "jar"))); + Collections.singleton(new Dependency("org.springframework", "spring", "1.2.4", "jar"))); bundle = mavenBundleManager.installBundle(project); bundleClassLoader = new BundleClassLoader(bundle); diff --git a/pom.xml b/pom.xml index c340bf36..53faee55 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,7 @@ 1.5 - springframework + org.springframework spring 1.2.4 diff --git a/sca/pom.xml b/sca/pom.xml index f3a2f151..1835d881 100644 --- a/sca/pom.xml +++ b/sca/pom.xml @@ -30,7 +30,7 @@ - springframework + org.springframework spring @@ -50,4 +50,4 @@ backport-util-concurrent - \ No newline at end of file + diff --git a/spring/pom.xml b/spring/pom.xml index 133f84da..7e59d067 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -48,7 +48,7 @@ - springframework + org.springframework spring From 0ec52762143a3e3c800547cfd181026f087bec3d Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 15:47:12 +0000 Subject: [PATCH 086/736] disable the jmx module from build since I can't release it right now: Can't release project due to non released dependencies git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380508 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 53faee55..29863341 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,9 @@ classpath + kernel osgi server From be1c6b791ce5f40b0df9d868f1623b97fb926476 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 15:47:55 +0000 Subject: [PATCH 087/736] [maven-release-plugin] prepare release xbean-2.1 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380509 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 4 ++-- kernel/pom.xml | 4 ++-- osgi/pom.xml | 6 +++--- pom.xml | 41 +++++++---------------------------------- server/pom.xml | 10 +++++----- spring/pom.xml | 14 +++++++------- 6 files changed, 26 insertions(+), 53 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index e9fe1a28..a269e629 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -2,10 +2,10 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-classpath XBean :: ClassPath - 2.1-SNAPSHOT + 2.1 \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 7c8c3cd5..722f2b77 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-kernel XBean :: Kernel - 2.1-SNAPSHOT + 2.1 diff --git a/osgi/pom.xml b/osgi/pom.xml index 3b4f5c79..e83eba00 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -2,16 +2,16 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-osgi XBean :: OSGi - 2.1-SNAPSHOT + 2.1 org.eclipse.equinox osgi - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 29863341..8fb27d18 100644 --- a/pom.xml +++ b/pom.xml @@ -4,15 +4,13 @@ xbean pom XBean - 2.1-SNAPSHOT + 2.1 XBean is a plugin based server archtecutre. http://xbean.org - jira http://jira.codehaus.org/browse/XB - continuum @@ -23,27 +21,23 @@ - xbean developers mailto:dev-subscribe@xbean.org mailto:dev-unsubscribe@xbean.org - xbean users mailto:user-subscribe@xbean.org mailto:user-unsubscribe@xbean.org - xbean source control messages mailto:scm-subscribe@xbean.org mailto:scm-unsubscribe@xbean.org - adc @@ -74,7 +68,6 @@ -8 - The Apache Software License, Version 2.0 @@ -82,18 +75,15 @@ repo - - scm:svn:https://svn.codehaus.org/xbean/trunk/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ - https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.1/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.1/ + https://svn.codehaus.org/xbean/tags/xbean-2.1/ - XBean http://xbean.org/ - @@ -102,7 +92,6 @@ 1.0-alpha-6-SNAPSHOT - @@ -113,7 +102,6 @@ - maven-one-plugin @@ -132,31 +120,22 @@ - classpath - kernel osgi server spring - - - true - + snapshots Maven SNAPSHOT Repository http://snapshots.maven.codehaus.org/maven2 - - true - + org.livetribe LiveTribe Repository http://repo.livetribe.org/maven2-snapshot @@ -166,7 +145,6 @@ http://dist.codehaus.org/ - snapshots @@ -174,7 +152,6 @@ http://snapshots.maven.codehaus.org/maven2 - junit @@ -183,7 +160,6 @@ test - @@ -263,23 +239,20 @@ - xbean-repo XBean Central Repository scpexe://xbean.org/home/projects/xbean/dist-m2 - xbean-snapshots XBean Central Development Repository scpexe://xbean.org/home/projects/xbean/dist-m2-snapshot - xbean-website scpexe://xbean.org/home/projects/xbean/public_html/maven/ - + \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index cf0a731e..e29bc780 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-server XBean :: Server - 2.1-SNAPSHOT + 2.1 @@ -58,12 +58,12 @@ org.xbean xbean-kernel - 2.1-SNAPSHOT + 2.1 org.xbean xbean-spring - 2.1-SNAPSHOT + 2.1 - + \ No newline at end of file diff --git a/spring/pom.xml b/spring/pom.xml index 7e59d067..42b194b9 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-spring XBean :: Spring - 2.1-SNAPSHOT + 2.1 @@ -47,10 +47,6 @@ - - org.springframework - spring - mx4j mx4j @@ -59,6 +55,10 @@ commons-logging commons-logging + + org.springframework + spring + ant ant @@ -76,4 +76,4 @@ qdox - + \ No newline at end of file From 1bf06965e44b731e15e0e849bea5c49775de0374 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 15:58:11 +0000 Subject: [PATCH 088/736] test git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380510 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fb27d18..de40984a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,7 @@ 2.1 XBean is a plugin based server archtecutre. http://xbean.org + jira http://jira.codehaus.org/browse/XB @@ -255,4 +256,4 @@ scpexe://xbean.org/home/projects/xbean/public_html/maven/ - \ No newline at end of file + From e91f2e49e79895cccaac6c4736f6ef21cc4bd746 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 16:03:56 +0000 Subject: [PATCH 089/736] rollback. still getting a hang of the release proceadure. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380511 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 4 ++-- kernel/pom.xml | 4 ++-- osgi/pom.xml | 6 +++--- pom.xml | 40 +++++++++++++++++++++++++++++++++------- server/pom.xml | 10 +++++----- spring/pom.xml | 14 +++++++------- 6 files changed, 52 insertions(+), 26 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index a269e629..e9fe1a28 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -2,10 +2,10 @@ xbean org.xbean - 2.1 + 2.1-SNAPSHOT 4.0.0 xbean-classpath XBean :: ClassPath - 2.1 + 2.1-SNAPSHOT \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 722f2b77..7c8c3cd5 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.1-SNAPSHOT 4.0.0 xbean-kernel XBean :: Kernel - 2.1 + 2.1-SNAPSHOT diff --git a/osgi/pom.xml b/osgi/pom.xml index e83eba00..3b4f5c79 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -2,16 +2,16 @@ xbean org.xbean - 2.1 + 2.1-SNAPSHOT 4.0.0 xbean-osgi XBean :: OSGi - 2.1 + 2.1-SNAPSHOT org.eclipse.equinox osgi - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index de40984a..29863341 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,15 @@ xbean pom XBean - 2.1 + 2.1-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org - + jira http://jira.codehaus.org/browse/XB + continuum @@ -22,23 +23,27 @@ + xbean developers mailto:dev-subscribe@xbean.org mailto:dev-unsubscribe@xbean.org + xbean users mailto:user-subscribe@xbean.org mailto:user-unsubscribe@xbean.org + xbean source control messages mailto:scm-subscribe@xbean.org mailto:scm-unsubscribe@xbean.org + adc @@ -69,6 +74,7 @@ -8 + The Apache Software License, Version 2.0 @@ -76,15 +82,18 @@ repo + - scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.1/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.1/ - https://svn.codehaus.org/xbean/tags/xbean-2.1/ + scm:svn:https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ + https://svn.codehaus.org/xbean/trunk/ + XBean http://xbean.org/ + @@ -93,6 +102,7 @@ 1.0-alpha-6-SNAPSHOT + @@ -103,6 +113,7 @@ + maven-one-plugin @@ -121,22 +132,31 @@ + classpath + kernel osgi server spring + - + + true + snapshots Maven SNAPSHOT Repository http://snapshots.maven.codehaus.org/maven2 - + + true + org.livetribe LiveTribe Repository http://repo.livetribe.org/maven2-snapshot @@ -146,6 +166,7 @@ http://dist.codehaus.org/ + snapshots @@ -153,6 +174,7 @@ http://snapshots.maven.codehaus.org/maven2 + junit @@ -161,6 +183,7 @@ test + @@ -240,17 +263,20 @@ + xbean-repo XBean Central Repository scpexe://xbean.org/home/projects/xbean/dist-m2 + xbean-snapshots XBean Central Development Repository scpexe://xbean.org/home/projects/xbean/dist-m2-snapshot + xbean-website scpexe://xbean.org/home/projects/xbean/public_html/maven/ diff --git a/server/pom.xml b/server/pom.xml index e29bc780..cf0a731e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.1-SNAPSHOT 4.0.0 xbean-server XBean :: Server - 2.1 + 2.1-SNAPSHOT @@ -58,12 +58,12 @@ org.xbean xbean-kernel - 2.1 + 2.1-SNAPSHOT org.xbean xbean-spring - 2.1 + 2.1-SNAPSHOT - \ No newline at end of file + diff --git a/spring/pom.xml b/spring/pom.xml index 42b194b9..7e59d067 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.1-SNAPSHOT 4.0.0 xbean-spring XBean :: Spring - 2.1 + 2.1-SNAPSHOT @@ -47,6 +47,10 @@ + + org.springframework + spring + mx4j mx4j @@ -55,10 +59,6 @@ commons-logging commons-logging - - org.springframework - spring - ant ant @@ -76,4 +76,4 @@ qdox - \ No newline at end of file + From f1e2239e09795b0bccf44e33cd93bbe390c969b2 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 16:04:47 +0000 Subject: [PATCH 090/736] [maven-release-plugin] prepare release xbean-2.1 git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380512 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 4 ++-- kernel/pom.xml | 4 ++-- osgi/pom.xml | 6 +++--- pom.xml | 41 +++++++---------------------------------- server/pom.xml | 10 +++++----- spring/pom.xml | 14 +++++++------- 6 files changed, 26 insertions(+), 53 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index e9fe1a28..a269e629 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -2,10 +2,10 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-classpath XBean :: ClassPath - 2.1-SNAPSHOT + 2.1 \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 7c8c3cd5..722f2b77 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-kernel XBean :: Kernel - 2.1-SNAPSHOT + 2.1 diff --git a/osgi/pom.xml b/osgi/pom.xml index 3b4f5c79..e83eba00 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -2,16 +2,16 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-osgi XBean :: OSGi - 2.1-SNAPSHOT + 2.1 org.eclipse.equinox osgi - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 29863341..8fb27d18 100644 --- a/pom.xml +++ b/pom.xml @@ -4,15 +4,13 @@ xbean pom XBean - 2.1-SNAPSHOT + 2.1 XBean is a plugin based server archtecutre. http://xbean.org - jira http://jira.codehaus.org/browse/XB - continuum @@ -23,27 +21,23 @@ - xbean developers mailto:dev-subscribe@xbean.org mailto:dev-unsubscribe@xbean.org - xbean users mailto:user-subscribe@xbean.org mailto:user-unsubscribe@xbean.org - xbean source control messages mailto:scm-subscribe@xbean.org mailto:scm-unsubscribe@xbean.org - adc @@ -74,7 +68,6 @@ -8 - The Apache Software License, Version 2.0 @@ -82,18 +75,15 @@ repo - - scm:svn:https://svn.codehaus.org/xbean/trunk/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ - https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.1/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.1/ + https://svn.codehaus.org/xbean/tags/xbean-2.1/ - XBean http://xbean.org/ - @@ -102,7 +92,6 @@ 1.0-alpha-6-SNAPSHOT - @@ -113,7 +102,6 @@ - maven-one-plugin @@ -132,31 +120,22 @@ - classpath - kernel osgi server spring - - - true - + snapshots Maven SNAPSHOT Repository http://snapshots.maven.codehaus.org/maven2 - - true - + org.livetribe LiveTribe Repository http://repo.livetribe.org/maven2-snapshot @@ -166,7 +145,6 @@ http://dist.codehaus.org/ - snapshots @@ -174,7 +152,6 @@ http://snapshots.maven.codehaus.org/maven2 - junit @@ -183,7 +160,6 @@ test - @@ -263,23 +239,20 @@ - xbean-repo XBean Central Repository scpexe://xbean.org/home/projects/xbean/dist-m2 - xbean-snapshots XBean Central Development Repository scpexe://xbean.org/home/projects/xbean/dist-m2-snapshot - xbean-website scpexe://xbean.org/home/projects/xbean/public_html/maven/ - + \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index cf0a731e..e29bc780 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-server XBean :: Server - 2.1-SNAPSHOT + 2.1 @@ -58,12 +58,12 @@ org.xbean xbean-kernel - 2.1-SNAPSHOT + 2.1 org.xbean xbean-spring - 2.1-SNAPSHOT + 2.1 - + \ No newline at end of file diff --git a/spring/pom.xml b/spring/pom.xml index 7e59d067..42b194b9 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.1 4.0.0 xbean-spring XBean :: Spring - 2.1-SNAPSHOT + 2.1 @@ -47,10 +47,6 @@ - - org.springframework - spring - mx4j mx4j @@ -59,6 +55,10 @@ commons-logging commons-logging + + org.springframework + spring + ant ant @@ -76,4 +76,4 @@ qdox - + \ No newline at end of file From 4a70447cd025f97f2a8b315dce275abcd968d51c Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 16:05:13 +0000 Subject: [PATCH 091/736] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380514 13f79535-47bb-0310-9956-ffa450edef68 --- classpath/pom.xml | 4 ++-- kernel/pom.xml | 4 ++-- osgi/pom.xml | 4 ++-- pom.xml | 8 ++++---- server/pom.xml | 8 ++++---- spring/pom.xml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/classpath/pom.xml b/classpath/pom.xml index a269e629..c0551c3a 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -2,10 +2,10 @@ xbean org.xbean - 2.1 + 2.2-SNAPSHOT 4.0.0 xbean-classpath XBean :: ClassPath - 2.1 + 2.2-SNAPSHOT \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index 722f2b77..ce4a99cd 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.2-SNAPSHOT 4.0.0 xbean-kernel XBean :: Kernel - 2.1 + 2.2-SNAPSHOT diff --git a/osgi/pom.xml b/osgi/pom.xml index e83eba00..fc0c224a 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.2-SNAPSHOT 4.0.0 xbean-osgi XBean :: OSGi - 2.1 + 2.2-SNAPSHOT org.eclipse.equinox diff --git a/pom.xml b/pom.xml index 8fb27d18..67fc9190 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xbean pom XBean - 2.1 + 2.2-SNAPSHOT XBean is a plugin based server archtecutre. http://xbean.org @@ -76,9 +76,9 @@ - scm:svn:https://svn.codehaus.org/xbean/tags/xbean-2.1/ - scm:svn:https://${maven.username}@svn.codehaus.org/xbean/tags/xbean-2.1/ - https://svn.codehaus.org/xbean/tags/xbean-2.1/ + scm:svn:https://svn.codehaus.org/xbean/trunk/ + scm:svn:https://${maven.username}@svn.codehaus.org/xbean/trunk/ + https://svn.codehaus.org/xbean/trunk/ XBean diff --git a/server/pom.xml b/server/pom.xml index e29bc780..f89f3de9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.2-SNAPSHOT 4.0.0 xbean-server XBean :: Server - 2.1 + 2.2-SNAPSHOT @@ -58,12 +58,12 @@ org.xbean xbean-kernel - 2.1 + 2.2-SNAPSHOT org.xbean xbean-spring - 2.1 + 2.2-SNAPSHOT \ No newline at end of file diff --git a/spring/pom.xml b/spring/pom.xml index 42b194b9..3a108b7c 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1 + 2.2-SNAPSHOT 4.0.0 xbean-spring XBean :: Spring - 2.1 + 2.2-SNAPSHOT From d0cfc478f63dc77efaf897d6aa347a0be4af0f2f Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 4 Jan 2006 16:59:25 +0000 Subject: [PATCH 092/736] add jmx back as a module git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380515 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67fc9190..5004fe4c 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,7 @@ classpath + jmx kernel osgi server @@ -255,4 +256,4 @@ scpexe://xbean.org/home/projects/xbean/public_html/maven/ - \ No newline at end of file + From 4c6be63d0434ddd76d39bf3e1da298d7408411aa Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 5 Jan 2006 22:12:06 +0000 Subject: [PATCH 093/736] Move pom to 2.2-SNAPSHOT git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380516 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jmx/pom.xml b/jmx/pom.xml index 5133ba3a..13f3822b 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -2,13 +2,13 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 xbean-jmx XBean :: JMX - 2.1-SNAPSHOT + 2.2-SNAPSHOT From 24302f0d7fe17af3b0d53a87691ea09c0078b351 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Fri, 13 Jan 2006 23:52:35 +0000 Subject: [PATCH 094/736] Refactored so that the command pattern is less dependent on the terminal technology used. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380517 13f79535-47bb-0310-9956-ffa450edef68 --- telnet/pom.xml | 2 +- .../main/java/org/xbean/command/Command.java | 36 +++++++++++++++++++ .../CommandRegistry.java} | 32 +++++++++-------- .../CommandShell.java} | 29 +++++++++------ .../org/xbean/{telnet => command}/Exit.java | 10 +++--- .../xbean/{telnet => command}/GroovySh.java | 18 +++++++--- .../org/xbean/{telnet => command}/Help.java | 14 ++++---- .../org/xbean/{telnet => command}/Lookup.java | 17 +++++---- .../org/xbean/{telnet => command}/Test.java | 12 ++++--- .../xbean/{telnet => command}/Version.java | 14 ++++---- .../{ => terminal}/telnet/TelnetCodes.java | 2 +- .../{ => terminal}/telnet/TelnetDaemon.java | 2 +- .../telnet/TelnetInputStream.java | 2 +- .../{ => terminal}/telnet/TelnetOption.java | 2 +- .../telnet/TelnetPrintStream.java | 2 +- .../{ => terminal}/telnet/TelnetShell.java | 8 +++-- .../org/xbean/telnet/TelnetShellTest.java | 21 ++++++----- 17 files changed, 144 insertions(+), 79 deletions(-) create mode 100755 telnet/src/main/java/org/xbean/command/Command.java rename telnet/src/main/java/org/xbean/{telnet/Command.java => command/CommandRegistry.java} (74%) mode change 100755 => 100644 rename telnet/src/main/java/org/xbean/{telnet/TextConsole.java => command/CommandShell.java} (87%) rename telnet/src/main/java/org/xbean/{telnet => command}/Exit.java (77%) rename telnet/src/main/java/org/xbean/{telnet => command}/GroovySh.java (82%) rename telnet/src/main/java/org/xbean/{telnet => command}/Help.java (76%) rename telnet/src/main/java/org/xbean/{telnet => command}/Lookup.java (90%) rename telnet/src/main/java/org/xbean/{telnet => command}/Test.java (82%) rename telnet/src/main/java/org/xbean/{telnet => command}/Version.java (83%) rename telnet/src/main/java/org/xbean/{ => terminal}/telnet/TelnetCodes.java (99%) rename telnet/src/main/java/org/xbean/{ => terminal}/telnet/TelnetDaemon.java (98%) rename telnet/src/main/java/org/xbean/{ => terminal}/telnet/TelnetInputStream.java (99%) rename telnet/src/main/java/org/xbean/{ => terminal}/telnet/TelnetOption.java (94%) rename telnet/src/main/java/org/xbean/{ => terminal}/telnet/TelnetPrintStream.java (98%) rename telnet/src/main/java/org/xbean/{ => terminal}/telnet/TelnetShell.java (87%) diff --git a/telnet/pom.xml b/telnet/pom.xml index 9c9ea3ec..87ef2cc5 100644 --- a/telnet/pom.xml +++ b/telnet/pom.xml @@ -18,7 +18,7 @@ org.xbean xbean - 2.0-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 xbean-telnet diff --git a/telnet/src/main/java/org/xbean/command/Command.java b/telnet/src/main/java/org/xbean/command/Command.java new file mode 100755 index 00000000..ae0b6c1e --- /dev/null +++ b/telnet/src/main/java/org/xbean/command/Command.java @@ -0,0 +1,36 @@ +/** + * + * Copyright 2005 David Blevins + * + * 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. + */ +package org.xbean.command; + +import java.io.InputStream; +import java.io.PrintStream; + +public interface Command { + + /** + * HRC: if we really want to simulate a command line style environment, + * I think think entry point needs more context data: an std error print stream and + * a environment map. + * + * @param args + * @param in + * @param out + * @return + */ + public int main(String[] args, InputStream in, PrintStream out); + +} diff --git a/telnet/src/main/java/org/xbean/telnet/Command.java b/telnet/src/main/java/org/xbean/command/CommandRegistry.java old mode 100755 new mode 100644 similarity index 74% rename from telnet/src/main/java/org/xbean/telnet/Command.java rename to telnet/src/main/java/org/xbean/command/CommandRegistry.java index 580f5ee8..a23414b8 --- a/telnet/src/main/java/org/xbean/telnet/Command.java +++ b/telnet/src/main/java/org/xbean/command/CommandRegistry.java @@ -14,31 +14,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; -import java.io.DataInputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.io.InputStream; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.StringTokenizer; +import java.util.Map; -public class Command { +public class CommandRegistry { + protected static final HashMap commands = new HashMap(); static { loadCommandList(); } - protected static final Command unknownCommand = new Command(); + protected static final CommandRegistry unknownCommand = new CommandRegistry(); - protected static void register(String name, Command cmd) { + public static Map getCommandMap() { + HashMap rc = new HashMap(); + for (Iterator iter = commands.keySet().iterator(); iter.hasNext();) { + String name = (String) iter.next(); + Command command = getCommand(name); + rc.put(name, command); + } + return rc; + } + + public static void register(String name, Command cmd) { commands.put(name, cmd); } - protected static void register(String name, Class cmd) { + public static void register(String name, Class cmd) { commands.put(name, cmd); } @@ -51,10 +57,6 @@ public static Command getCommand(String name) { return (Command) cmd; } - // - Public methods - // - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { - out.println("not implemented"); - } // - Protected methods - // protected static Command loadCommand(Class commandClass) { diff --git a/telnet/src/main/java/org/xbean/telnet/TextConsole.java b/telnet/src/main/java/org/xbean/command/CommandShell.java similarity index 87% rename from telnet/src/main/java/org/xbean/telnet/TextConsole.java rename to telnet/src/main/java/org/xbean/command/CommandShell.java index 6a75535a..b746b2fe 100755 --- a/telnet/src/main/java/org/xbean/telnet/TextConsole.java +++ b/telnet/src/main/java/org/xbean/command/CommandShell.java @@ -14,25 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; -import java.util.Vector; import java.util.StringTokenizer; +import java.util.Vector; -public class TextConsole { + +public class CommandShell implements Command { private final String prompt; - public TextConsole(String serverName) { + public CommandShell(String serverName) { serverName = serverName.toLowerCase(); prompt = TTY_Reset + TTY_Bright + "["+serverName+"]$ " + TTY_Reset; } private boolean stop = false; + private int rc = 0; public static final char ESC = (char) 27; public static final String TTY_Reset = ESC + "[0m"; @@ -61,11 +63,13 @@ public TextConsole(String serverName) { public static final String TTY_BG_Cyan = ESC + "[46m"; public static final String TTY_BG_White = ESC + "[47m"; - protected void exec(InputStream input, PrintStream out) { + public int main(String[] args, InputStream input, PrintStream out) { + DataInputStream in = new DataInputStream(input); while (!stop) { prompt(in, out); } + return rc; } protected void prompt(DataInputStream in, PrintStream out) { @@ -74,8 +78,11 @@ protected void prompt(DataInputStream in, PrintStream out) { out.flush(); String commandline = in.readLine(); + if( commandline == null ) { + this.stop = true; + return; + } commandline = commandline.trim(); - if (commandline.length() < 1) { return; } @@ -93,19 +100,20 @@ protected void prompt(DataInputStream in, PrintStream out) { String[] args = new String[p.size()]; p.copyInto(args); - Command cmd = Command.getCommand(command); + Command cmd = CommandRegistry.getCommand(command); if (cmd == null) { out.print(command); out.println(": command not found"); } else { - cmd.exec(args, in, out); + cmd.main(args, in, out); } } catch (UnsupportedOperationException e) { + this.rc=-1; this.stop = true; } catch (Throwable e) { - e.printStackTrace(new PrintStream(out)); - //e.printStackTrace( ); + e.printStackTrace(out); + this.rc=-1; this.stop = true; } } @@ -113,4 +121,5 @@ protected void prompt(DataInputStream in, PrintStream out) { protected void badCommand(DataInputStream in, PrintStream out) throws IOException { //asdf: command not found } + } diff --git a/telnet/src/main/java/org/xbean/telnet/Exit.java b/telnet/src/main/java/org/xbean/command/Exit.java similarity index 77% rename from telnet/src/main/java/org/xbean/telnet/Exit.java rename to telnet/src/main/java/org/xbean/command/Exit.java index 0d532d37..fdfb030a 100755 --- a/telnet/src/main/java/org/xbean/telnet/Exit.java +++ b/telnet/src/main/java/org/xbean/command/Exit.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; -import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; -public class Exit extends Command { +public class Exit implements Command { + public static void register() { - Command.register("exit", Exit.class); + CommandRegistry.register("exit", Exit.class); } - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { + public int main(String[] args, InputStream in, PrintStream out) { throw new UnsupportedOperationException(); } } diff --git a/telnet/src/main/java/org/xbean/telnet/GroovySh.java b/telnet/src/main/java/org/xbean/command/GroovySh.java similarity index 82% rename from telnet/src/main/java/org/xbean/telnet/GroovySh.java rename to telnet/src/main/java/org/xbean/command/GroovySh.java index 174ca06f..18cf7abe 100755 --- a/telnet/src/main/java/org/xbean/telnet/GroovySh.java +++ b/telnet/src/main/java/org/xbean/command/GroovySh.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; import groovy.lang.GroovyShell; import org.codehaus.groovy.runtime.InvokerHelper; @@ -25,12 +25,12 @@ import java.io.InputStreamReader; import java.io.PrintStream; -public class GroovySh extends Command { +public class GroovySh implements Command { public static void register() { - Command.register("groovysh", GroovySh.class); + CommandRegistry.register("groovysh", GroovySh.class); } - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { + public int main(String[] args, InputStream in, PrintStream out) { GroovyShell shell = new GroovyShell(); BufferedReader reader = new BufferedReader(new InputStreamReader(in)); String version = InvokerHelper.getVersion(); @@ -44,7 +44,14 @@ public void exec(String[] args, InputStream in, PrintStream out) throws IOExcept StringBuffer buffer = new StringBuffer(); while (true) { out.print("groovy> "); - String line = reader.readLine(); + String line; + try { + line = reader.readLine(); + } catch (IOException e) { + out.println("Caught: " + e); + e.printStackTrace(); + return -1; + } if (line != null) { buffer.append(line); buffer.append('\n'); @@ -65,5 +72,6 @@ public void exec(String[] args, InputStream in, PrintStream out) throws IOExcept e.printStackTrace(); } } + return 0; } } diff --git a/telnet/src/main/java/org/xbean/telnet/Help.java b/telnet/src/main/java/org/xbean/command/Help.java similarity index 76% rename from telnet/src/main/java/org/xbean/telnet/Help.java rename to telnet/src/main/java/org/xbean/command/Help.java index a4408342..260dbc87 100755 --- a/telnet/src/main/java/org/xbean/telnet/Help.java +++ b/telnet/src/main/java/org/xbean/command/Help.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; -import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; -import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Set; -public class Help extends Command { +public class Help implements Command { public static void register() { - Command.register("help", Help.class); + CommandRegistry.register("help", Help.class); } - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { - HashMap hash = Command.commands; + public int main(String[] args, InputStream in, PrintStream out) { + Map hash = CommandRegistry.getCommandMap();; Set set = hash.keySet(); Iterator cmds = set.iterator(); while (cmds.hasNext()) { out.print(" " + cmds.next()); out.println(""); } + return 0; } } diff --git a/telnet/src/main/java/org/xbean/telnet/Lookup.java b/telnet/src/main/java/org/xbean/command/Lookup.java similarity index 90% rename from telnet/src/main/java/org/xbean/telnet/Lookup.java rename to telnet/src/main/java/org/xbean/command/Lookup.java index 06d9514e..03403093 100755 --- a/telnet/src/main/java/org/xbean/telnet/Lookup.java +++ b/telnet/src/main/java/org/xbean/command/Lookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; import javax.naming.Context; import javax.naming.InitialContext; @@ -25,7 +25,7 @@ import java.io.InputStream; import java.io.PrintStream; -public class Lookup extends Command { +public class Lookup implements Command { private final javax.naming.Context ctx; @@ -40,7 +40,7 @@ public Lookup(Context ctx) { public static void register() { try { Lookup cmd = new Lookup(); - Command.register("lookup", cmd); + CommandRegistry.register("lookup", cmd); } catch (Exception e) { } } @@ -48,7 +48,7 @@ public static void register() { private static String PWD = ""; // execute jndi lookups - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { + public int main(String[] args, InputStream in, PrintStream out) { try { String name = ""; if (args == null || args.length == 0) { @@ -63,20 +63,23 @@ public void exec(String[] args, InputStream in, PrintStream out) throws IOExcept out.print("lookup: "); out.print(name); out.println(": No such object or subcontext"); - return; + return -1; } catch (Throwable e) { out.print("lookup: error: "); e.printStackTrace(new PrintStream(out)); - return; + return -1; } if (obj instanceof Context) { list(name, in, out); - return; + return 0; } // TODO:1: Output the different data types differently out.println("" + obj); + return 0; + } catch (Exception e) { e.printStackTrace(new PrintStream(out)); + return -2; } } diff --git a/telnet/src/main/java/org/xbean/telnet/Test.java b/telnet/src/main/java/org/xbean/command/Test.java similarity index 82% rename from telnet/src/main/java/org/xbean/telnet/Test.java rename to telnet/src/main/java/org/xbean/command/Test.java index ec5c6b56..508455e7 100755 --- a/telnet/src/main/java/org/xbean/telnet/Test.java +++ b/telnet/src/main/java/org/xbean/command/Test.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; /** * @author David Blevins */ -public class Test extends Command { +public class Test implements Command { + public static void _DONT_register() { - Command.register("test", Test.class); + CommandRegistry.register("test", Test.class); } - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { + public int main(String[] args, InputStream in, PrintStream out) { try { InputStream file = new FileInputStream("print.txt"); int b = file.read(); @@ -39,6 +39,8 @@ public void exec(String[] args, InputStream in, PrintStream out) throws IOExcept } } catch (Exception e) { e.printStackTrace(); + return -1; } + return 0; } } diff --git a/telnet/src/main/java/org/xbean/telnet/Version.java b/telnet/src/main/java/org/xbean/command/Version.java similarity index 83% rename from telnet/src/main/java/org/xbean/telnet/Version.java rename to telnet/src/main/java/org/xbean/command/Version.java index 56fcb427..45cbdd08 100755 --- a/telnet/src/main/java/org/xbean/telnet/Version.java +++ b/telnet/src/main/java/org/xbean/command/Version.java @@ -14,21 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.command; -import java.io.DataInputStream; -import java.io.IOException; -import java.io.PrintStream; import java.io.InputStream; +import java.io.PrintStream; import java.net.URL; import java.util.Properties; -public class Version extends Command { +public class Version implements Command { + public static void register() { - Command.register("version", Version.class); + CommandRegistry.register("version", Version.class); } - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { + public int main(String[] args, InputStream in, PrintStream out) { /* * Output startup message */ @@ -44,5 +43,6 @@ public void exec(String[] args, InputStream in, PrintStream out) throws IOExcept out.print("-"); out.println(versionInfo.getProperty("time")); out.println(versionInfo.getProperty("url")); + return 0; } } diff --git a/telnet/src/main/java/org/xbean/telnet/TelnetCodes.java b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetCodes.java similarity index 99% rename from telnet/src/main/java/org/xbean/telnet/TelnetCodes.java rename to telnet/src/main/java/org/xbean/terminal/telnet/TelnetCodes.java index a0cc535d..24aa358a 100755 --- a/telnet/src/main/java/org/xbean/telnet/TelnetCodes.java +++ b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetCodes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.terminal.telnet; public interface TelnetCodes { /** diff --git a/telnet/src/main/java/org/xbean/telnet/TelnetDaemon.java b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetDaemon.java similarity index 98% rename from telnet/src/main/java/org/xbean/telnet/TelnetDaemon.java rename to telnet/src/main/java/org/xbean/terminal/telnet/TelnetDaemon.java index 235d5c19..a1fe45a3 100644 --- a/telnet/src/main/java/org/xbean/telnet/TelnetDaemon.java +++ b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetDaemon.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.terminal.telnet; import java.io.IOException; import java.net.ServerSocket; diff --git a/telnet/src/main/java/org/xbean/telnet/TelnetInputStream.java b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetInputStream.java similarity index 99% rename from telnet/src/main/java/org/xbean/telnet/TelnetInputStream.java rename to telnet/src/main/java/org/xbean/terminal/telnet/TelnetInputStream.java index a20ccf96..81797075 100755 --- a/telnet/src/main/java/org/xbean/telnet/TelnetInputStream.java +++ b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.terminal.telnet; import java.io.FilterInputStream; import java.io.IOException; diff --git a/telnet/src/main/java/org/xbean/telnet/TelnetOption.java b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetOption.java similarity index 94% rename from telnet/src/main/java/org/xbean/telnet/TelnetOption.java rename to telnet/src/main/java/org/xbean/terminal/telnet/TelnetOption.java index 6d1cd2aa..a7d1ea6d 100755 --- a/telnet/src/main/java/org/xbean/telnet/TelnetOption.java +++ b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetOption.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.terminal.telnet; public class TelnetOption { diff --git a/telnet/src/main/java/org/xbean/telnet/TelnetPrintStream.java b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetPrintStream.java similarity index 98% rename from telnet/src/main/java/org/xbean/telnet/TelnetPrintStream.java rename to telnet/src/main/java/org/xbean/terminal/telnet/TelnetPrintStream.java index 5d21e3b2..a8f5c6cf 100755 --- a/telnet/src/main/java/org/xbean/telnet/TelnetPrintStream.java +++ b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetPrintStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.terminal.telnet; import java.io.OutputStream; import java.io.PrintStream; diff --git a/telnet/src/main/java/org/xbean/telnet/TelnetShell.java b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetShell.java similarity index 87% rename from telnet/src/main/java/org/xbean/telnet/TelnetShell.java rename to telnet/src/main/java/org/xbean/terminal/telnet/TelnetShell.java index 126242b8..faa9b3eb 100755 --- a/telnet/src/main/java/org/xbean/telnet/TelnetShell.java +++ b/telnet/src/main/java/org/xbean/terminal/telnet/TelnetShell.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.telnet; +package org.xbean.terminal.telnet; import java.io.IOException; import java.io.InputStream; @@ -22,6 +22,8 @@ import java.io.PrintStream; import java.net.Socket; +import org.xbean.command.CommandShell; + public class TelnetShell { private final String serverName; @@ -54,8 +56,8 @@ public void service(InputStream in, OutputStream out) throws IOException { // TODO:1: Login //...need a security service first - TextConsole shell = new TextConsole(serverName); - shell.exec(telnetIn, telnetOut); + CommandShell shell = new CommandShell(serverName); + shell.main(new String[]{}, telnetIn, telnetOut); } catch (Throwable t) { // TODO: log this diff --git a/telnet/src/test/java/org/xbean/telnet/TelnetShellTest.java b/telnet/src/test/java/org/xbean/telnet/TelnetShellTest.java index bf48962b..763b0db5 100644 --- a/telnet/src/test/java/org/xbean/telnet/TelnetShellTest.java +++ b/telnet/src/test/java/org/xbean/telnet/TelnetShellTest.java @@ -1,13 +1,15 @@ package org.xbean.telnet; -import junit.framework.*; -import org.xbean.telnet.TelnetShell; - -import java.io.InputStream; -import java.io.PrintStream; -import java.io.IOException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.PrintStream; + +import junit.framework.TestCase; + +import org.xbean.command.Command; +import org.xbean.command.CommandRegistry; +import org.xbean.terminal.telnet.TelnetShell; public class TelnetShellTest extends TestCase { @@ -24,13 +26,14 @@ public void testService() throws Exception { System.out.println(new String(out.toByteArray())); } - public static class TestCommand extends Command { + public static class TestCommand implements Command { public static void register() { - Command.register("test", TestCommand.class); + CommandRegistry.register("test", TestCommand.class); } - public void exec(String[] args, InputStream in, PrintStream out) throws IOException { + public int main(String[] args, InputStream in, PrintStream out) { out.print(args[0].length()); out.print(args[1].length()); + return 0; } } } \ No newline at end of file From 61954efb5d83a8b1de00403a040f13a69cf4d924 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Fri, 13 Jan 2006 23:53:31 +0000 Subject: [PATCH 095/736] Add a terminal type that just uses the console. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380518 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/xbean/terminal/console/Main.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 telnet/src/main/java/org/xbean/terminal/console/Main.java diff --git a/telnet/src/main/java/org/xbean/terminal/console/Main.java b/telnet/src/main/java/org/xbean/terminal/console/Main.java new file mode 100644 index 00000000..2b3316c4 --- /dev/null +++ b/telnet/src/main/java/org/xbean/terminal/console/Main.java @@ -0,0 +1,11 @@ +package org.xbean.terminal.console; + +import org.xbean.command.CommandShell; + +public class Main { + + public static void main(String[] args) { + CommandShell shell = new CommandShell("localhost"); + System.exit(shell.main(new String[]{}, System.in, System.out)); + } +} From 72f7d4112c6f22871f2823fe4ec50904a65030ef Mon Sep 17 00:00:00 2001 From: Alan Cabrera Date: Sat, 14 Jan 2006 02:43:41 +0000 Subject: [PATCH 096/736] Need to explicitly state version git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380519 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 5004fe4c..2c07c6e2 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,9 @@ + org.apache.maven.plugins maven-one-plugin + 1.0-SNAPSHOT From ad0cdf20a996a4939bcb1f51eb1effbf7b4d619a Mon Sep 17 00:00:00 2001 From: Daniel Diephouse Date: Mon, 16 Jan 2006 21:43:38 +0000 Subject: [PATCH 097/736] Add support for custom maps mappings for all those times where is just a little bit too ugly. We can now do things like: Grey Goose and it will be nicely put in a Map. Currently the value of the map entry can be a String or a bean reference (i.e. #foo), but nothing else. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380520 13f79535-47bb-0310-9956-ffa450edef68 --- .../spring/context/impl/MappingMetaData.java | 9 ++ .../impl/XBeanXmlBeanDefinitionParser.java | 133 ++++++++++++------ .../spring/generator/ElementMapping.java | 16 ++- .../xbean/spring/generator/MapMapping.java | 19 +++ .../spring/generator/QdoxMappingLoader.java | 15 +- .../generator/XmlMetadataGenerator.java | 9 ++ .../context/FavoriteUsingSpringTest.java | 45 ++++++ .../context/FavoriteUsingXBeanTest.java | 33 +++++ .../xbean/spring/example/FavoriteService.java | 47 +++++++ .../xbean/spring/context/favorite-normal.xml | 15 ++ .../xbean/spring/context/favorite-xbean.xml | 13 ++ 11 files changed, 309 insertions(+), 45 deletions(-) create mode 100644 spring/src/main/java/org/xbean/spring/generator/MapMapping.java create mode 100644 spring/src/test/java/org/xbean/spring/context/FavoriteUsingSpringTest.java create mode 100644 spring/src/test/java/org/xbean/spring/context/FavoriteUsingXBeanTest.java create mode 100644 spring/src/test/java/org/xbean/spring/example/FavoriteService.java create mode 100644 spring/src/test/resources/org/xbean/spring/context/favorite-normal.xml create mode 100644 spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml diff --git a/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java b/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java index 2d2d27d4..53238c37 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java @@ -183,4 +183,13 @@ public String getFactoryMethodName(String elementName) { public String getContentProperty(String elementName) { return properties.getProperty(elementName + ".contentProperty"); } + + public String getMapEntryName(String elementName, String property) { + return properties.getProperty(elementName + "." + property + ".map.entryName"); + } + + public String getMapKeyName(String elementName, String property) { + System.out.println(elementName + "." + property + ".map.keyName"); + return properties.getProperty(elementName + "." + property + ".map.keyName"); + } } diff --git a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index b3d082d2..c097ae0f 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -17,6 +17,22 @@ **/ package org.xbean.spring.context.impl; +import java.beans.BeanInfo; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanDefinitionStoreException; @@ -36,20 +52,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.Collection; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; - /** * An enhanced XML parser capable of handling custom XML schemas. * @@ -239,33 +241,33 @@ protected void addAttributeProperty(BeanDefinitionHolder definition, MappingMeta */ protected void addProperty(BeanDefinitionHolder definition, MappingMetaData metadata, Element element, String localName, String value) { - if (value != null) { - boolean reference = false; - if (value.startsWith(BEAN_REFERENCE_PREFIX)) { - value = value.substring(BEAN_REFERENCE_PREFIX.length()); - - // we could be an escaped string - if (!value.startsWith(BEAN_REFERENCE_PREFIX)) { - reference = true; - } - } - if (reference) { - // TOOD handle custom reference types like local or queries etc - String propertyName = metadata.getPropertyName(getLocalName(element), localName); - if (propertyName != null) { - definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, - new RuntimeBeanReference(value)); - } - } - else { - String propertyName = metadata.getPropertyName(getLocalName(element), localName); - if (propertyName != null) { - definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, value); - } + String propertyName = metadata.getPropertyName(getLocalName(element), localName); + if (propertyName != null) + definition.getBeanDefinition().getPropertyValues().addPropertyValue(propertyName, getValue(value)); + } + + protected Object getValue(String value) { + if (value == null) return null; + + boolean reference = false; + if (value.startsWith(BEAN_REFERENCE_PREFIX)) { + value = value.substring(BEAN_REFERENCE_PREFIX.length()); + + // we could be an escaped string + if (!value.startsWith(BEAN_REFERENCE_PREFIX)) { + reference = true; } } + + if (reference) { + // TOOD handle custom reference types like local or queries etc + return new RuntimeBeanReference(value); + } + else { + return value; + } } - + protected String getLocalName(Element element) { String localName = element.getLocalName(); if (localName == null) { @@ -321,7 +323,7 @@ protected void addNestedPropertyElements(BeanDefinitionHolder definition, Mappin else { /** - * In this case ther is no nested property, so just do a normal + * In this case there is no nested property, so just do a normal * addProperty like we do with attributes. */ String text = getElementText(childElement); @@ -423,7 +425,10 @@ protected PropertyDescriptor getPropertyDescriptor(String className, String loca protected Object parseNestedPropertyViaIntrospection(MappingMetaData metadata, String className, Element element, PropertyDescriptor descriptor) { String name = descriptor.getName(); - if (isCollection(descriptor.getPropertyType())) { + if (isMap(descriptor.getPropertyType())) { + return parseCustomMapElement(metadata, element, name); + } + else if (isCollection(descriptor.getPropertyType())) { return parseListElement(element, name); } else { @@ -431,6 +436,54 @@ protected Object parseNestedPropertyViaIntrospection(MappingMetaData metadata, S } } + private Object parseCustomMapElement(MappingMetaData metadata, Element element, String name) { + Map map = new HashMap(); + + Element parent = (Element) element.getParentNode(); + String entryName = metadata.getMapEntryName(getLocalName(parent), name); + String keyName = metadata.getMapKeyName(getLocalName(parent), name); + + if (entryName == null) entryName = "property"; + if (keyName == null) keyName = "key"; + + // TODO : support further customizations + //String valueName = "value"; + //boolean keyIsAttr = true; + //boolean valueIsAttr = false; + + NodeList nl = element.getChildNodes(); + for (int i = 0; i < nl.getLength(); i++) { + Node node = nl.item(i); + if (node instanceof Element) { + Element childElement = (Element) node; + + String localName = childElement.getLocalName(); + String uri = childElement.getNamespaceURI(); + if (localName == null || localName.equals("xmlns") || localName.startsWith("xmlns:")) { + continue; + } + + // we could use namespaced attributes to differentiate real spring + // attributes from namespace-specific attributes + if (isEmpty(uri) && localName.equals(entryName)) { + String key = childElement.getAttribute(keyName); + if (key == null) throw new RuntimeException("No key defined for map " + entryName); + + Object keyValue = getValue(key); + + Object value = getValue(getElementText(childElement)); + + map.put(keyValue, value); + } + } + } + return map; + } + + protected boolean isMap(Class type) { + return Map.class.isAssignableFrom(type); + } + /** * Returns true if the given type is a collection type or an array */ diff --git a/spring/src/main/java/org/xbean/spring/generator/ElementMapping.java b/spring/src/main/java/org/xbean/spring/generator/ElementMapping.java index 82d5295c..8a279637 100644 --- a/spring/src/main/java/org/xbean/spring/generator/ElementMapping.java +++ b/spring/src/main/java/org/xbean/spring/generator/ElementMapping.java @@ -42,8 +42,9 @@ public class ElementMapping implements Comparable { private final Set attributes; private final Map attributesByName; private final List constructors; - - public ElementMapping(String namespace, String elementName, String className, String description, boolean rootElement, String initMethod, String destroyMethod, String factoryMethod, String contentProperty, Set attributes, List constructors) { + private final Map maps; + + public ElementMapping(String namespace, String elementName, String className, String description, boolean rootElement, String initMethod, String destroyMethod, String factoryMethod, String contentProperty, Set attributes, List constructors, Map maps) { if (namespace == null) throw new NullPointerException("namespace"); if (elementName == null) throw new NullPointerException("elementName"); if (className == null) throw new NullPointerException("className"); @@ -61,7 +62,8 @@ public ElementMapping(String namespace, String elementName, String className, St this.contentProperty = contentProperty; this.constructors = constructors; this.attributes = Collections.unmodifiableSet(new TreeSet(attributes)); - + this.maps = Collections.unmodifiableMap(maps); + Map attributesByName = new HashMap(); for (Iterator iterator = attributes.iterator(); iterator.hasNext();) { AttributeMapping attribute = (AttributeMapping) iterator.next(); @@ -114,6 +116,14 @@ public AttributeMapping getAttribute(String attributeName) { return (AttributeMapping) attributesByName.get(attributeName); } + public Map getMapMappings() { + return maps; + } + + public MapMapping getMapMapping(String name) { + return (MapMapping) maps.get(name); + } + public List getConstructors() { return constructors; } diff --git a/spring/src/main/java/org/xbean/spring/generator/MapMapping.java b/spring/src/main/java/org/xbean/spring/generator/MapMapping.java new file mode 100644 index 00000000..603b5a7e --- /dev/null +++ b/spring/src/main/java/org/xbean/spring/generator/MapMapping.java @@ -0,0 +1,19 @@ +package org.xbean.spring.generator; + +public class MapMapping { + private String entryName; + private String keyName; + + public MapMapping(String entryName, String keyName) { + this.entryName = entryName; + this.keyName = keyName; + } + + public String getEntryName() { + return entryName; + } + + public String getKeyName() { + return keyName; + } +} diff --git a/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java b/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java index 704e6980..a3532bae 100644 --- a/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java +++ b/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java @@ -50,7 +50,8 @@ public class QdoxMappingLoader implements MappingLoader { public static final String INIT_METHOD_ANNOTATION = "org.xbean.InitMethod"; public static final String DESTROY_METHOD_ANNOTATION = "org.xbean.DestroyMethod"; public static final String FACTORY_METHOD_ANNOTATION = "org.xbean.FactoryMethod"; - + public static final String MAP_ANNOTATION = "org.xbean.Map"; + private static final Log log = LogFactory.getLog(QdoxMappingLoader.class); private final String defaultNamespace; private final File[] srcDirs; @@ -160,6 +161,7 @@ private ElementMapping loadElement(JavaClass javaClass) { boolean root = getBooleanProperty(xbeanTag, "rootElement"); String contentProperty = getProperty(xbeanTag, "contentProperty"); + Map mapsByPropertyName = new HashMap(); Set attributes = new HashSet(); Map attributesByPropertyName = new HashMap(); BeanProperty[] beanProperties = javaClass.getBeanProperties(); @@ -173,6 +175,13 @@ private ElementMapping loadElement(JavaClass javaClass) { attributes.add(attributeMapping); attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); } + JavaMethod acc = beanProperty.getAccessor(); + DocletTag mapTag = acc.getTagByName(MAP_ANNOTATION); + if (mapTag != null) { + MapMapping mm = new MapMapping(mapTag.getNamedParameter("entryName"), + mapTag.getNamedParameter("keyName")); + mapsByPropertyName.put(beanProperty.getName(), mm); + } } } @@ -192,6 +201,7 @@ private ElementMapping loadElement(JavaClass javaClass) { if (method.getTagByName(FACTORY_METHOD_ANNOTATION) != null) { factoryMethod = method.getName(); } + } } @@ -233,7 +243,8 @@ private ElementMapping loadElement(JavaClass javaClass) { factoryMethod, contentProperty, attributes, - constructorArgs); + constructorArgs, + mapsByPropertyName); } private String getElementName(JavaClass javaClass, DocletTag tag) { diff --git a/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java b/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java index f5c07615..bc81c71e 100644 --- a/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java +++ b/spring/src/main/java/org/xbean/spring/generator/XmlMetadataGenerator.java @@ -22,6 +22,7 @@ import java.io.PrintWriter; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import org.xbean.spring.context.impl.NamespaceHelper; @@ -93,6 +94,14 @@ private void generatePropertiesFileContent(PrintWriter out, ElementMapping eleme if (factoryMethod != null) { out.println(element.getElementName() + ".factoryMethod = " + factoryMethod); } + + Map maps = element.getMapMappings(); + for (Iterator itr = maps.entrySet().iterator(); itr.hasNext();) { + Map.Entry entry = (Map.Entry) itr.next(); + MapMapping mm = (MapMapping) entry.getValue(); + out.println(element.getElementName() + "." + entry.getKey() + ".map.entryName = " + mm.getEntryName()); + out.println(element.getElementName() + "." + entry.getKey() + ".map.keyName = " + mm.getKeyName()); + } } private void generatePropertiesFileConstructors(PrintWriter out, ElementMapping element) { diff --git a/spring/src/test/java/org/xbean/spring/context/FavoriteUsingSpringTest.java b/spring/src/test/java/org/xbean/spring/context/FavoriteUsingSpringTest.java new file mode 100644 index 00000000..ee069241 --- /dev/null +++ b/spring/src/test/java/org/xbean/spring/context/FavoriteUsingSpringTest.java @@ -0,0 +1,45 @@ +/** + * + * Copyright 2005 the original author or authors. + * + * 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. + */ +package org.xbean.spring.context; + +import java.util.Map; + +import org.springframework.context.support.AbstractXmlApplicationContext; +import org.xbean.spring.example.BeerService; +import org.xbean.spring.example.FavoriteService; + +/** + * @author James Strachan + * @version $Id$ + * @since 1.0 + */ +public class FavoriteUsingSpringTest extends SpringTestSupport { + + public void testFavs() throws Exception { + FavoriteService fs = (FavoriteService) getBean("favoriteService"); + + Map favorites = fs.getFavorites(); + assertNotNull(favorites); + assertEquals(1, favorites.size()); + + assertEquals("Grey Goose", favorites.get("Dan")); + } + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/favorite-normal.xml"); + } +} diff --git a/spring/src/test/java/org/xbean/spring/context/FavoriteUsingXBeanTest.java b/spring/src/test/java/org/xbean/spring/context/FavoriteUsingXBeanTest.java new file mode 100644 index 00000000..399f3b8c --- /dev/null +++ b/spring/src/test/java/org/xbean/spring/context/FavoriteUsingXBeanTest.java @@ -0,0 +1,33 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.context; + +import org.springframework.context.support.AbstractXmlApplicationContext; + +/** + * @author James Strachan + * @version $Id$ + * @since 2.0 + */ +public class FavoriteUsingXBeanTest extends FavoriteUsingSpringTest { + + protected AbstractXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/xbean/spring/context/favorite-xbean.xml"); + } + +} diff --git a/spring/src/test/java/org/xbean/spring/example/FavoriteService.java b/spring/src/test/java/org/xbean/spring/example/FavoriteService.java new file mode 100644 index 00000000..c9be3e47 --- /dev/null +++ b/spring/src/test/java/org/xbean/spring/example/FavoriteService.java @@ -0,0 +1,47 @@ +/** + * + * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com + * + * 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. + * + **/ +package org.xbean.spring.example; + +import java.util.Map; + + +/** + * @org.xbean.XBean element="favorite" + * + * @author Dan Diephouse + * @version $Id$ + */ + +// START SNIPPET: bean +public class FavoriteService { + private Map favorites; + + /** + * @org.xbean.Map entryName="favorite-item" keyName="person" + * @return + */ + public Map getFavorites() { + return favorites; + } + + public void setFavorites(Map favorites) { + this.favorites = favorites; + } +} +// END SNIPPET: bean + diff --git a/spring/src/test/resources/org/xbean/spring/context/favorite-normal.xml b/spring/src/test/resources/org/xbean/spring/context/favorite-normal.xml new file mode 100644 index 00000000..0aedf646 --- /dev/null +++ b/spring/src/test/resources/org/xbean/spring/context/favorite-normal.xml @@ -0,0 +1,15 @@ + + + + + + + + + Grey Goose + + + + + + diff --git a/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml new file mode 100644 index 00000000..12684f25 --- /dev/null +++ b/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml @@ -0,0 +1,13 @@ + + + + + + + Grey Goose + + + + + + From c9869d3bebd3fb3f814342e6ce8c944d8426d50a Mon Sep 17 00:00:00 2001 From: Daniel Diephouse Date: Mon, 16 Jan 2006 22:26:55 +0000 Subject: [PATCH 098/736] Prevent NPEs for elements which don't have read properties. git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380521 13f79535-47bb-0310-9956-ffa450edef68 --- .../xbean/spring/generator/QdoxMappingLoader.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java b/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java index a3532bae..e1844984 100644 --- a/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java +++ b/spring/src/main/java/org/xbean/spring/generator/QdoxMappingLoader.java @@ -176,11 +176,13 @@ private ElementMapping loadElement(JavaClass javaClass) { attributesByPropertyName.put(attributeMapping.getPropertyName(), attributeMapping); } JavaMethod acc = beanProperty.getAccessor(); - DocletTag mapTag = acc.getTagByName(MAP_ANNOTATION); - if (mapTag != null) { - MapMapping mm = new MapMapping(mapTag.getNamedParameter("entryName"), - mapTag.getNamedParameter("keyName")); - mapsByPropertyName.put(beanProperty.getName(), mm); + if (acc != null) { + DocletTag mapTag = acc.getTagByName(MAP_ANNOTATION); + if (mapTag != null) { + MapMapping mm = new MapMapping(mapTag.getNamedParameter("entryName"), + mapTag.getNamedParameter("keyName")); + mapsByPropertyName.put(beanProperty.getName(), mm); + } } } } From fbf7d6e348d6b2c71207055ea84235f20786c023 Mon Sep 17 00:00:00 2001 From: Daniel Diephouse Date: Mon, 16 Jan 2006 22:40:32 +0000 Subject: [PATCH 099/736] remove system.out git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380522 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/xbean/spring/context/impl/MappingMetaData.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java b/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java index 53238c37..49a40a84 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/MappingMetaData.java @@ -189,7 +189,6 @@ public String getMapEntryName(String elementName, String property) { } public String getMapKeyName(String elementName, String property) { - System.out.println(elementName + "." + property + ".map.keyName"); return properties.getProperty(elementName + "." + property + ".map.keyName"); } } From 8f6ac9564e038b06d673c61625ec4a3147853831 Mon Sep 17 00:00:00 2001 From: Daniel Diephouse Date: Tue, 17 Jan 2006 02:54:34 +0000 Subject: [PATCH 100/736] Actually write the unit test namespaces correctly git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380523 13f79535-47bb-0310-9956-ffa450edef68 --- .../spring/context/impl/XBeanXmlBeanDefinitionParser.java | 5 ++--- .../resources/org/xbean/spring/context/favorite-xbean.xml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java index c097ae0f..2dee5160 100644 --- a/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java +++ b/spring/src/main/java/org/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java @@ -436,7 +436,7 @@ else if (isCollection(descriptor.getPropertyType())) { } } - private Object parseCustomMapElement(MappingMetaData metadata, Element element, String name) { + protected Object parseCustomMapElement(MappingMetaData metadata, Element element, String name) { Map map = new HashMap(); Element parent = (Element) element.getParentNode(); @@ -450,7 +450,6 @@ private Object parseCustomMapElement(MappingMetaData metadata, Element element, //String valueName = "value"; //boolean keyIsAttr = true; //boolean valueIsAttr = false; - NodeList nl = element.getChildNodes(); for (int i = 0; i < nl.getLength(); i++) { Node node = nl.item(i); @@ -465,7 +464,7 @@ private Object parseCustomMapElement(MappingMetaData metadata, Element element, // we could use namespaced attributes to differentiate real spring // attributes from namespace-specific attributes - if (isEmpty(uri) && localName.equals(entryName)) { + if (!isEmpty(uri) && localName.equals(entryName)) { String key = childElement.getAttribute(keyName); if (key == null) throw new RuntimeException("No key defined for map " + entryName); diff --git a/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml b/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml index 12684f25..44694a52 100644 --- a/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml +++ b/spring/src/test/resources/org/xbean/spring/context/favorite-xbean.xml @@ -3,9 +3,9 @@ - - Grey Goose - + + Grey Goose + From 87c7a19a4eaec9bd04de3095429215243a1735ae Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Fri, 20 Jan 2006 21:17:57 +0000 Subject: [PATCH 101/736] Fixed build git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380525 13f79535-47bb-0310-9956-ffa450edef68 --- jmx/pom.xml | 5 +---- kernel/pom.xml | 3 +-- osgi/src/test/java/org/xbean/osgi/OSGiTest.java | 5 ++++- sca/pom.xml | 4 ++-- server/pom.xml | 4 +--- spring/pom.xml | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/jmx/pom.xml b/jmx/pom.xml index 13f3822b..7f1d5cd3 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -37,8 +37,7 @@ - + @@ -70,12 +69,10 @@ org.xbean xbean-kernel - 2.1-SNAPSHOT org.xbean xbean-spring - 2.1-SNAPSHOT diff --git a/kernel/pom.xml b/kernel/pom.xml index ce4a99cd..ffa4dbd9 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -13,7 +13,6 @@ backport-util-concurrent backport-util-concurrent - 2.0_01_pd - \ No newline at end of file + diff --git a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java index ef90b6e0..e57f78b4 100644 --- a/osgi/src/test/java/org/xbean/osgi/OSGiTest.java +++ b/osgi/src/test/java/org/xbean/osgi/OSGiTest.java @@ -64,7 +64,10 @@ protected void tearDown() throws Exception { osgi.shutdown(); } - public void testAddBundel() throws Exception { + public void testNothing() throws Exception { + } + + public void XtestAddBundel() throws Exception { Project project; Bundle bundle; BundleClassLoader bundleClassLoader; diff --git a/sca/pom.xml b/sca/pom.xml index 1835d881..0c26532b 100644 --- a/sca/pom.xml +++ b/sca/pom.xml @@ -2,12 +2,12 @@ xbean org.xbean - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 xbean-sca XBean :: SCA - 2.1-SNAPSHOT + 2.2-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index f89f3de9..1ee54a45 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -58,12 +58,10 @@ org.xbean xbean-kernel - 2.2-SNAPSHOT org.xbean xbean-spring - 2.2-SNAPSHOT - \ No newline at end of file + diff --git a/spring/pom.xml b/spring/pom.xml index 3a108b7c..3d572f7f 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -76,4 +76,4 @@ qdox - \ No newline at end of file + From 561bbc642b4e30afaea79a4ccdc45e2285934651 Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Fri, 20 Jan 2006 22:26:38 +0000 Subject: [PATCH 102/736] set svn:ignore git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380526 13f79535-47bb-0310-9956-ffa450edef68 From accf47f94fdab2897e1ddb827b11b9845751fcdf Mon Sep 17 00:00:00 2001 From: Dain Sundstrom Date: Sat, 21 Jan 2006 01:09:29 +0000 Subject: [PATCH 103/736] Repackaged to org.apache.xbean Changed generic copyright notice to official Apache notice Added LICENSE.txt and NOTICE.txt files git-svn-id: https://svn.apache.org/repos/asf/geronimo/xbean/trunk@380527 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE.txt | 203 ++++++++++++++++++ NOTICE.txt | 3 + classpath/LICENSE.txt | 203 ++++++++++++++++++ classpath/NOTICE.txt | 3 + classpath/pom.xml | 2 +- .../xbean/classpath/ClassPath.java | 2 +- .../xbean/classpath/ClassPathFactory.java | 2 +- .../xbean/classpath/ContextClassPath.java | 2 +- .../xbean/classpath/SunURLClassPath.java | 2 +- .../xbean/classpath/SystemClassPath.java | 2 +- .../xbean/classpath/TomcatClassPath.java | 2 +- .../classpath/TomcatWebAppClassPath.java | 2 +- .../xbean/classpath/maven/MavenResolver.java | 4 +- .../xbean/classpath/SystemClassPathTest.java | 2 +- jmx/LICENSE.txt | 203 ++++++++++++++++++ jmx/NOTICE.txt | 3 + jmx/pom.xml | 10 +- .../{ => apache}/xbean/jmx/BeanPairing.java | 10 +- .../{ => apache}/xbean/jmx/EventAdapter.java | 8 +- .../{ => apache}/xbean/jmx/JMXException.java | 4 +- .../xbean/jmx/JMXServiceException.java | 4 +- .../xbean/jmx/JMXStrategyFinder.java | 6 +- .../xbean/jmx/JMXWrappingStrategy.java | 6 +- .../{ => apache}/xbean/jmx/MBeanExporter.java | 18 +- .../{ => apache}/xbean/jmx/MBeanHolder.java | 10 +- .../xbean/jmx/MBeanInfoGenerator.java | 4 +- .../assembler/JavaBeanMBeanInfoGenerator.java | 4 +- .../xbean/jmx/config/JMXServiceConfig.java | 4 +- .../strategies/JavaBeanWrappingStrategy.java | 10 +- .../javabean | 1 + .../org.xbean.jmx.StrategyFinder/javabean | 1 - .../xbean/jmx/DummyMBeanInfoGenerator.java | 4 +- .../{ => apache}/xbean/jmx/JMXService.java | 4 +- .../xbean/jmx/JMXStrategyFinderTest.java | 6 +- .../org/{ => apache}/xbean/jmx/JMXTest.java | 18 +- .../xbean/jmx/jmx-custom-assembler.xml | 8 +- .../xbean/jmx/jmx-listener-multiple.xml | 6 +- .../{ => apache}/xbean/jmx/jmx-listener.xml | 6 +- .../xbean/jmx/jmx-simple-multiple.xml | 8 +- .../org/{ => apache}/xbean/jmx/jmx-simple.xml | 6 +- .../org/{ => apache}/xbean/jmx/jmx.xml | 4 +- kernel/LICENSE.txt | 203 ++++++++++++++++++ kernel/NOTICE.txt | 3 + kernel/pom.xml | 2 +- .../xbean/kernel/AbstractServiceFactory.java | 4 +- .../xbean/kernel/ForcedStopException.java | 4 +- .../kernel/IllegalServiceStateException.java | 4 +- .../kernel/InvalidServiceTypeException.java | 4 +- .../org/{ => apache}/xbean/kernel/Kernel.java | 4 +- .../kernel/KernelAlreadyExistsException.java | 4 +- .../xbean/kernel/KernelErrorsError.java | 4 +- .../xbean/kernel/KernelFactory.java | 12 +- .../xbean/kernel/KernelFactoryError.java | 4 +- .../xbean/kernel/KernelMonitor.java | 4 +- .../KernelOperationInterruptedException.java | 4 +- .../KernelOperationTimoutException.java | 4 +- .../xbean/kernel/NullServiceMonitor.java | 4 +- .../xbean/kernel/RunningServiceCondition.java | 4 +- .../kernel/ServiceAlreadyExistsException.java | 4 +- .../xbean/kernel/ServiceCondition.java | 4 +- .../xbean/kernel/ServiceConditionContext.java | 4 +- .../xbean/kernel/ServiceContext.java | 4 +- .../kernel/ServiceContextThreadLocal.java | 4 +- .../xbean/kernel/ServiceEvent.java | 4 +- .../xbean/kernel/ServiceFactory.java | 4 +- .../xbean/kernel/ServiceMonitor.java | 4 +- .../xbean/kernel/ServiceName.java | 4 +- .../kernel/ServiceNotFoundException.java | 4 +- .../kernel/ServiceRegistrationException.java | 4 +- .../xbean/kernel/ServiceState.java | 4 +- .../xbean/kernel/StartStrategies.java | 4 +- .../xbean/kernel/StartStrategy.java | 4 +- .../xbean/kernel/StaticServiceFactory.java | 4 +- .../xbean/kernel/StopStrategies.java | 4 +- .../xbean/kernel/StopStrategy.java | 4 +- .../xbean/kernel/StoppedServiceCondition.java | 4 +- .../xbean/kernel/StringServiceName.java | 4 +- .../kernel/UnregisterServiceException.java | 4 +- .../UnsatisfiedConditionsException.java | 4 +- .../{ => apache}/xbean/kernel/package.html | 0 .../kernel/standard/AggregateCondition.java | 10 +- .../kernel/standard/AsyncServiceMonitor.java | 8 +- .../standard/KernelMonitorBroadcaster.java | 12 +- .../standard/NonRestartableStopCondition.java | 12 +- .../kernel/standard/RegistryFutureTask.java | 8 +- .../xbean/kernel/standard/ServiceManager.java | 40 ++-- .../standard/ServiceManagerFactory.java | 10 +- .../standard/ServiceManagerRegistry.java | 26 +-- .../standard/ServiceMonitorBroadcaster.java | 14 +- .../xbean/kernel/standard/StandardKernel.java | 40 ++-- .../standard/StandardKernelFactory.java | 8 +- .../StandardServiceConditionContext.java | 10 +- .../standard/StandardServiceContext.java | 12 +- .../xbean/kernel/standard/package.html | 0 .../xbean/rmi/RMIClassLoaderSpiImpl.java | 4 +- .../kernel/KernelMonitorBroadcasterTest.java | 8 +- .../xbean/kernel/ServiceStateTest.java | 6 +- .../kernel/StaticServiceFactoryTest.java | 4 +- .../xbean/kernel/StringServiceNameTest.java | 4 +- .../standard/ServiceManagerRegistryTest.java | 30 +-- .../kernel/standard/ServiceManagerTest.java | 50 ++--- .../ServiceMonitorBroadcasterTest.java | 20 +- .../kernel/standard/StandardKernelTest.java | 18 +- osgi/LICENSE.txt | 203 ++++++++++++++++++ osgi/NOTICE.txt | 3 + osgi/pom.xml | 2 +- .../org/{ => apache}/xbean/osgi/Artifact.java | 4 +- .../xbean/osgi/BundleClassLoader.java | 4 +- .../{ => apache}/xbean/osgi/Dependency.java | 4 +- .../xbean/osgi/MavenBundleManager.java | 4 +- .../org/{ => apache}/xbean/osgi/Project.java | 4 +- .../org/{ => apache}/xbean/osgi/OSGiTest.java | 10 +- pom.xml | 40 +++- sca/LICENSE.txt | 203 ++++++++++++++++++ sca/NOTICE.txt | 3 + sca/pom.xml | 2 +- .../xbean/sca/IntrospectionSupport.java | 2 +- .../{ => apache}/xbean/sca/ScaAdapter.java | 2 +- .../xbean/sca/ScaBeanPostProcessor.java | 4 +- .../xbean/sca/impl/DefaultComponent.java | 2 +- .../xbean/sca/impl/DefaultScaAdapter.java | 4 +- .../xbean/sca/FieldInjectionPojo.java | 2 +- .../xbean/sca/FieldInjectionTest.java | 4 +- .../{ => apache}/xbean/sca/LifecyclePojo.java | 2 +- .../{ => apache}/xbean/sca/LifecycleTest.java | 4 +- .../xbean/sca/MandatoryPropertyPojo.java | 2 +- .../xbean/sca/MandatoryReferencePojo.java | 2 +- .../xbean/sca/MissingPropertyTest.java | 4 +- .../xbean/sca/MissingReferenceTest.java | 4 +- .../xbean/sca/PropertyInjectionPojo.java | 2 +- .../xbean/sca/PropertyInjectionTest.java | 4 +- .../{ => apache}/xbean/sca/PropertyTest.java | 4 +- .../xbean/sca/SpringTestSupport.java | 2 +- .../xbean/sca/field-injection.xml | 4 +- .../org/{ => apache}/xbean/sca/lifecycle.xml | 4 +- .../xbean/sca/missing-property.xml | 4 +- .../xbean/sca/missing-reference.xml | 4 +- .../xbean/sca/property-injection.xml | 4 +- .../org/{ => apache}/xbean/sca/property.xml | 4 +- server/LICENSE.txt | 203 ++++++++++++++++++ server/NOTICE.txt | 3 + server/pom.xml | 10 +- .../server/classloader/ClassLoaderUtil.java | 4 +- .../classloader/DestroyableClassLoader.java | 4 +- .../classloader/JarFileClassLoader.java | 4 +- .../classloader/MultiParentClassLoader.java | 4 +- .../server/classloader/NamedClassLoader.java | 4 +- .../xbean/server/loader/LoadAllMain.java | 14 +- .../xbean/server/loader/Loader.java | 8 +- .../xbean/server/main/FatalStartupError.java | 4 +- .../xbean/server/main/KernelMain.java | 16 +- .../{ => apache}/xbean/server/main/Main.java | 4 +- .../propertyeditor/InetAddressEditor.java | 4 +- .../propertyeditor/ObjectNameEditor.java | 4 +- .../server/propertyeditor/URIEditor.java | 4 +- .../repository/FileSystemRepository.java | 6 +- .../xbean/server/repository/Repository.java | 4 +- .../ClassLoaderXmlPreprocessor.java | 14 +- .../configuration/SpringConfiguration.java | 23 +- .../SpringConfigurationServiceFactory.java | 18 +- .../server/spring/loader/SpringLoader.java | 22 +- .../server/spring/main/SpringBootstrap.java | 18 +- .../reference/ClassLoaderReference.java | 8 +- .../spring/reference/KernelReference.java | 10 +- .../reference/ServiceNameReference.java | 10 +- .../reference/ServiceNameStringReference.java | 8 +- .../resources/META-INF/xbean-bootstrap.xml | 6 +- .../classloader/JarFileClassLoaderTest.java | 4 +- .../MultiParentClassLoaderTest.java | 4 +- .../spring/loader/SpringLoaderTest.java | 24 +-- .../spring/main/SpringBootstrapTest.java | 10 +- .../server/spring/loader/classpath-xbean.xml | 2 +- spring/LICENSE.txt | 203 ++++++++++++++++++ spring/NOTICE.txt | 3 + spring/pom.xml | 6 +- .../ClassPathXmlApplicationContext.java | 4 +- .../FileSystemXmlApplicationContext.java | 4 +- .../ResourceXmlApplicationContext.java | 4 +- .../context/SpringApplicationContext.java | 4 +- .../spring/context/SpringXmlPreprocessor.java | 4 +- .../context/XmlWebApplicationContext.java | 4 +- .../spring/context/impl/DefaultProperty.java | 4 +- .../spring/context/impl/MappingMetaData.java | 2 +- .../context/impl/NamedConstructorArgs.java | 4 +- .../spring/context/impl/NamespaceHelper.java | 4 +- .../spring/context/impl/ObjectNameEditor.java | 2 +- .../context/impl/PropertyEditorHelper.java | 6 +- .../spring/context/impl/QNameHelper.java | 2 +- .../context/impl/QNameReflectionHelper.java | 4 +- .../context/impl/QNameReflectionParams.java | 2 +- .../xbean/spring/context/impl/URIEditor.java | 2 +- .../impl/XBeanXmlBeanDefinitionParser.java | 4 +- .../impl/XBeanXmlBeanDefinitionReader.java | 8 +- .../context/impl/XBeanXmlBeanFactory.java | 4 +- .../spring/generator/AttributeMapping.java | 4 +- .../generator/DocumentationGenerator.java | 4 +- .../spring/generator/ElementMapping.java | 4 +- .../spring/generator/GeneratorPlugin.java | 4 +- .../generator/InvalidModelException.java | 4 +- .../xbean/spring/generator/LogFacade.java | 2 +- .../xbean/spring/generator/MapMapping.java | 2 +- .../generator/MappingGeneratorTask.java | 4 +- .../xbean/spring/generator/MappingLoader.java | 4 +- .../spring/generator/NamespaceMapping.java | 4 +- .../spring/generator/QdoxMappingLoader.java | 26 +-- .../spring/generator/SchemaGenerator.java | 2 +- .../xbean/spring/generator/Type.java | 4 +- .../xbean/spring/generator/Utils.java | 8 +- .../generator/XmlMetadataGenerator.java | 6 +- .../xbean/spring/generator/XmlWriter.java | 4 +- .../xbean/spring/generator/XsdGenerator.java | 4 +- .../xbean/spring/jndi/DefaultContext.java | 2 +- .../xbean/spring/jndi/NameParserImpl.java | 36 ++++ .../jndi/SpringInitialContextFactory.java | 4 +- .../spring/util/AbstractSpringVisitor.java | 4 +- .../xbean/spring/util/SpringVisitor.java | 4 +- .../org/xbean/spring/jndi/NameParserImpl.java | 37 ---- .../xbean/spring/spring-beans.xsd | 2 +- .../spring/context/BeerUsingSpringTest.java | 8 +- .../spring/context/BeerUsingXBeanTest.java | 4 +- .../context/FavoriteUsingSpringTest.java | 9 +- .../context/FavoriteUsingXBeanTest.java | 4 +- .../spring/context/GinUsingSpringTest.java | 8 +- .../spring/context/PizzaUsingSpringTest.java | 6 +- .../spring/context/PizzaUsingXBeanTest.java | 4 +- .../PizzaUsingXBeanWinBeanRefTest.java | 6 +- .../PizzaUsingXBeanWithJavaNamespaceTest.java | 5 +- ...aUsingXBeanWithPropertiesTextNodeTest.java | 4 +- ...singResourceXmlApplicationContextTest.java | 4 +- .../RestaurantUsingSpringExtendedTest.java | 6 +- .../context/RestaurantUsingSpringTest.java | 8 +- .../RestaurantUsingXBeanAsRootTest.java | 4 +- .../RestaurantUsingXBeanMixedTest.java | 4 +- .../context/RestaurantUsingXBeanTest.java | 6 +- ...aurantUsingXBeanWithSimplerConfigTest.java | 4 +- .../spring/context/SaladUsingSpringTest.java | 8 +- .../spring/context/SaladUsingXBeanTest.java | 4 +- .../spring/context/SoupUsingSpringTest.java | 8 +- .../spring/context/SoupUsingXBeanTest.java | 4 +- .../spring/context/SpringTestSupport.java | 2 +- .../spring/context/VodkaUsingSpringTest.java | 8 +- .../spring/context/VodkaUsingXBeanTest.java | 4 +- .../spring/context/WineUsingSpringTest.java | 8 +- .../spring/context/WineUsingXBeanTest.java | 4 +- .../impl/NamedConstructorArgsTest.java | 4 +- .../xbean/spring/example/BeerService.java | 4 +- .../xbean/spring/example/FavoriteService.java | 6 +- .../xbean/spring/example/GinService.java | 4 +- .../xbean/spring/example/PizzaService.java | 6 +- .../spring/example/RestaurantService.java | 6 +- .../xbean/spring/example/SaladService.java | 8 +- .../xbean/spring/example/SoupService.java | 10 +- .../xbean/spring/example/VodkaService.java | 4 +- .../xbean/spring/example/WineService.java | 4 +- .../xbean/spring/generator/ModelTest.java | 8 +- .../xbean/spring/jndi/DefaultContextTest.java | 2 +- .../xbean/spring/jndi/JndiTest.java | 8 +- .../http/xbean.org/schemas/pizza-simple | 10 - .../spring/http/xbean.org/schemas/restaurant | 17 -- .../xbean/spring/http/xbean.org/schemas/salad | 15 -- .../xbean/spring/http/xbean.org/schemas/soup | 17 -- .../xbean/spring/context/beer-normal.xml | 2 +- .../xbean/spring/context/beer-xbean.xml | 2 +- .../xbean/spring/context/favorite-normal.xml | 14 +- .../xbean/spring/context/favorite-xbean.xml | 10 +- .../{ => apache}/xbean/spring/context/gin.xml | 2 +- .../xbean/spring/context/pizza-normal.xml | 2 +- .../spring/context/pizza-xbean-bean-ref.xml | 2 +- .../xbean/spring/context/pizza-xbean-java.xml | 2 +- .../spring/context/pizza-xbean-properties.xml | 2 +- .../xbean/spring/context/pizza-xbean.xml | 2 +- .../spring/context/restaurant-normal.xml | 20 +- .../context/restaurant-spring-extended.xml | 10 +- .../spring/context/restaurant-xbean-mixed.xml | 8 +- .../spring/context/restaurant-xbean-root.xml | 2 +- .../context/restaurant-xbean-simple.xml | 2 +- .../xbean/spring/context/restaurant-xbean.xml | 2 +- .../xbean/spring/context/salad-normal.xml | 2 +- .../xbean/spring/context/salad-xbean.xml | 2 +- .../xbean/spring/context/soup-normal.xml | 2 +- .../xbean/spring/context/soup-xbean.xml | 2 +- .../xbean/spring/context/vodka-normal.xml | 4 +- .../xbean/spring/context/vodka-xbean.xml | 8 +- .../xbean/spring/context/wine-normal.xml | 2 +- .../xbean/spring/context/wine-xbean.xml | 2 +- .../{ => apache}/xbean/spring/jndi/jndi.xml | 4 +- .../{ => apache}/xbean/spring/jndi/spring.xml | 4 +- telnet/LICENSE.txt | 203 ++++++++++++++++++ telnet/NOTICE.txt | 3 + telnet/pom.xml | 4 +- .../{ => apache}/xbean/command/Command.java | 2 +- .../xbean/command/CommandRegistry.java | 2 +- .../xbean/command/CommandShell.java | 2 +- .../org/{ => apache}/xbean/command/Exit.java | 2 +- .../{ => apache}/xbean/command/GroovySh.java | 2 +- .../org/{ => apache}/xbean/command/Help.java | 2 +- .../{ => apache}/xbean/command/Lookup.java | 2 +- .../org/{ => apache}/xbean/command/Test.java | 2 +- .../{ => apache}/xbean/command/Version.java | 2 +- .../xbean/terminal/console/Main.java | 4 +- .../xbean/terminal/telnet/TelnetCodes.java | 2 +- .../xbean/terminal/telnet/TelnetDaemon.java | 2 +- .../terminal/telnet/TelnetInputStream.java | 2 +- .../xbean/terminal/telnet/TelnetOption.java | 2 +- .../terminal/telnet/TelnetPrintStream.java | 2 +- .../xbean/terminal/telnet/TelnetShell.java | 4 +- .../xbean/telnet/TelnetShellTest.java | 8 +- 307 files changed, 2744 insertions(+), 931 deletions(-) create mode 100644 LICENSE.txt create mode 100644 NOTICE.txt create mode 100644 classpath/LICENSE.txt create mode 100644 classpath/NOTICE.txt rename classpath/src/main/java/org/{ => apache}/xbean/classpath/ClassPath.java (95%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/ClassPathFactory.java (97%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/ContextClassPath.java (97%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/SunURLClassPath.java (98%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/SystemClassPath.java (98%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/TomcatClassPath.java (99%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/TomcatWebAppClassPath.java (96%) rename classpath/src/main/java/org/{ => apache}/xbean/classpath/maven/MavenResolver.java (94%) rename classpath/src/test/java/org/{ => apache}/xbean/classpath/SystemClassPathTest.java (96%) create mode 100644 jmx/LICENSE.txt create mode 100644 jmx/NOTICE.txt rename jmx/src/main/java/org/{ => apache}/xbean/jmx/BeanPairing.java (83%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/EventAdapter.java (92%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/JMXException.java (85%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/JMXServiceException.java (87%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/JMXStrategyFinder.java (91%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/JMXWrappingStrategy.java (81%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/MBeanExporter.java (88%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/MBeanHolder.java (89%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/MBeanInfoGenerator.java (84%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java (87%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/config/JMXServiceConfig.java (86%) rename jmx/src/main/java/org/{ => apache}/xbean/jmx/strategies/JavaBeanWrappingStrategy.java (77%) create mode 100644 jmx/src/main/resources/META-INF/org.apache.xbean.jmx.StrategyFinder/javabean delete mode 100644 jmx/src/main/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean rename jmx/src/test/java/org/{ => apache}/xbean/jmx/DummyMBeanInfoGenerator.java (86%) rename jmx/src/test/java/org/{ => apache}/xbean/jmx/JMXService.java (91%) rename jmx/src/test/java/org/{ => apache}/xbean/jmx/JMXStrategyFinderTest.java (82%) rename jmx/src/test/java/org/{ => apache}/xbean/jmx/JMXTest.java (91%) rename jmx/src/test/resources/org/{ => apache}/xbean/jmx/jmx-custom-assembler.xml (53%) rename jmx/src/test/resources/org/{ => apache}/xbean/jmx/jmx-listener-multiple.xml (75%) rename jmx/src/test/resources/org/{ => apache}/xbean/jmx/jmx-listener.xml (71%) rename jmx/src/test/resources/org/{ => apache}/xbean/jmx/jmx-simple-multiple.xml (65%) rename jmx/src/test/resources/org/{ => apache}/xbean/jmx/jmx-simple.xml (68%) rename jmx/src/test/resources/org/{ => apache}/xbean/jmx/jmx.xml (78%) create mode 100644 kernel/LICENSE.txt create mode 100644 kernel/NOTICE.txt rename kernel/src/main/java/org/{ => apache}/xbean/kernel/AbstractServiceFactory.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ForcedStopException.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/IllegalServiceStateException.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/InvalidServiceTypeException.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/Kernel.java (99%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelAlreadyExistsException.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelErrorsError.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelFactory.java (94%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelFactoryError.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelMonitor.java (91%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelOperationInterruptedException.java (96%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/KernelOperationTimoutException.java (96%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/NullServiceMonitor.java (94%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/RunningServiceCondition.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceAlreadyExistsException.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceCondition.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceConditionContext.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceContext.java (91%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceContextThreadLocal.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceEvent.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceFactory.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceMonitor.java (96%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceName.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceNotFoundException.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceRegistrationException.java (93%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/ServiceState.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StartStrategies.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StartStrategy.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StaticServiceFactory.java (94%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StopStrategies.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StopStrategy.java (93%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StoppedServiceCondition.java (96%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/StringServiceName.java (93%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/UnregisterServiceException.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/UnsatisfiedConditionsException.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/package.html (100%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/AggregateCondition.java (96%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/AsyncServiceMonitor.java (94%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/KernelMonitorBroadcaster.java (88%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/NonRestartableStopCondition.java (91%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/RegistryFutureTask.java (95%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/ServiceManager.java (96%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/ServiceManagerFactory.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/ServiceManagerRegistry.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/ServiceMonitorBroadcaster.java (97%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/StandardKernel.java (94%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/StandardKernelFactory.java (82%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/StandardServiceConditionContext.java (92%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/StandardServiceContext.java (85%) rename kernel/src/main/java/org/{ => apache}/xbean/kernel/standard/package.html (100%) rename kernel/src/main/java/org/{ => apache}/xbean/rmi/RMIClassLoaderSpiImpl.java (94%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/KernelMonitorBroadcasterTest.java (95%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/ServiceStateTest.java (97%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/StaticServiceFactoryTest.java (98%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/StringServiceNameTest.java (94%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/standard/ServiceManagerRegistryTest.java (97%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/standard/ServiceManagerTest.java (98%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/standard/ServiceMonitorBroadcasterTest.java (97%) rename kernel/src/test/java/org/{ => apache}/xbean/kernel/standard/StandardKernelTest.java (94%) create mode 100644 osgi/LICENSE.txt create mode 100644 osgi/NOTICE.txt rename osgi/src/main/java/org/{ => apache}/xbean/osgi/Artifact.java (86%) rename osgi/src/main/java/org/{ => apache}/xbean/osgi/BundleClassLoader.java (91%) rename osgi/src/main/java/org/{ => apache}/xbean/osgi/Dependency.java (91%) rename osgi/src/main/java/org/{ => apache}/xbean/osgi/MavenBundleManager.java (98%) rename osgi/src/main/java/org/{ => apache}/xbean/osgi/Project.java (94%) rename osgi/src/test/java/org/{ => apache}/xbean/osgi/OSGiTest.java (90%) create mode 100644 sca/LICENSE.txt create mode 100644 sca/NOTICE.txt rename sca/src/main/java/org/{ => apache}/xbean/sca/IntrospectionSupport.java (99%) rename sca/src/main/java/org/{ => apache}/xbean/sca/ScaAdapter.java (97%) rename sca/src/main/java/org/{ => apache}/xbean/sca/ScaBeanPostProcessor.java (99%) rename sca/src/main/java/org/{ => apache}/xbean/sca/impl/DefaultComponent.java (98%) rename sca/src/main/java/org/{ => apache}/xbean/sca/impl/DefaultScaAdapter.java (96%) rename sca/src/test/java/org/{ => apache}/xbean/sca/FieldInjectionPojo.java (97%) rename sca/src/test/java/org/{ => apache}/xbean/sca/FieldInjectionTest.java (90%) rename sca/src/test/java/org/{ => apache}/xbean/sca/LifecyclePojo.java (97%) rename sca/src/test/java/org/{ => apache}/xbean/sca/LifecycleTest.java (93%) rename sca/src/test/java/org/{ => apache}/xbean/sca/MandatoryPropertyPojo.java (97%) rename sca/src/test/java/org/{ => apache}/xbean/sca/MandatoryReferencePojo.java (97%) rename sca/src/test/java/org/{ => apache}/xbean/sca/MissingPropertyTest.java (93%) rename sca/src/test/java/org/{ => apache}/xbean/sca/MissingReferenceTest.java (93%) rename sca/src/test/java/org/{ => apache}/xbean/sca/PropertyInjectionPojo.java (97%) rename sca/src/test/java/org/{ => apache}/xbean/sca/PropertyInjectionTest.java (90%) rename sca/src/test/java/org/{ => apache}/xbean/sca/PropertyTest.java (91%) rename sca/src/test/java/org/{ => apache}/xbean/sca/SpringTestSupport.java (98%) rename sca/src/test/resources/org/{ => apache}/xbean/sca/field-injection.xml (62%) rename sca/src/test/resources/org/{ => apache}/xbean/sca/lifecycle.xml (63%) rename sca/src/test/resources/org/{ => apache}/xbean/sca/missing-property.xml (63%) rename sca/src/test/resources/org/{ => apache}/xbean/sca/missing-reference.xml (63%) rename sca/src/test/resources/org/{ => apache}/xbean/sca/property-injection.xml (62%) rename sca/src/test/resources/org/{ => apache}/xbean/sca/property.xml (70%) create mode 100644 server/LICENSE.txt create mode 100644 server/NOTICE.txt rename server/src/main/java/org/{ => apache}/xbean/server/classloader/ClassLoaderUtil.java (96%) rename server/src/main/java/org/{ => apache}/xbean/server/classloader/DestroyableClassLoader.java (88%) rename server/src/main/java/org/{ => apache}/xbean/server/classloader/JarFileClassLoader.java (99%) rename server/src/main/java/org/{ => apache}/xbean/server/classloader/MultiParentClassLoader.java (98%) rename server/src/main/java/org/{ => apache}/xbean/server/classloader/NamedClassLoader.java (95%) rename server/src/main/java/org/{ => apache}/xbean/server/loader/LoadAllMain.java (88%) rename server/src/main/java/org/{ => apache}/xbean/server/loader/Loader.java (87%) rename server/src/main/java/org/{ => apache}/xbean/server/main/FatalStartupError.java (95%) rename server/src/main/java/org/{ => apache}/xbean/server/main/KernelMain.java (93%) rename server/src/main/java/org/{ => apache}/xbean/server/main/Main.java (88%) rename server/src/main/java/org/{ => apache}/xbean/server/propertyeditor/InetAddressEditor.java (93%) rename server/src/main/java/org/{ => apache}/xbean/server/propertyeditor/ObjectNameEditor.java (93%) rename server/src/main/java/org/{ => apache}/xbean/server/propertyeditor/URIEditor.java (93%) rename server/src/main/java/org/{ => apache}/xbean/server/repository/FileSystemRepository.java (92%) rename server/src/main/java/org/{ => apache}/xbean/server/repository/Repository.java (88%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/configuration/ClassLoaderXmlPreprocessor.java (89%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/configuration/SpringConfiguration.java (90%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java (92%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/loader/SpringLoader.java (88%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/main/SpringBootstrap.java (94%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/reference/ClassLoaderReference.java (88%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/reference/KernelReference.java (86%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/reference/ServiceNameReference.java (86%) rename server/src/main/java/org/{ => apache}/xbean/server/spring/reference/ServiceNameStringReference.java (88%) rename server/src/test/java/org/{ => apache}/xbean/server/classloader/JarFileClassLoaderTest.java (87%) rename server/src/test/java/org/{ => apache}/xbean/server/classloader/MultiParentClassLoaderTest.java (99%) rename server/src/test/java/org/{ => apache}/xbean/server/spring/loader/SpringLoaderTest.java (90%) rename server/src/test/java/org/{ => apache}/xbean/server/spring/main/SpringBootstrapTest.java (91%) rename server/src/test/resources/org/{ => apache}/xbean/server/spring/loader/classpath-xbean.xml (75%) create mode 100644 spring/LICENSE.txt create mode 100644 spring/NOTICE.txt rename spring/src/main/java/org/{ => apache}/xbean/spring/context/ClassPathXmlApplicationContext.java (98%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/FileSystemXmlApplicationContext.java (98%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/ResourceXmlApplicationContext.java (96%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/SpringApplicationContext.java (95%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/SpringXmlPreprocessor.java (91%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/XmlWebApplicationContext.java (95%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/DefaultProperty.java (94%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/MappingMetaData.java (99%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/NamedConstructorArgs.java (99%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/NamespaceHelper.java (95%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/ObjectNameEditor.java (96%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/PropertyEditorHelper.java (89%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/QNameHelper.java (99%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/QNameReflectionHelper.java (93%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/QNameReflectionParams.java (97%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/URIEditor.java (96%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/XBeanXmlBeanDefinitionParser.java (99%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/XBeanXmlBeanDefinitionReader.java (93%) rename spring/src/main/java/org/{ => apache}/xbean/spring/context/impl/XBeanXmlBeanFactory.java (93%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/AttributeMapping.java (95%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/DocumentationGenerator.java (98%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/ElementMapping.java (97%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/GeneratorPlugin.java (85%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/InvalidModelException.java (85%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/LogFacade.java (68%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/MapMapping.java (85%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/MappingGeneratorTask.java (97%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/MappingLoader.java (85%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/NamespaceMapping.java (94%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/QdoxMappingLoader.java (94%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/SchemaGenerator.java (97%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/Type.java (95%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/Utils.java (94%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/XmlMetadataGenerator.java (96%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/XmlWriter.java (97%) rename spring/src/main/java/org/{ => apache}/xbean/spring/generator/XsdGenerator.java (97%) rename spring/src/main/java/org/{ => apache}/xbean/spring/jndi/DefaultContext.java (96%) create mode 100644 spring/src/main/java/org/apache/xbean/spring/jndi/NameParserImpl.java rename spring/src/main/java/org/{ => apache}/xbean/spring/jndi/SpringInitialContextFactory.java (94%) rename spring/src/main/java/org/{ => apache}/xbean/spring/util/AbstractSpringVisitor.java (98%) rename spring/src/main/java/org/{ => apache}/xbean/spring/util/SpringVisitor.java (95%) delete mode 100644 spring/src/main/java/org/xbean/spring/jndi/NameParserImpl.java rename spring/src/main/resources/org/{ => apache}/xbean/spring/spring-beans.xsd (97%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/BeerUsingSpringTest.java (79%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/BeerUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/FavoriteUsingSpringTest.java (80%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/FavoriteUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/GinUsingSpringTest.java (79%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/PizzaUsingSpringTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/PizzaUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/PizzaUsingXBeanWinBeanRefTest.java (85%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/PizzaUsingXBeanWithJavaNamespaceTest.java (84%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/PizzaUsingXBeanWithPropertiesTextNodeTest.java (85%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingResourceXmlApplicationContextTest.java (91%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingSpringExtendedTest.java (80%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingSpringTest.java (91%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingXBeanAsRootTest.java (59%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingXBeanMixedTest.java (85%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingXBeanTest.java (90%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/RestaurantUsingXBeanWithSimplerConfigTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/SaladUsingSpringTest.java (80%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/SaladUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/SoupUsingSpringTest.java (81%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/SoupUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/SpringTestSupport.java (97%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/VodkaUsingSpringTest.java (81%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/VodkaUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/WineUsingSpringTest.java (79%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/WineUsingXBeanTest.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/context/impl/NamedConstructorArgsTest.java (96%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/BeerService.java (90%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/FavoriteService.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/GinService.java (90%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/PizzaService.java (93%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/RestaurantService.java (89%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/SaladService.java (86%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/SoupService.java (90%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/VodkaService.java (94%) rename spring/src/test/java/org/{ => apache}/xbean/spring/example/WineService.java (92%) rename spring/src/test/java/org/{ => apache}/xbean/spring/generator/ModelTest.java (92%) rename spring/src/test/java/org/{ => apache}/xbean/spring/jndi/DefaultContextTest.java (94%) rename spring/src/test/java/org/{ => apache}/xbean/spring/jndi/JndiTest.java (88%) delete mode 100644 spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/pizza-simple delete mode 100644 spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/restaurant delete mode 100644 spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/salad delete mode 100644 spring/src/test/resources/META-INF/services/org/xbean/spring/http/xbean.org/schemas/soup rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/beer-normal.xml (76%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/beer-xbean.xml (59%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/favorite-normal.xml (79%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/favorite-xbean.xml (70%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/gin.xml (73%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/pizza-normal.xml (78%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/pizza-xbean-bean-ref.xml (84%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/pizza-xbean-java.xml (76%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/pizza-xbean-properties.xml (79%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/pizza-xbean.xml (76%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/restaurant-normal.xml (79%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/restaurant-spring-extended.xml (76%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/restaurant-xbean-mixed.xml (66%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/restaurant-xbean-root.xml (74%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/restaurant-xbean-simple.xml (84%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/restaurant-xbean.xml (75%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/salad-normal.xml (79%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/salad-xbean.xml (76%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/soup-normal.xml (80%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/soup-xbean.xml (73%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/vodka-normal.xml (61%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/vodka-xbean.xml (57%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/wine-normal.xml (76%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/context/wine-xbean.xml (72%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/jndi/jndi.xml (70%) rename spring/src/test/resources/org/{ => apache}/xbean/spring/jndi/spring.xml (68%) create mode 100644 telnet/LICENSE.txt create mode 100644 telnet/NOTICE.txt rename telnet/src/main/java/org/{ => apache}/xbean/command/Command.java (96%) rename telnet/src/main/java/org/{ => apache}/xbean/command/CommandRegistry.java (98%) rename telnet/src/main/java/org/{ => apache}/xbean/command/CommandShell.java (99%) rename telnet/src/main/java/org/{ => apache}/xbean/command/Exit.java (96%) rename telnet/src/main/java/org/{ => apache}/xbean/command/GroovySh.java (98%) rename telnet/src/main/java/org/{ => apache}/xbean/command/Help.java (97%) rename telnet/src/main/java/org/{ => apache}/xbean/command/Lookup.java (99%) rename telnet/src/main/java/org/{ => apache}/xbean/command/Test.java (97%) rename telnet/src/main/java/org/{ => apache}/xbean/command/Version.java (97%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/console/Main.java (70%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/telnet/TelnetCodes.java (98%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/telnet/TelnetDaemon.java (98%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/telnet/TelnetInputStream.java (99%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/telnet/TelnetOption.java (93%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/telnet/TelnetPrintStream.java (97%) rename telnet/src/main/java/org/{ => apache}/xbean/terminal/telnet/TelnetShell.java (92%) rename telnet/src/test/java/org/{ => apache}/xbean/telnet/TelnetShellTest.java (85%) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..6b0b1270 --- /dev/null +++ b/LICENSE.txt @@ -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. + diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 00000000..439eb83b --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/classpath/LICENSE.txt b/classpath/LICENSE.txt new file mode 100644 index 00000000..6b0b1270 --- /dev/null +++ b/classpath/LICENSE.txt @@ -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. + diff --git a/classpath/NOTICE.txt b/classpath/NOTICE.txt new file mode 100644 index 00000000..439eb83b --- /dev/null +++ b/classpath/NOTICE.txt @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/classpath/pom.xml b/classpath/pom.xml index c0551c3a..b0bfaea9 100644 --- a/classpath/pom.xml +++ b/classpath/pom.xml @@ -1,7 +1,7 @@ xbean - org.xbean + org.apache.xbean 2.2-SNAPSHOT 4.0.0 diff --git a/classpath/src/main/java/org/xbean/classpath/ClassPath.java b/classpath/src/main/java/org/apache/xbean/classpath/ClassPath.java similarity index 95% rename from classpath/src/main/java/org/xbean/classpath/ClassPath.java rename to classpath/src/main/java/org/apache/xbean/classpath/ClassPath.java index f359bcbe..fb489d3f 100644 --- a/classpath/src/main/java/org/xbean/classpath/ClassPath.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/ClassPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; import java.io.File; import java.net.URL; diff --git a/classpath/src/main/java/org/xbean/classpath/ClassPathFactory.java b/classpath/src/main/java/org/apache/xbean/classpath/ClassPathFactory.java similarity index 97% rename from classpath/src/main/java/org/xbean/classpath/ClassPathFactory.java rename to classpath/src/main/java/org/apache/xbean/classpath/ClassPathFactory.java index c18a0d9f..85afc1c3 100644 --- a/classpath/src/main/java/org/xbean/classpath/ClassPathFactory.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/ClassPathFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; public class ClassPathFactory { public static ClassPath createClassPath(String name){ diff --git a/classpath/src/main/java/org/xbean/classpath/ContextClassPath.java b/classpath/src/main/java/org/apache/xbean/classpath/ContextClassPath.java similarity index 97% rename from classpath/src/main/java/org/xbean/classpath/ContextClassPath.java rename to classpath/src/main/java/org/apache/xbean/classpath/ContextClassPath.java index add08884..02964d5a 100644 --- a/classpath/src/main/java/org/xbean/classpath/ContextClassPath.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/ContextClassPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; import java.io.File; import java.net.URLClassLoader; diff --git a/classpath/src/main/java/org/xbean/classpath/SunURLClassPath.java b/classpath/src/main/java/org/apache/xbean/classpath/SunURLClassPath.java similarity index 98% rename from classpath/src/main/java/org/xbean/classpath/SunURLClassPath.java rename to classpath/src/main/java/org/apache/xbean/classpath/SunURLClassPath.java index 06c68179..0847baf5 100644 --- a/classpath/src/main/java/org/xbean/classpath/SunURLClassPath.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/SunURLClassPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; import java.io.File; import java.net.URL; diff --git a/classpath/src/main/java/org/xbean/classpath/SystemClassPath.java b/classpath/src/main/java/org/apache/xbean/classpath/SystemClassPath.java similarity index 98% rename from classpath/src/main/java/org/xbean/classpath/SystemClassPath.java rename to classpath/src/main/java/org/apache/xbean/classpath/SystemClassPath.java index a23129f8..4739e14e 100644 --- a/classpath/src/main/java/org/xbean/classpath/SystemClassPath.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/SystemClassPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; import java.net.URLClassLoader; import java.net.URL; diff --git a/classpath/src/main/java/org/xbean/classpath/TomcatClassPath.java b/classpath/src/main/java/org/apache/xbean/classpath/TomcatClassPath.java similarity index 99% rename from classpath/src/main/java/org/xbean/classpath/TomcatClassPath.java rename to classpath/src/main/java/org/apache/xbean/classpath/TomcatClassPath.java index 8265bd50..b1675099 100644 --- a/classpath/src/main/java/org/xbean/classpath/TomcatClassPath.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/TomcatClassPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; import java.io.File; import java.lang.reflect.Method; diff --git a/classpath/src/main/java/org/xbean/classpath/TomcatWebAppClassPath.java b/classpath/src/main/java/org/apache/xbean/classpath/TomcatWebAppClassPath.java similarity index 96% rename from classpath/src/main/java/org/xbean/classpath/TomcatWebAppClassPath.java rename to classpath/src/main/java/org/apache/xbean/classpath/TomcatWebAppClassPath.java index f67304dc..d9d1cb82 100644 --- a/classpath/src/main/java/org/xbean/classpath/TomcatWebAppClassPath.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/TomcatWebAppClassPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath; +package org.apache.xbean.classpath; public class TomcatWebAppClassPath extends TomcatClassPath { diff --git a/classpath/src/main/java/org/xbean/classpath/maven/MavenResolver.java b/classpath/src/main/java/org/apache/xbean/classpath/maven/MavenResolver.java similarity index 94% rename from classpath/src/main/java/org/xbean/classpath/maven/MavenResolver.java rename to classpath/src/main/java/org/apache/xbean/classpath/maven/MavenResolver.java index bf47e9c0..dc0ddb08 100644 --- a/classpath/src/main/java/org/xbean/classpath/maven/MavenResolver.java +++ b/classpath/src/main/java/org/apache/xbean/classpath/maven/MavenResolver.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.classpath.maven; +package org.apache.xbean.classpath.maven; import java.net.URL; diff --git a/classpath/src/test/java/org/xbean/classpath/SystemClassPathTest.java b/classpath/src/test/java/org/apache/xbean/classpath/SystemClassPathTest.java similarity index 96% rename from classpath/src/test/java/org/xbean/classpath/SystemClassPathTest.java rename to classpath/src/test/java/org/apache/xbean/classpath/SystemClassPathTest.java index 33b56162..9ed78e39 100644 --- a/classpath/src/test/java/org/xbean/classpath/SystemClassPathTest.java +++ b/classpath/src/test/java/org/apache/xbean/classpath/SystemClassPathTest.java @@ -1,4 +1,4 @@ -package org.xbean.classpath; +package org.apache.xbean.classpath; /** * @version $Revision$ $Date$ diff --git a/jmx/LICENSE.txt b/jmx/LICENSE.txt new file mode 100644 index 00000000..6b0b1270 --- /dev/null +++ b/jmx/LICENSE.txt @@ -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. + diff --git a/jmx/NOTICE.txt b/jmx/NOTICE.txt new file mode 100644 index 00000000..439eb83b --- /dev/null +++ b/jmx/NOTICE.txt @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/jmx/pom.xml b/jmx/pom.xml index 7f1d5cd3..47f573ba 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -1,7 +1,7 @@ xbean - org.xbean + org.apache.xbean 2.2-SNAPSHOT @@ -31,13 +31,13 @@ - + - + @@ -67,11 +67,11 @@ livetribe-jmx - org.xbean + org.apache.xbean xbean-kernel - org.xbean + org.apache.xbean xbean-spring diff --git a/jmx/src/main/java/org/xbean/jmx/BeanPairing.java b/jmx/src/main/java/org/apache/xbean/jmx/BeanPairing.java similarity index 83% rename from jmx/src/main/java/org/xbean/jmx/BeanPairing.java rename to jmx/src/main/java/org/apache/xbean/jmx/BeanPairing.java index 12b26eda..b13a49df 100644 --- a/jmx/src/main/java/org/xbean/jmx/BeanPairing.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/BeanPairing.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import javax.management.MBeanInfo; import javax.management.ObjectName; @@ -22,14 +22,14 @@ /** * @version $Revision: $ $Date: $ - * @org.xbean.XBean element="beanPairing" + * @org.apache.xbean.XBean element="beanPairing" */ public class BeanPairing { private Class beanClass; private Class generatorClass; /** - * @org.xbean.Property alias="beanClass" + * @org.apache.xbean.Property alias="beanClass" */ public void setBeanClass(Class beanClass) { this.beanClass = beanClass; @@ -40,7 +40,7 @@ public Class getBeanClass() { } /** - * @org.xbean.Property alias="generatorClass" + * @org.apache.xbean.Property alias="generatorClass" */ public void setGeneratorClass(Class generatorClass) { this.generatorClass = generatorClass; diff --git a/jmx/src/main/java/org/xbean/jmx/EventAdapter.java b/jmx/src/main/java/org/apache/xbean/jmx/EventAdapter.java similarity index 92% rename from jmx/src/main/java/org/xbean/jmx/EventAdapter.java rename to jmx/src/main/java/org/apache/xbean/jmx/EventAdapter.java index 0c1c9d09..1a83b107 100644 --- a/jmx/src/main/java/org/xbean/jmx/EventAdapter.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/EventAdapter.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -25,7 +25,7 @@ /** * @version $Revision: $ $Date: $ - * @org.xbean.XBean element="listen" + * @org.apache.xbean.XBean element="listen" */ public class EventAdapter { private Object bean; @@ -39,7 +39,7 @@ public void setBean(Object bean) { } /** - * @org.xbean.Property alias="listener" + * @org.apache.xbean.Property alias="listener" */ public void setListenerClass(Class listenerClass) { this.listenerClass = listenerClass; diff --git a/jmx/src/main/java/org/xbean/jmx/JMXException.java b/jmx/src/main/java/org/apache/xbean/jmx/JMXException.java similarity index 85% rename from jmx/src/main/java/org/xbean/jmx/JMXException.java rename to jmx/src/main/java/org/apache/xbean/jmx/JMXException.java index e7c40ff8..60586814 100644 --- a/jmx/src/main/java/org/xbean/jmx/JMXException.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/JMXException.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; /** * @version $Revision: $ $Date: $ diff --git a/jmx/src/main/java/org/xbean/jmx/JMXServiceException.java b/jmx/src/main/java/org/apache/xbean/jmx/JMXServiceException.java similarity index 87% rename from jmx/src/main/java/org/xbean/jmx/JMXServiceException.java rename to jmx/src/main/java/org/apache/xbean/jmx/JMXServiceException.java index 4d4fa31d..5add5587 100644 --- a/jmx/src/main/java/org/xbean/jmx/JMXServiceException.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/JMXServiceException.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; /** diff --git a/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java b/jmx/src/main/java/org/apache/xbean/jmx/JMXStrategyFinder.java similarity index 91% rename from jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java rename to jmx/src/main/java/org/apache/xbean/jmx/JMXStrategyFinder.java index a042c5ec..aab52ad0 100644 --- a/jmx/src/main/java/org/xbean/jmx/JMXStrategyFinder.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/JMXStrategyFinder.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import java.io.BufferedInputStream; import java.io.IOException; @@ -28,7 +28,7 @@ */ public class JMXStrategyFinder { - private final static String PROPERTY_NAME = "org.xbean.jmx.WrapperStrategyClass"; + private final static String PROPERTY_NAME = "org.apache.xbean.jmx.WrapperStrategyClass"; private final String path; private final WeakHashMap classCache = new WeakHashMap(); diff --git a/jmx/src/main/java/org/xbean/jmx/JMXWrappingStrategy.java b/jmx/src/main/java/org/apache/xbean/jmx/JMXWrappingStrategy.java similarity index 81% rename from jmx/src/main/java/org/xbean/jmx/JMXWrappingStrategy.java rename to jmx/src/main/java/org/apache/xbean/jmx/JMXWrappingStrategy.java index e88c143d..61e27677 100644 --- a/jmx/src/main/java/org/xbean/jmx/JMXWrappingStrategy.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/JMXWrappingStrategy.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; -import org.xbean.jmx.config.JMXServiceConfig; +import org.apache.xbean.jmx.config.JMXServiceConfig; /** diff --git a/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java b/jmx/src/main/java/org/apache/xbean/jmx/MBeanExporter.java similarity index 88% rename from jmx/src/main/java/org/xbean/jmx/MBeanExporter.java rename to jmx/src/main/java/org/apache/xbean/jmx/MBeanExporter.java index b2228a02..d1214cb6 100644 --- a/jmx/src/main/java/org/xbean/jmx/MBeanExporter.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/MBeanExporter.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import java.util.HashMap; import java.util.Iterator; @@ -27,14 +27,14 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import org.xbean.jmx.assembler.JavaBeanMBeanInfoGenerator; +import org.apache.xbean.jmx.assembler.JavaBeanMBeanInfoGenerator; /** * Exports services to an MBeanServer for management. * * @version $Revision: $ $Date: $ - * @org.xbean.XBean element="export" + * @org.apache.xbean.XBean element="export" */ public class MBeanExporter { private MBeanServer mbeanServer; @@ -44,7 +44,7 @@ public class MBeanExporter { private Map registeredMBeans = new HashMap(); /** - * @org.xbean.Property alias="mbeanserver" + * @org.apache.xbean.Property alias="mbeanserver" */ public void setMbeanServer(MBeanServer mbeanServer) { this.mbeanServer = mbeanServer; @@ -55,7 +55,7 @@ public MBeanServer getMbeanServer() { } /** - * @org.xbean.Property alias="mbeaninfos" + * @org.apache.xbean.Property alias="mbeaninfos" */ public void setMbeanInfos(List mbeanInfos) { this.mbeanInfos = mbeanInfos; @@ -66,7 +66,7 @@ public List getMbeanInfos() { } /** - * @org.xbean.Property alias="mbeans" + * @org.apache.xbean.Property alias="mbeans" */ public void setMbeans(List mbeans) { this.mbeans = mbeans; @@ -85,7 +85,7 @@ public List getConnectors() { } /** - * @org.xbean.InitMethod + * @org.apache.xbean.InitMethod */ public void start() { try { @@ -108,7 +108,7 @@ public void start() { } /** - * @org.xbean.DestroyMethod + * @org.apache.xbean.DestroyMethod */ public void stop() { MBeanServer server = findMBeanServer(); diff --git a/jmx/src/main/java/org/xbean/jmx/MBeanHolder.java b/jmx/src/main/java/org/apache/xbean/jmx/MBeanHolder.java similarity index 89% rename from jmx/src/main/java/org/xbean/jmx/MBeanHolder.java rename to jmx/src/main/java/org/apache/xbean/jmx/MBeanHolder.java index 4017195f..cdc7f052 100644 --- a/jmx/src/main/java/org/xbean/jmx/MBeanHolder.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/MBeanHolder.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -28,7 +28,7 @@ /** * @version $Revision: $ $Date: $ - * @org.xbean.XBean element="mbean" + * @org.apache.xbean.XBean element="mbean" */ public class MBeanHolder { private Object bean; @@ -45,7 +45,7 @@ public Object getBean() { } /** - * @org.xbean.Property alias="objectname" + * @org.apache.xbean.Property alias="objectname" */ public void setObjectName(String objectName) { this.objectName = objectName; @@ -64,7 +64,7 @@ private Class getMbeanClass() { } /** - * @org.xbean.Property alias="listeners" + * @org.apache.xbean.Property alias="listeners" */ public void setEventAdapters(List adapters) { this.eventAdapters = adapters; diff --git a/jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java b/jmx/src/main/java/org/apache/xbean/jmx/MBeanInfoGenerator.java similarity index 84% rename from jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java rename to jmx/src/main/java/org/apache/xbean/jmx/MBeanInfoGenerator.java index c87597d2..6187ccef 100644 --- a/jmx/src/main/java/org/xbean/jmx/MBeanInfoGenerator.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/MBeanInfoGenerator.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import javax.management.MBeanInfo; import javax.management.ObjectName; diff --git a/jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java b/jmx/src/main/java/org/apache/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java similarity index 87% rename from jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java rename to jmx/src/main/java/org/apache/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java index 93755634..5eb652b2 100644 --- a/jmx/src/main/java/org/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/assembler/JavaBeanMBeanInfoGenerator.java @@ -1,4 +1,4 @@ -package org.xbean.jmx.assembler; +package org.apache.xbean.jmx.assembler; import javax.management.MBeanAttributeInfo; import javax.management.MBeanConstructorInfo; @@ -7,7 +7,7 @@ import javax.management.ObjectName; import org.livetribe.jmx.MBeanUtils; -import org.xbean.jmx.MBeanInfoGenerator; +import org.apache.xbean.jmx.MBeanInfoGenerator; /** diff --git a/jmx/src/main/java/org/xbean/jmx/config/JMXServiceConfig.java b/jmx/src/main/java/org/apache/xbean/jmx/config/JMXServiceConfig.java similarity index 86% rename from jmx/src/main/java/org/xbean/jmx/config/JMXServiceConfig.java rename to jmx/src/main/java/org/apache/xbean/jmx/config/JMXServiceConfig.java index 4edef771..7fa3bff9 100644 --- a/jmx/src/main/java/org/xbean/jmx/config/JMXServiceConfig.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/config/JMXServiceConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx.config; +package org.apache.xbean.jmx.config; import javax.management.ObjectName; diff --git a/jmx/src/main/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java b/jmx/src/main/java/org/apache/xbean/jmx/strategies/JavaBeanWrappingStrategy.java similarity index 77% rename from jmx/src/main/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java rename to jmx/src/main/java/org/apache/xbean/jmx/strategies/JavaBeanWrappingStrategy.java index 475c09ad..ea5358b0 100644 --- a/jmx/src/main/java/org/xbean/jmx/strategies/JavaBeanWrappingStrategy.java +++ b/jmx/src/main/java/org/apache/xbean/jmx/strategies/JavaBeanWrappingStrategy.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx.strategies; +package org.apache.xbean.jmx.strategies; -import org.xbean.jmx.JMXException; -import org.xbean.jmx.JMXWrappingStrategy; -import org.xbean.jmx.config.JMXServiceConfig; +import org.apache.xbean.jmx.JMXException; +import org.apache.xbean.jmx.JMXWrappingStrategy; +import org.apache.xbean.jmx.config.JMXServiceConfig; /** diff --git a/jmx/src/main/resources/META-INF/org.apache.xbean.jmx.StrategyFinder/javabean b/jmx/src/main/resources/META-INF/org.apache.xbean.jmx.StrategyFinder/javabean new file mode 100644 index 00000000..b1f5c287 --- /dev/null +++ b/jmx/src/main/resources/META-INF/org.apache.xbean.jmx.StrategyFinder/javabean @@ -0,0 +1 @@ +org.apache.xbean.jmx.WrapperStrategyClass=org.apache.xbean.jmx.strategies.JavaBeanWrappingStrategy \ No newline at end of file diff --git a/jmx/src/main/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean b/jmx/src/main/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean deleted file mode 100644 index 7afd7c62..00000000 --- a/jmx/src/main/resources/META-INF/org.xbean.jmx.StrategyFinder/javabean +++ /dev/null @@ -1 +0,0 @@ -org.xbean.jmx.WrapperStrategyClass=org.xbean.jmx.strategies.JavaBeanWrappingStrategy \ No newline at end of file diff --git a/jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java b/jmx/src/test/java/org/apache/xbean/jmx/DummyMBeanInfoGenerator.java similarity index 86% rename from jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java rename to jmx/src/test/java/org/apache/xbean/jmx/DummyMBeanInfoGenerator.java index 6ebe5eb3..164521a9 100644 --- a/jmx/src/test/java/org/xbean/jmx/DummyMBeanInfoGenerator.java +++ b/jmx/src/test/java/org/apache/xbean/jmx/DummyMBeanInfoGenerator.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import javax.management.MBeanInfo; import javax.management.ObjectName; diff --git a/jmx/src/test/java/org/xbean/jmx/JMXService.java b/jmx/src/test/java/org/apache/xbean/jmx/JMXService.java similarity index 91% rename from jmx/src/test/java/org/xbean/jmx/JMXService.java rename to jmx/src/test/java/org/apache/xbean/jmx/JMXService.java index fce969d3..6aba2718 100644 --- a/jmx/src/test/java/org/xbean/jmx/JMXService.java +++ b/jmx/src/test/java/org/apache/xbean/jmx/JMXService.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/jmx/src/test/java/org/xbean/jmx/JMXStrategyFinderTest.java b/jmx/src/test/java/org/apache/xbean/jmx/JMXStrategyFinderTest.java similarity index 82% rename from jmx/src/test/java/org/xbean/jmx/JMXStrategyFinderTest.java rename to jmx/src/test/java/org/apache/xbean/jmx/JMXStrategyFinderTest.java index 90c26e8b..48c94901 100644 --- a/jmx/src/test/java/org/xbean/jmx/JMXStrategyFinderTest.java +++ b/jmx/src/test/java/org/apache/xbean/jmx/JMXStrategyFinderTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import junit.framework.TestCase; @@ -25,7 +25,7 @@ public class JMXStrategyFinderTest extends TestCase { public void testJavaBean() throws Exception { - JMXStrategyFinder finder = new JMXStrategyFinder("META-INF/org.xbean.jmx.StrategyFinder/"); + JMXStrategyFinder finder = new JMXStrategyFinder("META-INF/org.apache.xbean.jmx.StrategyFinder/"); JMXWrappingStrategy strategy = finder.newInstance("javabean"); assertNotNull(strategy); diff --git a/jmx/src/test/java/org/xbean/jmx/JMXTest.java b/jmx/src/test/java/org/apache/xbean/jmx/JMXTest.java similarity index 91% rename from jmx/src/test/java/org/xbean/jmx/JMXTest.java rename to jmx/src/test/java/org/apache/xbean/jmx/JMXTest.java index cc788d8a..4e3d9c5d 100644 --- a/jmx/src/test/java/org/xbean/jmx/JMXTest.java +++ b/jmx/src/test/java/org/apache/xbean/jmx/JMXTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 (C) The original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.jmx; +package org.apache.xbean.jmx; import javax.management.MBeanServer; import javax.management.Notification; @@ -24,7 +24,7 @@ import javax.management.Attribute; import junit.framework.TestCase; -import org.xbean.spring.context.ClassPathXmlApplicationContext; +import org.apache.xbean.spring.context.ClassPathXmlApplicationContext; /** @@ -33,7 +33,7 @@ public class JMXTest extends TestCase { public void testSimple() throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple.xml"); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/apache/xbean/jmx/jmx-simple.xml"); try { Object jmxService = context.getBean("jmxService"); assertNotNull(jmxService); @@ -47,7 +47,7 @@ public void testSimple() throws Exception { MBeanServer mbeanServer = jmxExporter.getMbeanServer(); assertNotNull(mbeanServer); assertSame(server, mbeanServer); - assertEquals("org.xbean", mbeanServer.getDefaultDomain()); + assertEquals("org.apache.xbean", mbeanServer.getDefaultDomain()); ObjectName objectName = ObjectName.getInstance(":type=JMXService"); assertTrue(mbeanServer.isRegistered(objectName)); @@ -87,7 +87,7 @@ public void testSimple() throws Exception { } public void testSimpleMultiple() throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-simple-multiple.xml"); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/apache/xbean/jmx/jmx-simple-multiple.xml"); try { Object jmxService1 = context.getBean("jmxService1"); assertNotNull(jmxService1); @@ -114,7 +114,7 @@ public void testSimpleMultiple() throws Exception { } public void testCustomAssembler() throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-custom-assembler.xml"); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/apache/xbean/jmx/jmx-custom-assembler.xml"); try { Object jmxService = context.getBean("jmxService"); assertNotNull(jmxService); @@ -136,7 +136,7 @@ public void testCustomAssembler() throws Exception { } public void testListener() throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-listener.xml"); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/apache/xbean/jmx/jmx-listener.xml"); try { JMXService jmxService = (JMXService) context.getBean("jmxService"); assertNotNull(jmxService); @@ -168,7 +168,7 @@ public void handleNotification(Notification notification, Object handback) { } public void testListenerMultiple() throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/xbean/jmx/jmx-listener-multiple.xml"); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/apache/xbean/jmx/jmx-listener-multiple.xml"); try { JMXService jmxService = (JMXService) context.getBean("jmxService"); assertNotNull(jmxService); diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-custom-assembler.xml similarity index 53% rename from jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml rename to jmx/src/test/resources/org/apache/xbean/jmx/jmx-custom-assembler.xml index b57df510..edb96124 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx-custom-assembler.xml +++ b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-custom-assembler.xml @@ -1,15 +1,15 @@ - + - + - + - + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-listener-multiple.xml similarity index 75% rename from jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml rename to jmx/src/test/resources/org/apache/xbean/jmx/jmx-listener-multiple.xml index d2db8e94..885f2a8a 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx-listener-multiple.xml +++ b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-listener-multiple.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-listener.xml similarity index 71% rename from jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml rename to jmx/src/test/resources/org/apache/xbean/jmx/jmx-listener.xml index 1ba06d5a..243229b9 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx-listener.xml +++ b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-listener.xml @@ -1,10 +1,10 @@ - + - + - + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-simple-multiple.xml similarity index 65% rename from jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml rename to jmx/src/test/resources/org/apache/xbean/jmx/jmx-simple-multiple.xml index 8503864c..67540ce3 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx-simple-multiple.xml +++ b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-simple-multiple.xml @@ -1,11 +1,11 @@ - + - - + + - + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-simple.xml similarity index 68% rename from jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml rename to jmx/src/test/resources/org/apache/xbean/jmx/jmx-simple.xml index 73bd6016..fb061372 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx-simple.xml +++ b/jmx/src/test/resources/org/apache/xbean/jmx/jmx-simple.xml @@ -1,13 +1,13 @@ - + - + - + diff --git a/jmx/src/test/resources/org/xbean/jmx/jmx.xml b/jmx/src/test/resources/org/apache/xbean/jmx/jmx.xml similarity index 78% rename from jmx/src/test/resources/org/xbean/jmx/jmx.xml rename to jmx/src/test/resources/org/apache/xbean/jmx/jmx.xml index d5365587..43b979d0 100644 --- a/jmx/src/test/resources/org/xbean/jmx/jmx.xml +++ b/jmx/src/test/resources/org/apache/xbean/jmx/jmx.xml @@ -1,7 +1,7 @@ - + - + diff --git a/kernel/LICENSE.txt b/kernel/LICENSE.txt new file mode 100644 index 00000000..6b0b1270 --- /dev/null +++ b/kernel/LICENSE.txt @@ -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. + diff --git a/kernel/NOTICE.txt b/kernel/NOTICE.txt new file mode 100644 index 00000000..439eb83b --- /dev/null +++ b/kernel/NOTICE.txt @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/kernel/pom.xml b/kernel/pom.xml index ffa4dbd9..06895485 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -1,7 +1,7 @@ xbean - org.xbean + org.apache.xbean 2.2-SNAPSHOT 4.0.0 diff --git a/kernel/src/main/java/org/xbean/kernel/AbstractServiceFactory.java b/kernel/src/main/java/org/apache/xbean/kernel/AbstractServiceFactory.java similarity index 95% rename from kernel/src/main/java/org/xbean/kernel/AbstractServiceFactory.java rename to kernel/src/main/java/org/apache/xbean/kernel/AbstractServiceFactory.java index 19010589..8be55412 100644 --- a/kernel/src/main/java/org/xbean/kernel/AbstractServiceFactory.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/AbstractServiceFactory.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; import java.util.Set; import java.util.Collections; diff --git a/kernel/src/main/java/org/xbean/kernel/ForcedStopException.java b/kernel/src/main/java/org/apache/xbean/kernel/ForcedStopException.java similarity index 95% rename from kernel/src/main/java/org/xbean/kernel/ForcedStopException.java rename to kernel/src/main/java/org/apache/xbean/kernel/ForcedStopException.java index 88fbda2c..10b799b9 100644 --- a/kernel/src/main/java/org/xbean/kernel/ForcedStopException.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/ForcedStopException.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; import java.util.Collections; import java.util.Set; diff --git a/kernel/src/main/java/org/xbean/kernel/IllegalServiceStateException.java b/kernel/src/main/java/org/apache/xbean/kernel/IllegalServiceStateException.java similarity index 92% rename from kernel/src/main/java/org/xbean/kernel/IllegalServiceStateException.java rename to kernel/src/main/java/org/apache/xbean/kernel/IllegalServiceStateException.java index 16107b62..8df90aa5 100644 --- a/kernel/src/main/java/org/xbean/kernel/IllegalServiceStateException.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/IllegalServiceStateException.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; /** * Indicates an operation was called on a service in a state that does not allow that operation to be called. diff --git a/kernel/src/main/java/org/xbean/kernel/InvalidServiceTypeException.java b/kernel/src/main/java/org/apache/xbean/kernel/InvalidServiceTypeException.java similarity index 95% rename from kernel/src/main/java/org/xbean/kernel/InvalidServiceTypeException.java rename to kernel/src/main/java/org/apache/xbean/kernel/InvalidServiceTypeException.java index e82cf409..ca97a454 100644 --- a/kernel/src/main/java/org/xbean/kernel/InvalidServiceTypeException.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/InvalidServiceTypeException.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; /** * Indicates that the service factory returned an object from the createService method that is not an instance of every diff --git a/kernel/src/main/java/org/xbean/kernel/Kernel.java b/kernel/src/main/java/org/apache/xbean/kernel/Kernel.java similarity index 99% rename from kernel/src/main/java/org/xbean/kernel/Kernel.java rename to kernel/src/main/java/org/apache/xbean/kernel/Kernel.java index 1a8999fe..0050d145 100644 --- a/kernel/src/main/java/org/xbean/kernel/Kernel.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/Kernel.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; import java.util.List; diff --git a/kernel/src/main/java/org/xbean/kernel/KernelAlreadyExistsException.java b/kernel/src/main/java/org/apache/xbean/kernel/KernelAlreadyExistsException.java similarity index 92% rename from kernel/src/main/java/org/xbean/kernel/KernelAlreadyExistsException.java rename to kernel/src/main/java/org/apache/xbean/kernel/KernelAlreadyExistsException.java index 1c74fa31..aa108b26 100644 --- a/kernel/src/main/java/org/xbean/kernel/KernelAlreadyExistsException.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/KernelAlreadyExistsException.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; /** * Indicates that a kernel is already registerd with the KernelFactory under the specified name. diff --git a/kernel/src/main/java/org/xbean/kernel/KernelErrorsError.java b/kernel/src/main/java/org/apache/xbean/kernel/KernelErrorsError.java similarity index 97% rename from kernel/src/main/java/org/xbean/kernel/KernelErrorsError.java rename to kernel/src/main/java/org/apache/xbean/kernel/KernelErrorsError.java index 86163f9c..243721d5 100644 --- a/kernel/src/main/java/org/xbean/kernel/KernelErrorsError.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/KernelErrorsError.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/kernel/src/main/java/org/xbean/kernel/KernelFactory.java b/kernel/src/main/java/org/apache/xbean/kernel/KernelFactory.java similarity index 94% rename from kernel/src/main/java/org/xbean/kernel/KernelFactory.java rename to kernel/src/main/java/org/apache/xbean/kernel/KernelFactory.java index 258d9c3d..02187087 100644 --- a/kernel/src/main/java/org/xbean/kernel/KernelFactory.java +++ b/kernel/src/main/java/org/apache/xbean/kernel/KernelFactory.java @@ -1,6 +1,6 @@ /** * - * Copyright 2005 the original author or authors. + * Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.xbean.kernel; +package org.apache.xbean.kernel; import java.io.BufferedReader; import java.io.IOException; @@ -24,7 +24,7 @@ import java.util.Map; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; -import org.xbean.kernel.standard.StandardKernelFactory; +import org.apache.xbean.kernel.standard.StandardKernelFactory; /** * The Kernel factory is used to construct and locate Kernels. This class is loosly based on the SAXParserFactory and @@ -33,7 +33,7 @@ * Kernel kernel = KernelFactory.newInstance().createKernel(name); * * - * @org.xbean.XBean namespace="http://xbean.org/schemas/kernel" element="load-all-main" + * @org.apache.xbean.XBean namespace="http://xbean.apache.org/schemas/kernel" element="load-all-main" * description="Creates kernels" * * @author Dain Sundstrom @@ -73,11 +73,11 @@ public static Map getKernels() { * Creates a kernel with the specified name. This method will attempt to locate a KernelFactory implementation * using the following procedure *