diff --git a/.gitignore b/.gitignore index 34f9ada..1d3bee2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .classpath .project .settings/ +.springBeans target/ \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 2b0888c..d5b9697 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,13 +1,14 @@ 4.0.0 - org.synyx.hera.core + + spring-plugin-core - Hera Core + Spring Plugin Core Core plugin infrastructure - org.synyx.hera - org.synyx.hera + org.springframework.plugin + spring-plugin 0.8.0.BUILD-SNAPSHOT diff --git a/core/src/doc/core.xml b/core/src/doc/core.xml index 646fa74..44054a2 100644 --- a/core/src/doc/core.xml +++ b/core/src/doc/core.xml @@ -1,4 +1,6 @@ + Core @@ -80,13 +82,13 @@ public class HostImpl implements Host { Collecting Spring beans dynamically With the BeanListBeanFactory - Hera provides a Spring container extension, - that allows to lookup beans of a given type in the current + Spring Plugin provides a Spring container + extension, that allows to lookup beans of a given type in the current ApplicationContext and register them as list under a given name. Take a look at the configuration now: - Host and plugin configuration with Hera support + Host and plugin configuration with Spring Plugin support <import resource="classpath*:com/acme/**/plugins.xml" /> @@ -94,7 +96,7 @@ public class HostImpl implements Host { <property name="plugins" ref="plugins" /> </bean> -<bean class="org.synyx.hera.plugin.support.BeanListBeanFactory"> +<bean class="org.springframework.plugin.support.BeanListBeanFactory"> <property name="lists"> <map> <entry key="plugins" value="org.acme.MyPluginInterface" /> @@ -141,10 +143,10 @@ public class HostImpl implements Host { Host configuration using the plugin namespace <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:plugin="http://schemas.synyx.org/hera" + xmlns:plugin="http://www.springframework.org/schema/plugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://schemas.synyx.org/hera http://schemas.synyx.org/hera/hera.xsd"> + http://www.springframework.org/schema/plugin http://www.springframework.org/schema/plugin/spring-plugin.xsd"> <import resource="classpath*:com/acme/**/plugins.xml" /> @@ -237,7 +239,7 @@ public interface ProductProcessor extends Plugin<ProductType> { Using a List as plugin container as well as the Plugin interface you can now select plugins supporting the given delimiter. To not reimplement the - lookup logic for common cases Hera provides a + lookup logic for common cases Spring Plugin provides a PluginRegistry<T extends Plugin<S>, S> interface that provides sophisticated methods to access certain plugins: @@ -268,9 +270,9 @@ registry.getPluginsFor(ProductType.HARDWARE, new MyException("Damn!");Configuration and namespace Similar to the BeanListBeanFactory - described in Hera provides a - PluginRegistryBeanFactory to automatically lookup - beans of a dedicated type to be aggregated in a + described in Spring Plugin + provides a PluginRegistryBeanFactory to + automatically lookup beans of a dedicated type to be aggregated in a PluginRegistry. Note that the type has to be assignable to Plugin to let the registry work as expected. @@ -305,11 +307,11 @@ registry.getPluginsFor(ProductType.HARDWARE, new MyException("Damn!");section on this topic in the Spring reference documentation. - Using the Hera namespace you will get a + Using the Spring Plugin namespace you will get a PluginRegistry instance that is capable - of preserving the order defined by the mentioned means. Using Hera - programatically use + of preserving the order defined by the mentioned means. Using Spring + Plugin programatically use OrderAwarePluginRegistry. - \ No newline at end of file + diff --git a/core/src/main/java/org/synyx/hera/core/MutablePluginRegistry.java b/core/src/main/java/org/springframework/plugin/core/MutablePluginRegistry.java similarity index 96% rename from core/src/main/java/org/synyx/hera/core/MutablePluginRegistry.java rename to core/src/main/java/org/springframework/plugin/core/MutablePluginRegistry.java index 960d919..d4798fe 100644 --- a/core/src/main/java/org/synyx/hera/core/MutablePluginRegistry.java +++ b/core/src/main/java/org/springframework/plugin/core/MutablePluginRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; /** * Extension of {@link PluginRegistry} with additional methods to modify the registry. diff --git a/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java b/core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java similarity index 97% rename from core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java rename to core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java index 76b8acf..addcca5 100644 --- a/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java +++ b/core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; import java.util.ArrayList; import java.util.Collections; @@ -142,7 +142,7 @@ public class OrderAwarePluginRegistry, S> extends SimplePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.SimplePluginRegistry#addPlugin(org.synyx.hera.core.Plugin) + * @see org.springframework.plugin.core.SimplePluginRegistry#addPlugin(org.springframework.plugin.core.Plugin) */ @Override public OrderAwarePluginRegistry addPlugin(T plugin) { diff --git a/core/src/main/java/org/synyx/hera/core/Plugin.java b/core/src/main/java/org/springframework/plugin/core/Plugin.java similarity index 94% rename from core/src/main/java/org/synyx/hera/core/Plugin.java rename to core/src/main/java/org/springframework/plugin/core/Plugin.java index c490537..6bbe70c 100644 --- a/core/src/main/java/org/synyx/hera/core/Plugin.java +++ b/core/src/main/java/org/springframework/plugin/core/Plugin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; /** * Central interface for plugins for the system. This interface is meant to be extended by concrete plugin interfaces. diff --git a/core/src/main/java/org/synyx/hera/core/PluginRegistry.java b/core/src/main/java/org/springframework/plugin/core/PluginRegistry.java similarity index 98% rename from core/src/main/java/org/synyx/hera/core/PluginRegistry.java rename to core/src/main/java/org/springframework/plugin/core/PluginRegistry.java index 084ea13..b0c2e78 100644 --- a/core/src/main/java/org/synyx/hera/core/PluginRegistry.java +++ b/core/src/main/java/org/springframework/plugin/core/PluginRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; import java.util.List; diff --git a/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java b/core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java similarity index 76% rename from core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java rename to core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java index 66ee94a..2007176 100644 --- a/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java +++ b/core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; import java.util.ArrayList; import java.util.Collections; @@ -66,7 +66,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.MutablePluginRegistry#addPlugin(org.synyx.hera.core.Plugin) + * @see org.springframework.plugin.core.MutablePluginRegistry#addPlugin(org.springframework.plugin.core.Plugin) */ public SimplePluginRegistry addPlugin(T plugin) { @@ -79,7 +79,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.MutablePluginRegistry#removePlugin(org.synyx.hera.core.Plugin) + * @see org.springframework.plugin.core.MutablePluginRegistry#removePlugin(org.springframework.plugin.core.Plugin) */ public boolean removePlugin(T plugin) { @@ -88,7 +88,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#getPluginFor(java.lang.Object) + * @see org.springframework.plugin.core.PluginRegistry#getPluginFor(java.lang.Object) */ public T getPluginFor(S delimiter) { @@ -103,7 +103,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#getPluginsFor(java.lang.Object) + * @see org.springframework.plugin.core.PluginRegistry#getPluginsFor(java.lang.Object) */ public List getPluginsFor(S delimiter) { @@ -120,7 +120,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#getPluginFor(java.lang.Object, java.lang.Exception) + * @see org.springframework.plugin.core.PluginRegistry#getPluginFor(java.lang.Object, java.lang.Exception) */ public T getPluginFor(S delimiter, E ex) throws E { @@ -135,7 +135,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#getPluginsFor(java.lang.Object, java.lang.Exception) + * @see org.springframework.plugin.core.PluginRegistry#getPluginsFor(java.lang.Object, java.lang.Exception) */ public List getPluginsFor(S delimiter, E ex) throws E { @@ -150,7 +150,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#getPluginFor(java.lang.Object, org.synyx.hera.core.Plugin) + * @see org.springframework.plugin.core.PluginRegistry#getPluginFor(java.lang.Object, org.springframework.plugin.core.Plugin) */ public T getPluginFor(S delimiter, T plugin) { @@ -161,7 +161,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#getPluginsFor(java.lang.Object, java.util.List) + * @see org.springframework.plugin.core.PluginRegistry#getPluginsFor(java.lang.Object, java.util.List) */ public List getPluginsFor(S delimiter, List plugins) { @@ -172,7 +172,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#countPlugins() + * @see org.springframework.plugin.core.PluginRegistry#countPlugins() */ public int countPlugins() { @@ -192,7 +192,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#contains(org.synyx.hera.core.Plugin) + * @see org.springframework.plugin.core.PluginRegistry#contains(org.springframework.plugin.core.Plugin) */ public boolean contains(T plugin) { return this.plugins.contains(plugin); @@ -200,7 +200,7 @@ public class SimplePluginRegistry, S> implements MutablePlug /* * (non-Javadoc) - * @see org.synyx.hera.core.PluginRegistry#hasPluginFor(java.lang.Object) + * @see org.springframework.plugin.core.PluginRegistry#hasPluginFor(java.lang.Object) */ public boolean hasPluginFor(S delimter) { return null != getPluginFor(delimter); diff --git a/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java b/core/src/main/java/org/springframework/plugin/core/config/PluginListDefinitionParser.java similarity index 95% rename from core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java rename to core/src/main/java/org/springframework/plugin/core/config/PluginListDefinitionParser.java index a59d816..04d54f6 100644 --- a/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java +++ b/core/src/main/java/org/springframework/plugin/core/config/PluginListDefinitionParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.config; +package org.springframework.plugin.core.config; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -28,7 +28,7 @@ import org.w3c.dom.Element; */ public class PluginListDefinitionParser extends AbstractBeanDefinitionParser { - protected static final String PACKAGE = "org.synyx.hera.core.support."; + protected static final String PACKAGE = "org.springframework.plugin.core.support."; /** * Returns the name of the {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor} to be registered. diff --git a/core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java b/core/src/main/java/org/springframework/plugin/core/config/PluginNamespaceHandler.java similarity index 95% rename from core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java rename to core/src/main/java/org/springframework/plugin/core/config/PluginNamespaceHandler.java index b09c34a..596810b 100644 --- a/core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java +++ b/core/src/main/java/org/springframework/plugin/core/config/PluginNamespaceHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.config; +package org.springframework.plugin.core.config; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; diff --git a/core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java b/core/src/main/java/org/springframework/plugin/core/config/PluginRegistryDefinitionParser.java similarity index 87% rename from core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java rename to core/src/main/java/org/springframework/plugin/core/config/PluginRegistryDefinitionParser.java index 3bd448e..fc5b1ef 100644 --- a/core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java +++ b/core/src/main/java/org/springframework/plugin/core/config/PluginRegistryDefinitionParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.config; +package org.springframework.plugin.core.config; /** @@ -26,7 +26,7 @@ public class PluginRegistryDefinitionParser extends PluginListDefinitionParser { /* * (non-Javadoc) - * @see org.synyx.hera.core.config.PluginListDefinitionParser#getPostProcessorName() + * @see org.springframework.plugin.core.config.PluginListDefinitionParser#getPostProcessorName() */ @Override protected String getPostProcessorName() { diff --git a/core/src/main/java/org/synyx/hera/core/config/package-info.java b/core/src/main/java/org/springframework/plugin/core/config/package-info.java similarity index 71% rename from core/src/main/java/org/synyx/hera/core/config/package-info.java rename to core/src/main/java/org/springframework/plugin/core/config/package-info.java index c09bb6f..4d50322 100644 --- a/core/src/main/java/org/synyx/hera/core/config/package-info.java +++ b/core/src/main/java/org/springframework/plugin/core/config/package-info.java @@ -1,5 +1,5 @@ /** * This package contains configuration support classes to ease registry configuration with Spring namespaces. */ -package org.synyx.hera.core.config; +package org.springframework.plugin.core.config; diff --git a/core/src/main/java/org/synyx/hera/core/package-info.java b/core/src/main/java/org/springframework/plugin/core/package-info.java similarity index 84% rename from core/src/main/java/org/synyx/hera/core/package-info.java rename to core/src/main/java/org/springframework/plugin/core/package-info.java index 1c6518e..68f4545 100644 --- a/core/src/main/java/org/synyx/hera/core/package-info.java +++ b/core/src/main/java/org/springframework/plugin/core/package-info.java @@ -1,5 +1,5 @@ /** * This package contains the core plugin API. It allows other modules implementing components that extend functionality defined by a plugin interface. Plugin clients can be equipped with plugin implementations. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; diff --git a/core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java b/core/src/main/java/org/springframework/plugin/core/support/AbstractTypeAwareSupport.java similarity index 99% rename from core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java rename to core/src/main/java/org/springframework/plugin/core/support/AbstractTypeAwareSupport.java index 3b44d5a..48cdfb1 100644 --- a/core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java +++ b/core/src/main/java/org/springframework/plugin/core/support/AbstractTypeAwareSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.support; +package org.springframework.plugin.core.support; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java b/core/src/main/java/org/springframework/plugin/core/support/BeanListFactoryBean.java similarity index 97% rename from core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java rename to core/src/main/java/org/springframework/plugin/core/support/BeanListFactoryBean.java index d06b429..ea970b3 100644 --- a/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java +++ b/core/src/main/java/org/springframework/plugin/core/support/BeanListFactoryBean.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.synyx.hera.core.support; +package org.springframework.plugin.core.support; import java.util.Collections; import java.util.Comparator; diff --git a/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java b/core/src/main/java/org/springframework/plugin/core/support/PluginRegistryFactoryBean.java similarity index 87% rename from core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java rename to core/src/main/java/org/springframework/plugin/core/support/PluginRegistryFactoryBean.java index 3aae3b2..f12141a 100644 --- a/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java +++ b/core/src/main/java/org/springframework/plugin/core/support/PluginRegistryFactoryBean.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.support; +package org.springframework.plugin.core.support; import org.springframework.beans.factory.FactoryBean; -import org.synyx.hera.core.OrderAwarePluginRegistry; -import org.synyx.hera.core.Plugin; -import org.synyx.hera.core.PluginRegistry; +import org.springframework.plugin.core.OrderAwarePluginRegistry; +import org.springframework.plugin.core.Plugin; +import org.springframework.plugin.core.PluginRegistry; /** * {@link FactoryBean} to create {@link PluginRegistry} instances. Wraps a {@link BeanListFactoryBean}. diff --git a/core/src/main/java/org/synyx/hera/core/support/package-info.java b/core/src/main/java/org/springframework/plugin/core/support/package-info.java similarity index 75% rename from core/src/main/java/org/synyx/hera/core/support/package-info.java rename to core/src/main/java/org/springframework/plugin/core/support/package-info.java index ca5715c..04c072a 100644 --- a/core/src/main/java/org/synyx/hera/core/support/package-info.java +++ b/core/src/main/java/org/springframework/plugin/core/support/package-info.java @@ -1,5 +1,5 @@ /** * This package contains support classes to create bean lists or plugin registry instances out of beans implementing a certain interface. */ -package org.synyx.hera.core.support; +package org.springframework.plugin.core.support; diff --git a/core/src/main/resources/META-INF/spring.handlers b/core/src/main/resources/META-INF/spring.handlers index 4da21bc..99d9f28 100644 --- a/core/src/main/resources/META-INF/spring.handlers +++ b/core/src/main/resources/META-INF/spring.handlers @@ -1 +1 @@ -http\://schemas.synyx.org/hera=org.synyx.hera.core.config.PluginNamespaceHandler \ No newline at end of file +http\://www.springframework.org/schema/plugin=org.springframework.plugin.core.config.PluginNamespaceHandler \ No newline at end of file diff --git a/core/src/main/resources/META-INF/spring.schemas b/core/src/main/resources/META-INF/spring.schemas index 6d65888..8094178 100644 --- a/core/src/main/resources/META-INF/spring.schemas +++ b/core/src/main/resources/META-INF/spring.schemas @@ -1 +1 @@ -http\://schemas.synyx.org/hera/hera.xsd=org/synyx/hera/core/config/hera.xsd \ No newline at end of file +http\://www.springframework.org/schema/plugin/spring-plugin.xsd=org/springframework/plugin/core/config/spring-plugin.xsd \ No newline at end of file diff --git a/core/src/main/resources/META-INF/spring.tooling b/core/src/main/resources/META-INF/spring.tooling index 29e8f26..998b903 100644 --- a/core/src/main/resources/META-INF/spring.tooling +++ b/core/src/main/resources/META-INF/spring.tooling @@ -1,4 +1,4 @@ -# Tooling related information for the Hera namespace -http\://schemas.synyx.org/hera@name=Hera Namespace -http\://schemas.synyx.org/hera@prefix=hera -http\://schemas.synyx.org/hera@icon=org/springframework/beans/factory/xml/spring-beans.gif \ No newline at end of file +# Tooling related information for the Spring Plugin namespace +http\://www.springframework.org/schema/plugin@name=Spring Plugin Namespace +http\://www.springframework.org/schema/plugin@prefix=plugin +http\://www.springframework.org/schema/plugin@icon=org/springframework/beans/factory/xml/spring-beans.gif \ No newline at end of file diff --git a/core/src/main/resources/org/synyx/hera/core/config/hera.xsd b/core/src/main/resources/org/springframework/plugin/core/config/spring-plugin.xsd similarity index 91% rename from core/src/main/resources/org/synyx/hera/core/config/hera.xsd rename to core/src/main/resources/org/springframework/plugin/core/config/spring-plugin.xsd index b855303..643be74 100644 --- a/core/src/main/resources/org/synyx/hera/core/config/hera.xsd +++ b/core/src/main/resources/org/springframework/plugin/core/config/spring-plugin.xsd @@ -1,8 +1,8 @@ - diff --git a/core/src/test/java/org/synyx/hera/core/AbstractMutablePluginRegistryUnitTest.java b/core/src/test/java/org/springframework/plugin/core/AbstractMutablePluginRegistryUnitTest.java similarity index 93% rename from core/src/test/java/org/synyx/hera/core/AbstractMutablePluginRegistryUnitTest.java rename to core/src/test/java/org/springframework/plugin/core/AbstractMutablePluginRegistryUnitTest.java index afba294..7462603 100644 --- a/core/src/test/java/org/synyx/hera/core/AbstractMutablePluginRegistryUnitTest.java +++ b/core/src/test/java/org/springframework/plugin/core/AbstractMutablePluginRegistryUnitTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.plugin.core.MutablePluginRegistry; /** * Unit test for implementations of {@link MutablePluginRegistry}. diff --git a/core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java b/core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java similarity index 88% rename from core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java rename to core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java index 99ae58a..ee266df 100644 --- a/core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java +++ b/core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -25,6 +25,10 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.springframework.core.annotation.Order; +import org.springframework.plugin.core.MutablePluginRegistry; +import org.springframework.plugin.core.OrderAwarePluginRegistry; +import org.springframework.plugin.core.Plugin; +import org.springframework.plugin.core.PluginRegistry; /** * Unit test for {@link OrderAwarePluginRegistry} that especially concentrates on testing ordering functionality. @@ -104,7 +108,7 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe /* * (non-Javadoc) * - * @see org.synyx.hera.core.Plugin#supports(java.lang.Object) + * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) */ public boolean supports(String delimiter) { @@ -118,7 +122,7 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe /* * (non-Javadoc) * - * @see org.synyx.hera.core.Plugin#supports(java.lang.Object) + * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) */ public boolean supports(String delimiter) { diff --git a/core/src/test/java/org/synyx/hera/core/SamplePlugin.java b/core/src/test/java/org/springframework/plugin/core/SamplePlugin.java similarity index 89% rename from core/src/test/java/org/synyx/hera/core/SamplePlugin.java rename to core/src/test/java/org/springframework/plugin/core/SamplePlugin.java index bb2f09f..c86e276 100644 --- a/core/src/test/java/org/synyx/hera/core/SamplePlugin.java +++ b/core/src/test/java/org/springframework/plugin/core/SamplePlugin.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; + +import org.springframework.plugin.core.Plugin; /** * @author Oliver Gierke diff --git a/core/src/test/java/org/synyx/hera/core/SamplePluginHost.java b/core/src/test/java/org/springframework/plugin/core/SamplePluginHost.java similarity index 86% rename from core/src/test/java/org/synyx/hera/core/SamplePluginHost.java rename to core/src/test/java/org/springframework/plugin/core/SamplePluginHost.java index ae361d6..c029f5e 100644 --- a/core/src/test/java/org/synyx/hera/core/SamplePluginHost.java +++ b/core/src/test/java/org/springframework/plugin/core/SamplePluginHost.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; + +import org.springframework.plugin.core.PluginRegistry; +import org.springframework.plugin.core.SimplePluginRegistry; /** * @author Oliver Gierke diff --git a/core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java b/core/src/test/java/org/springframework/plugin/core/SamplePluginImplementation.java similarity index 82% rename from core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java rename to core/src/test/java/org/springframework/plugin/core/SamplePluginImplementation.java index 7cfc7e6..744b764 100644 --- a/core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java +++ b/core/src/test/java/org/springframework/plugin/core/SamplePluginImplementation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; /** * @author Oliver Gierke @@ -22,7 +22,7 @@ public class SamplePluginImplementation implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.core.Plugin#supports(java.lang.Object) + * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) */ public boolean supports(String delimiter) { return "FOO".equals(delimiter); @@ -30,7 +30,7 @@ public class SamplePluginImplementation implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.core.SamplePlugin#pluginMethod() + * @see org.springframework.plugin.core.SamplePlugin#pluginMethod() */ public void pluginMethod() { diff --git a/core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java b/core/src/test/java/org/springframework/plugin/core/SimplePluginRegistryUnitTest.java similarity index 92% rename from core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java rename to core/src/test/java/org/springframework/plugin/core/SimplePluginRegistryUnitTest.java index 37bb8c5..2b4a102 100644 --- a/core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java +++ b/core/src/test/java/org/springframework/plugin/core/SimplePluginRegistryUnitTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.synyx.hera.core; +package org.springframework.plugin.core; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -24,6 +24,9 @@ import java.util.List; import org.junit.Before; import org.junit.Test; +import org.springframework.plugin.core.MutablePluginRegistry; +import org.springframework.plugin.core.Plugin; +import org.springframework.plugin.core.SimplePluginRegistry; /** * Unit test for {@link SimplePluginRegistry}. @@ -48,7 +51,7 @@ public class SimplePluginRegistryUnitTest extends AbstractMutablePluginRegistryU /* * (non-Javadoc) - * @see org.synyx.hera.core.AbstractMutablePluginRegistryUnitTest#getRegistry() + * @see org.springframework.plugin.core.AbstractMutablePluginRegistryUnitTest#getRegistry() */ @Override protected MutablePluginRegistry getRegistry() { diff --git a/core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java b/core/src/test/java/org/springframework/plugin/core/config/PluginConfigurationIntegrationTest.java similarity index 89% rename from core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java rename to core/src/test/java/org/springframework/plugin/core/config/PluginConfigurationIntegrationTest.java index 162cf04..e45dbc5 100644 --- a/core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java +++ b/core/src/test/java/org/springframework/plugin/core/config/PluginConfigurationIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.config; +package org.springframework.plugin.core.config; import static org.junit.Assert.*; @@ -23,11 +23,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.plugin.core.PluginRegistry; +import org.springframework.plugin.core.SamplePlugin; +import org.springframework.plugin.core.SamplePluginHost; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.synyx.hera.core.PluginRegistry; -import org.synyx.hera.core.SamplePlugin; -import org.synyx.hera.core.SamplePluginHost; /** * Integration test to simply check if the configuration gets parsed correctly. diff --git a/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java b/core/src/test/java/org/springframework/plugin/core/support/BeanListFactoryBeanUnitTest.java similarity index 95% rename from core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java rename to core/src/test/java/org/springframework/plugin/core/support/BeanListFactoryBeanUnitTest.java index 5e6f8b5..142dd67 100644 --- a/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java +++ b/core/src/test/java/org/springframework/plugin/core/support/BeanListFactoryBeanUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.core.support; +package org.springframework.plugin.core.support; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -29,6 +29,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.context.ApplicationContext; import org.springframework.core.Ordered; +import org.springframework.plugin.core.support.BeanListFactoryBean; /** * Unit test for {@link BeanListFactoryBean}. diff --git a/core/src/test/resources/application-context.xml b/core/src/test/resources/application-context.xml index c7d4ec7..fa672a7 100644 --- a/core/src/test/resources/application-context.xml +++ b/core/src/test/resources/application-context.xml @@ -1,23 +1,23 @@ + http://www.springframework.org/schema/plugin http://www.springframework.org/schema/plugin/spring-plugin.xsd"> - + - + - + - + - + - + diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties index 7e1b088..4622ffa 100644 --- a/core/src/test/resources/log4j.properties +++ b/core/src/test/resources/log4j.properties @@ -9,4 +9,4 @@ log4j.rootLogger=WARN, stdout # Hibernate logging options (INFO only shows startup messages) log4j.logger.org.springframework=INFO -log4j.logger.org.synyx.hera=DEBUG \ No newline at end of file +log4j.logger.org.springframework.plugin=DEBUG \ No newline at end of file diff --git a/core/template.mf b/core/template.mf index 43ef5a6..c22de24 100644 --- a/core/template.mf +++ b/core/template.mf @@ -1,11 +1,11 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: ${project.artifactId} Bundle-Name: ${project.name} -Bundle-Vendor: Synyx GmbH & Co. KG +Bundle-Vendor: SpringSource, a division of VMware Bundle-Version: ${project.version} -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.6 Export-Template: - ${project.artifactId}.*;version="${project.version}" + org.springframework.plugin.core.*;version="${project.version}" Import-Template: - org.springframework.*;version="${spring.version:[=.=.=.=,+2.0.0)}", + org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}", org.w3c.dom.*;version="0.0.0" diff --git a/si/pom.xml b/integration/pom.xml similarity index 80% rename from si/pom.xml rename to integration/pom.xml index a8464f1..5cc6202 100644 --- a/si/pom.xml +++ b/integration/pom.xml @@ -1,14 +1,15 @@ 4.0.0 + - org.synyx.hera - org.synyx.hera + org.springframework.plugin + spring-plugin 0.8.0.BUILD-SNAPSHOT - org.synyx.hera - org.synyx.hera.si - 0.8.0.BUILD-SNAPSHOT - Hera Spring Integration integration + + spring-plugin-si + + Spring Plugin Spring Integration integration 2.0.5.RELEASE @@ -17,7 +18,7 @@ ${project.groupId} - org.synyx.hera.core + spring-plugin-core ${project.version} diff --git a/si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java b/integration/src/main/java/org/springframework/plugin/integration/PluginRegistryAwareMessageHandler.java similarity index 97% rename from si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java rename to integration/src/main/java/org/springframework/plugin/integration/PluginRegistryAwareMessageHandler.java index bf9de08..b9d3f82 100644 --- a/si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java +++ b/integration/src/main/java/org/springframework/plugin/integration/PluginRegistryAwareMessageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si; +package org.springframework.plugin.integration; import java.lang.reflect.Method; import java.util.ArrayList; @@ -32,13 +32,13 @@ import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; +import org.springframework.plugin.core.OrderAwarePluginRegistry; +import org.springframework.plugin.core.Plugin; +import org.springframework.plugin.core.PluginRegistry; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; -import org.synyx.hera.core.OrderAwarePluginRegistry; -import org.synyx.hera.core.Plugin; -import org.synyx.hera.core.PluginRegistry; /** * Dynamic service activator that uses a {@link PluginRegistry} to delegate execution to one or more plugins matching a diff --git a/si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java b/integration/src/main/java/org/springframework/plugin/integration/config/DynamicServiceActivatorParser.java similarity index 93% rename from si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java rename to integration/src/main/java/org/springframework/plugin/integration/config/DynamicServiceActivatorParser.java index 8f9048b..9e0332d 100644 --- a/si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java +++ b/integration/src/main/java/org/springframework/plugin/integration/config/DynamicServiceActivatorParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.config; +package org.springframework.plugin.integration.config; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -21,9 +21,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractConsumerEndpointParser; +import org.springframework.plugin.core.support.PluginRegistryFactoryBean; +import org.springframework.plugin.integration.PluginRegistryAwareMessageHandler; import org.springframework.util.StringUtils; -import org.synyx.hera.core.support.PluginRegistryFactoryBean; -import org.synyx.hera.si.PluginRegistryAwareMessageHandler; import org.w3c.dom.Element; /** diff --git a/si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java b/integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java similarity index 88% rename from si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java rename to integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java index afd504a..8b0267c 100644 --- a/si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java +++ b/integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.config; +package org.springframework.plugin.integration.config; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.NamespaceHandler; @@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; * * @author Oliver Gierke */ -public class HeraSpringIntegrationNamespaceHandler extends NamespaceHandlerSupport { +public class SpringPluginSpringIntegrationNamespaceHandler extends NamespaceHandlerSupport { /* * (non-Javadoc) diff --git a/integration/src/main/resources/META-INF/spring.handlers b/integration/src/main/resources/META-INF/spring.handlers new file mode 100644 index 0000000..fde326d --- /dev/null +++ b/integration/src/main/resources/META-INF/spring.handlers @@ -0,0 +1 @@ +http\://www.springframework.org/schema/plugin/integration=org.springframework.plugin.integration.config.SpringPluginSpringIntegrationNamespaceHandler \ No newline at end of file diff --git a/integration/src/main/resources/META-INF/spring.schemas b/integration/src/main/resources/META-INF/spring.schemas new file mode 100644 index 0000000..9e794dd --- /dev/null +++ b/integration/src/main/resources/META-INF/spring.schemas @@ -0,0 +1 @@ +http\://www.springframework.org/schema/plugin/integration/spring-plugin-integration.xsd=org/springframework/plugin/integration/config/spring-plugin-integration.xsd \ No newline at end of file diff --git a/integration/src/main/resources/META-INF/spring.tooling b/integration/src/main/resources/META-INF/spring.tooling new file mode 100644 index 0000000..597023f --- /dev/null +++ b/integration/src/main/resources/META-INF/spring.tooling @@ -0,0 +1,4 @@ +# Tooling related information for the Spring Plugin Integration namespace +http\://www.springframework.org/schema/plugin/integration@name=Spring Plugin Spring Integration Namespace +http\://www.springframework.org/schema/plugin/integration@prefix=int-plugin +http\://www.springframework.org/schema/plugin/integration@icon=org/springframework/beans/factory/xml/spring-beans.gif \ No newline at end of file diff --git a/si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd b/integration/src/main/resources/org/springframework/plugin/integration/config/spring-plugin-integration.xsd similarity index 91% rename from si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd rename to integration/src/main/resources/org/springframework/plugin/integration/config/spring-plugin-integration.xsd index 2df6932..5d61c3a 100644 --- a/si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd +++ b/integration/src/main/resources/org/springframework/plugin/integration/config/spring-plugin-integration.xsd @@ -1,8 +1,8 @@ - @@ -15,7 +15,7 @@ allows dynamic invocation of Spring beans implementing the plugin interface defined in "plugin-type". We will dynamically pick up all Spring beans implementing that interface and create a PluginRegistry - of those. See org.synyx.hera.si.PluginRegistryAwareMessageHandler for + of those. See org.springframework.plugin.integration.PluginRegistryAwareMessageHandler for details. diff --git a/si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java b/integration/src/test/java/org/springframework/plugin/integration/PluginRegistryAwareMessageHandlerUnitTest.java similarity index 85% rename from si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java rename to integration/src/test/java/org/springframework/plugin/integration/PluginRegistryAwareMessageHandlerUnitTest.java index abdaf22..f981414 100644 --- a/si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java +++ b/integration/src/test/java/org/springframework/plugin/integration/PluginRegistryAwareMessageHandlerUnitTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si; +package org.springframework.plugin.integration; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -32,11 +32,12 @@ import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.support.MessageBuilder; -import org.synyx.hera.core.OrderAwarePluginRegistry; -import org.synyx.hera.core.PluginRegistry; -import org.synyx.hera.si.sample.FirstSamplePluginImpl; -import org.synyx.hera.si.sample.SamplePlugin; -import org.synyx.hera.si.sample.SecondSamplePluginImpl; +import org.springframework.plugin.core.OrderAwarePluginRegistry; +import org.springframework.plugin.core.PluginRegistry; +import org.springframework.plugin.integration.PluginRegistryAwareMessageHandler; +import org.springframework.plugin.integration.sample.FirstSamplePluginImpl; +import org.springframework.plugin.integration.sample.SamplePlugin; +import org.springframework.plugin.integration.sample.SecondSamplePluginImpl; /** * Unit tests for {@link PluginRegistryAwareMessageHandler}. diff --git a/si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java b/integration/src/test/java/org/springframework/plugin/integration/config/DynamicServiceActivatorNamespaceIntegrationTest.java similarity index 97% rename from si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java rename to integration/src/test/java/org/springframework/plugin/integration/config/DynamicServiceActivatorNamespaceIntegrationTest.java index bfd1871..50f998f 100644 --- a/si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java +++ b/integration/src/test/java/org/springframework/plugin/integration/config/DynamicServiceActivatorNamespaceIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.config; +package org.springframework.plugin.integration.config; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java b/integration/src/test/java/org/springframework/plugin/integration/sample/FirstSamplePluginImpl.java similarity index 81% rename from si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java rename to integration/src/test/java/org/springframework/plugin/integration/sample/FirstSamplePluginImpl.java index 2f0b4bf..5105778 100644 --- a/si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java +++ b/integration/src/test/java/org/springframework/plugin/integration/sample/FirstSamplePluginImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.sample; +package org.springframework.plugin.integration.sample; /** * @author Oliver Gierke @@ -22,7 +22,7 @@ public class FirstSamplePluginImpl implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.core.Plugin#supports(java.lang.Object) + * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) */ public boolean supports(String delimiter) { return "FOO".equals(delimiter); @@ -30,7 +30,7 @@ public class FirstSamplePluginImpl implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.si.sample.SamplePlugin#myBusinessMethod() + * @see org.springframework.plugin.integration.sample.SamplePlugin#myBusinessMethod() */ public String myBusinessMethod(String message) { System.out.println("First plugin invoked! " + message); diff --git a/si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java b/integration/src/test/java/org/springframework/plugin/integration/sample/SamplePlugin.java similarity index 88% rename from si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java rename to integration/src/test/java/org/springframework/plugin/integration/sample/SamplePlugin.java index fd5fa8b..a20860b 100644 --- a/si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java +++ b/integration/src/test/java/org/springframework/plugin/integration/sample/SamplePlugin.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.sample; +package org.springframework.plugin.integration.sample; -import org.synyx.hera.core.Plugin; +import org.springframework.plugin.core.Plugin; /** * @author Oliver Gierke diff --git a/si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java b/integration/src/test/java/org/springframework/plugin/integration/sample/SecondSamplePluginImpl.java similarity index 83% rename from si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java rename to integration/src/test/java/org/springframework/plugin/integration/sample/SecondSamplePluginImpl.java index 9019995..49cd3c0 100644 --- a/si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java +++ b/integration/src/test/java/org/springframework/plugin/integration/sample/SecondSamplePluginImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.sample; +package org.springframework.plugin.integration.sample; import org.springframework.core.annotation.Order; @@ -27,7 +27,7 @@ public class SecondSamplePluginImpl implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.core.Plugin#supports(java.lang.Object) + * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) */ public boolean supports(String delimiter) { return "BAR".equals(delimiter); @@ -35,7 +35,7 @@ public class SecondSamplePluginImpl implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.si.sample.SamplePlugin#myBusinessMethod() + * @see org.springframework.plugin.integration.sample.SamplePlugin#myBusinessMethod() */ public String myBusinessMethod(String message) { System.out.println("Second plugin invoked! " + message); diff --git a/si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java b/integration/src/test/java/org/springframework/plugin/integration/sample/ThirdSamplePluginImpl.java similarity index 84% rename from si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java rename to integration/src/test/java/org/springframework/plugin/integration/sample/ThirdSamplePluginImpl.java index 91c803a..811a663 100644 --- a/si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java +++ b/integration/src/test/java/org/springframework/plugin/integration/sample/ThirdSamplePluginImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.si.sample; +package org.springframework.plugin.integration.sample; import org.springframework.core.annotation.Order; @@ -27,7 +27,7 @@ class ThirdSamplePluginImpl implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.core.Plugin#supports(java.lang.Object) + * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) */ public boolean supports(String delimiter) { return "BAR".equals(delimiter); @@ -35,7 +35,7 @@ class ThirdSamplePluginImpl implements SamplePlugin { /* * (non-Javadoc) - * @see org.synyx.hera.si.sample.SamplePlugin#myBusinessMethod() + * @see org.springframework.plugin.integration.sample.SamplePlugin#myBusinessMethod() */ public String myBusinessMethod(String message) { System.out.println("Second plugin invoked! " + message); diff --git a/si/src/test/resources/dynamic-service-activator-test-context.xml b/integration/src/test/resources/dynamic-service-activator-test-context.xml similarity index 57% rename from si/src/test/resources/dynamic-service-activator-test-context.xml rename to integration/src/test/resources/dynamic-service-activator-test-context.xml index 92525b4..46ab2d3 100644 --- a/si/src/test/resources/dynamic-service-activator-test-context.xml +++ b/integration/src/test/resources/dynamic-service-activator-test-context.xml @@ -2,18 +2,18 @@ + http://www.springframework.org/schema/plugin/integration http://www.springframework.org/schema/plugin/integration/spring-plugin-integration.xsd"> - - + + - diff --git a/si/src/test/resources/log4j.properties b/integration/src/test/resources/log4j.properties similarity index 100% rename from si/src/test/resources/log4j.properties rename to integration/src/test/resources/log4j.properties diff --git a/si/template.mf b/integration/template.mf similarity index 52% rename from si/template.mf rename to integration/template.mf index a57881d..8c8c9a5 100644 --- a/si/template.mf +++ b/integration/template.mf @@ -1,14 +1,14 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: ${project.artifactId} Bundle-Name: ${project.name} -Bundle-Vendor: Synyx GmbH & Co. KG +Bundle-Vendor: SpringSource, a division of VMware Bundle-Version: ${project.version} -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.6 Export-Template: - ${project.artifactId}.*;version="${project.version}" + org.springframework.plugin.integration.*;version="${project.version}" Import-Template: org.apache.commons.logging.*;version="[1.1.0,2.0.0)", - org.synyx.hera.core.*;version="${project.version:[=.=.=.=,+1.0.0)}", - org.springframework.*;version="${spring.version:[=.=.=.=,+2.0.0)}", + org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}", org.springframework.integration.*;version="${spring.integration.version:[=.=.=.=,+1.0.0)}", + org.springframework.plugin.core.*;version="${project.version:[=.=.=.=,+1.0.0)}", org.w3c.dom.*;version="0" diff --git a/metadata/pom.xml b/metadata/pom.xml index 4c43e7f..b4a4e84 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -1,20 +1,20 @@ 4.0.0 - org.synyx.hera.metadata + spring-plugin-metadata - Hera Metadata Extension + Spring Plugin Metadata Extension Extension package for metadata based plugins - org.synyx.hera - org.synyx.hera + org.springframework.plugin + spring-plugin 0.8.0.BUILD-SNAPSHOT - org.synyx.hera - org.synyx.hera.core + ${project.groupId} + spring-plugin-core ${project.version} diff --git a/metadata/src/doc/metadata.xml b/metadata/src/doc/metadata.xml index 35713d6..efa1194 100644 --- a/metadata/src/doc/metadata.xml +++ b/metadata/src/doc/metadata.xml @@ -1,11 +1,13 @@ + Metadata For plugin architectures it is essential to capture metadata information about plugin instances. A very core set of metadata (name, version) also serves as identifier of a plugin and thus can be used. The - Hera metadata module provides support to capture metadata. + Spring Plugin metadata module provides support to capture metadata.
Core concepts @@ -34,11 +36,11 @@ public interface MetadataProvider { The PluginMetadata interface captures the required properties to define an identifyable plugin. This means, that implementations should ensure uniqueness through these two properties. - With SimplePluginMetadata Hera provides a Java bean - style class to capture metadata. Of course applications can and should - provide extended metadata information according to their needs. The very - narrow interface is only targeted at integrating the metadata concept with - the PluginRegistry (see SimplePluginMetadata Spring Plugin provides a + Java bean style class to capture metadata. Of course applications can and + should provide extended metadata information according to their needs. The + very narrow interface is only targeted at integrating the metadata concept + with the PluginRegistry (see ) without bothering developers with too much information required. @@ -52,4 +54,4 @@ public interface MetadataProvider { could store the metadata in user specific configuration files and use this to select a distinct plugin specific to a given user.
- \ No newline at end of file + diff --git a/metadata/src/main/java/META-INF/MANIFEST.MF b/metadata/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e94951..0000000 --- a/metadata/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java b/metadata/src/main/java/org/springframework/plugin/metadata/AbstractMetadataBasedPlugin.java similarity index 84% rename from metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java rename to metadata/src/main/java/org/springframework/plugin/metadata/AbstractMetadataBasedPlugin.java index b64e6d1..bcb092a 100644 --- a/metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java +++ b/metadata/src/main/java/org/springframework/plugin/metadata/AbstractMetadataBasedPlugin.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.synyx.hera.metadata; +package org.springframework.plugin.metadata; -import org.synyx.hera.core.Plugin; -import org.synyx.hera.core.PluginRegistry; +import org.springframework.plugin.core.Plugin; +import org.springframework.plugin.core.PluginRegistry; /** * Abstract base class for plugins based on {@link PluginMetadata}. Plugins based on this class can be selected from the @@ -41,7 +41,7 @@ public abstract class AbstractMetadataBasedPlugin implements Plugin 4.0.0 - org.synyx.hera - org.synyx.hera + org.springframework.plugin + spring-plugin pom - Hera + Spring Plugin 0.8.0.BUILD-SNAPSHOT Simple plugin infrastructure - Synyx GmbH & Co. KG - http://www.synyx.org + SpringSource, a division of VMware + http://www.springsource.org 2008 - http://hera.synyx.org + https://github.com/SpringSource/spring-plugin @@ -40,11 +40,11 @@ core metadata - si + integration - 3.0.6.RELEASE + 3.0.7.RELEASE @@ -82,7 +82,6 @@ test - @@ -149,41 +148,6 @@ resources/styles.css true - - - StellaLining - - normal - ${basedir}/src/doc/layout/pdf/fonts/SteLiR__.ttf - ${basedir}/src/doc/layout/pdf/fonts/SteLiR__.xml - - - StellaLining - - normal - ${basedir}/src/doc/layout/pdf/fonts/SteLiI__.ttf - ${basedir}/src/doc/layout/pdf/fonts/SteLiI__.xml - - - StellaLining - - bold - ${basedir}/src/doc/layout/pdf/fonts/SteLiB__.ttf - ${basedir}/src/doc/layout/pdf/fonts/SteLiB__.xml - - - StellaLining - - bold - - ${basedir}/src/doc/layout/pdf/fonts/SteLiBI_.ttf - - - ${basedir}/src/doc/layout/pdf/fonts/SteLiBI_.xml - - - - @@ -327,48 +291,22 @@ - http://svn.synyx.org/synyx/opensource/hera - scm:svn:http://svn.synyx.org/synyx/opensource/hera - scm:svn:https://svn.synyx.de/svn/synyx/opensource/hera + https://github.com/SpringSource/spring-plugin - Hudson + Bamboo - Redmine - http://hera.synyx.org + Github + https://github.com/SpringSource/spring-plugin/issues - - - static.synyx.org - scp://static.synyx.org/home/public/public_html/hera/site - - - sonatype - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - sonatype - https://oss.sonatype.org/content/repositories/snapshots - - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - Release Bundles - http://repository.springsource.com/maven/bundles/release - - false - - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundles - http://repository.springsource.com/maven/bundles/external + spring-release + http://repo.springsource.org/libs-release false @@ -377,9 +315,11 @@ - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Release Bundles - http://repository.springsource.com/maven/bundles/release + spring-plugins + http://repo.springsource.org/plugins-release + + false + diff --git a/si/.springBeans b/si/.springBeans deleted file mode 100644 index 85a42a9..0000000 --- a/si/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/si/src/main/resources/META-INF/spring.handlers b/si/src/main/resources/META-INF/spring.handlers deleted file mode 100644 index 3c33371..0000000 --- a/si/src/main/resources/META-INF/spring.handlers +++ /dev/null @@ -1 +0,0 @@ -http\://schemas.synyx.org/hera/si=org.synyx.hera.si.config.HeraSpringIntegrationNamespaceHandler \ No newline at end of file diff --git a/si/src/main/resources/META-INF/spring.schemas b/si/src/main/resources/META-INF/spring.schemas deleted file mode 100644 index 240da0b..0000000 --- a/si/src/main/resources/META-INF/spring.schemas +++ /dev/null @@ -1 +0,0 @@ -http\://schemas.synyx.org/hera/si/hera-si.xsd=org/synyx/hera/si/config/hera-si.xsd \ No newline at end of file diff --git a/si/src/main/resources/META-INF/spring.tooling b/si/src/main/resources/META-INF/spring.tooling deleted file mode 100644 index 8fa3d6e..0000000 --- a/si/src/main/resources/META-INF/spring.tooling +++ /dev/null @@ -1,4 +0,0 @@ -# Tooling related information for the Hera namespace -http\://schemas.synyx.org/hera/si@name=Hera Spring Integration Namespace -http\://schemas.synyx.org/hera/si@prefix=int-hera -http\://schemas.synyx.org/hera/si@icon=org/springframework/beans/factory/xml/spring-beans.gif \ No newline at end of file diff --git a/src/doc/layout/pdf/fo-pdf.xsl b/src/doc/layout/pdf/fo-pdf.xsl index 3065e1a..15c151d 100644 --- a/src/doc/layout/pdf/fo-pdf.xsl +++ b/src/doc/layout/pdf/fo-pdf.xsl @@ -43,9 +43,6 @@ - - - diff --git a/src/doc/layout/pdf/fonts/SteLiBI_.ttf b/src/doc/layout/pdf/fonts/SteLiBI_.ttf deleted file mode 100644 index 1423721..0000000 Binary files a/src/doc/layout/pdf/fonts/SteLiBI_.ttf and /dev/null differ diff --git a/src/doc/layout/pdf/fonts/SteLiBI_.xml b/src/doc/layout/pdf/fonts/SteLiBI_.xml deleted file mode 100644 index 66a9daa..0000000 --- a/src/doc/layout/pdf/fonts/SteLiBI_.xml +++ /dev/null @@ -1 +0,0 @@ -StellaLining,BoldItalic678525700-200-153-2581129946970-11TRUETYPEWinAnsiEncoding0255 \ No newline at end of file diff --git a/src/doc/layout/pdf/fonts/SteLiB__.ttf b/src/doc/layout/pdf/fonts/SteLiB__.ttf deleted file mode 100644 index d4857e6..0000000 Binary files a/src/doc/layout/pdf/fonts/SteLiB__.ttf and /dev/null differ diff --git a/src/doc/layout/pdf/fonts/SteLiB__.xml b/src/doc/layout/pdf/fonts/SteLiB__.xml deleted file mode 100644 index 77ec256..0000000 --- a/src/doc/layout/pdf/fonts/SteLiB__.xml +++ /dev/null @@ -1 +0,0 @@ -StellaLining,Bold678514700-200-54-25711229223300TRUETYPEWinAnsiEncoding0255 \ No newline at end of file diff --git a/src/doc/layout/pdf/fonts/SteLiI__.ttf b/src/doc/layout/pdf/fonts/SteLiI__.ttf deleted file mode 100644 index a4939f6..0000000 Binary files a/src/doc/layout/pdf/fonts/SteLiI__.ttf and /dev/null differ diff --git a/src/doc/layout/pdf/fonts/SteLiI__.xml b/src/doc/layout/pdf/fonts/SteLiI__.xml deleted file mode 100644 index 96d3cfe..0000000 --- a/src/doc/layout/pdf/fonts/SteLiI__.xml +++ /dev/null @@ -1 +0,0 @@ -StellaLining,Italic678522700-200-151-2581076907970-11TRUETYPEWinAnsiEncoding0255 \ No newline at end of file diff --git a/src/doc/layout/pdf/fonts/SteLiR__.ttf b/src/doc/layout/pdf/fonts/SteLiR__.ttf deleted file mode 100644 index 1bd0788..0000000 Binary files a/src/doc/layout/pdf/fonts/SteLiR__.ttf and /dev/null differ diff --git a/src/doc/layout/pdf/fonts/SteLiR__.xml b/src/doc/layout/pdf/fonts/SteLiR__.xml deleted file mode 100644 index 81ebb1e..0000000 --- a/src/doc/layout/pdf/fonts/SteLiR__.xml +++ /dev/null @@ -1 +0,0 @@ -StellaLining678504700-200-44-24510609093300TRUETYPEWinAnsiEncoding0255 \ No newline at end of file diff --git a/src/doc/layout/pdf/images/synyx-logo.tiff b/src/doc/layout/pdf/images/synyx-logo.tiff deleted file mode 100644 index 11687d3..0000000 Binary files a/src/doc/layout/pdf/images/synyx-logo.tiff and /dev/null differ diff --git a/src/doc/hera-reference.xml b/src/doc/spring-plugin-reference.xml similarity index 69% rename from src/doc/hera-reference.xml rename to src/doc/spring-plugin-reference.xml index f68d5a1..8f14307 100644 --- a/src/doc/hera-reference.xml +++ b/src/doc/spring-plugin-reference.xml @@ -1,13 +1,9 @@ - - -]> - + - Hera + Spring Plugin The smallest plugin system ever @@ -18,25 +14,23 @@ Gierke - Software Architect + Senior Member Technical Staff - Synyx GmbH & Co. KG + SpringSource, a division of VMware - gierke@synyx.de - -
Karlstraße 68, 76137 Karsruhe, Germany
+ ogierke (at) vmware.com - V0.4 + V0.8 23.09.2009 - 2009 + 2008-2012 - Synyx GmbH & Co. KG + The original authors @@ -87,6 +81,18 @@ Added section on plugin ordering + + + 21.02.2012 + + + Oliver + + Gierke + + + Move project to SpringSource + @@ -103,13 +109,14 @@ OSGi introduces a lot of complexity to projects. - Hera provides a more pragmatic approach to plugin development by - providing the core flexibility of having plugin implementations - extending a core system's functionality but of course not delivering - core OSGi features like dynamic class loading or - runtime installation and deployment of plugins. Although Hera thus is - not nearly as powerful as OSGi, it servers little man's - requirements to build a modular extensible application. + Spring Plugin provides a more pragmatic approach to plugin + development by providing the core flexibility of having plugin + implementations extending a core system's functionality but of course + not delivering core OSGi features like dynamic class + loading or runtime installation and deployment of plugins. Although + Spring Plugin thus is not nearly as powerful as OSGi, + it servers poor man's requirements to build a modular extensible + application.
@@ -142,8 +149,8 @@ - The last point actually is not essential although Hera gains a lot - of momentum in collaborative use with Spring. + The last point actually is not essential although Spring Plugin + gains a lot of momentum in collaborative use with Spring.
@@ -155,16 +162,18 @@ Spring is the defacto standard application framework for Java applications. Its consistent programming model, easy configuration and wide support for all kinds of third party libraries makes it the first - class citizen of application frameworks. Hera tightly integrates into - Spring's component model and extends the core container with some - custom functionality. + class citizen of application frameworks. Spring Plugin tightly + integrates into Spring's component model and extends the core + container with some custom functionality.
- &core; + - &metadata; + @@ -201,4 +210,4 @@ - \ No newline at end of file +