diff --git a/pom.xml b/pom.xml index ab93f43..805a22a 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ core metadata - org.synyx.hera.si + si diff --git a/si/.project b/si/.project new file mode 100644 index 0000000..082c88c --- /dev/null +++ b/si/.project @@ -0,0 +1,29 @@ + + + org.synyx.hera.si + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/si/.settings/com.springsource.sts.config.flow.prefs b/si/.settings/com.springsource.sts.config.flow.prefs new file mode 100644 index 0000000..597ba7f --- /dev/null +++ b/si/.settings/com.springsource.sts.config.flow.prefs @@ -0,0 +1,4 @@ +#Wed May 25 16:09:30 CEST 2011 +//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/org.synyx.hera.si/src/test/resources/dynamic-service-activator-test-context.xml=\n\n\n\n\n\n\n\n\n\n +//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/org.synyx.hera.si/src/test/resources/service-activator-test-context.xml=\n\n\n\n\n\n\n\n\n\n +eclipse.preferences.version=1 diff --git a/si/.settings/org.eclipse.jdt.core.prefs b/si/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..d32fcd7 --- /dev/null +++ b/si/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,6 @@ +#Wed May 25 12:22:34 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/si/.settings/org.maven.ide.eclipse.prefs b/si/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 0000000..2d4cb0d --- /dev/null +++ b/si/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,8 @@ +#Wed May 25 12:22:34 CEST 2011 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/org.synyx.hera.si/.springBeans b/si/.springBeans similarity index 100% rename from org.synyx.hera.si/.springBeans rename to si/.springBeans diff --git a/org.synyx.hera.si/pom.xml b/si/pom.xml similarity index 96% rename from org.synyx.hera.si/pom.xml rename to si/pom.xml index de4385a..5e2eeae 100644 --- a/org.synyx.hera.si/pom.xml +++ b/si/pom.xml @@ -12,7 +12,7 @@ Hera Spring Integration integration - 2.0.3.RELEASE + 2.0.5.RELEASE 3.0.5.RELEASE diff --git a/org.synyx.hera.si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java b/si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java similarity index 100% rename from org.synyx.hera.si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java rename to si/src/main/java/org/synyx/hera/si/PluginRegistryAwareMessageHandler.java diff --git a/org.synyx.hera.si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java b/si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java similarity index 100% rename from org.synyx.hera.si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java rename to si/src/main/java/org/synyx/hera/si/config/DynamicServiceActivatorParser.java diff --git a/org.synyx.hera.si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java b/si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java similarity index 100% rename from org.synyx.hera.si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java rename to si/src/main/java/org/synyx/hera/si/config/HeraSpringIntegrationNamespaceHandler.java diff --git a/org.synyx.hera.si/src/main/resources/META-INF/spring.handlers b/si/src/main/resources/META-INF/spring.handlers similarity index 100% rename from org.synyx.hera.si/src/main/resources/META-INF/spring.handlers rename to si/src/main/resources/META-INF/spring.handlers diff --git a/org.synyx.hera.si/src/main/resources/META-INF/spring.schemas b/si/src/main/resources/META-INF/spring.schemas similarity index 100% rename from org.synyx.hera.si/src/main/resources/META-INF/spring.schemas rename to si/src/main/resources/META-INF/spring.schemas diff --git a/org.synyx.hera.si/src/main/resources/META-INF/spring.tooling b/si/src/main/resources/META-INF/spring.tooling similarity index 100% rename from org.synyx.hera.si/src/main/resources/META-INF/spring.tooling rename to si/src/main/resources/META-INF/spring.tooling diff --git a/org.synyx.hera.si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd b/si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd similarity index 100% rename from org.synyx.hera.si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd rename to si/src/main/resources/org/synyx/hera/si/config/hera-si.xsd diff --git a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java b/si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java similarity index 100% rename from org.synyx.hera.si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java rename to si/src/test/java/org/synyx/hera/si/PluginRegistryAwareMessageHandlerUnitTest.java diff --git a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java b/si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java similarity index 87% rename from org.synyx.hera.si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java rename to si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java index c7b24c2..e025d43 100644 --- a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java +++ b/si/src/test/java/org/synyx/hera/si/config/DynamicServiceActivatorNamespaceIntegrationTest.java @@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; +import org.springframework.integration.core.SubscribableChannel; +import org.springframework.integration.handler.LoggingHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -38,9 +40,14 @@ public class DynamicServiceActivatorNamespaceIntegrationTest { @Qualifier("sampleChannel") MessageChannel channel; + @Autowired + @Qualifier("foo") + SubscribableChannel sink; + @Test public void invokesPluginBasedOnPayload() { + sink.subscribe(new LoggingHandler("DEBUG")); Message message = MessageBuilder.withPayload("FOO").build(); channel.send(message); } diff --git a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java b/si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java similarity index 100% rename from org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java rename to si/src/test/java/org/synyx/hera/si/sample/FirstSamplePluginImpl.java diff --git a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java b/si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java similarity index 100% rename from org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java rename to si/src/test/java/org/synyx/hera/si/sample/SamplePlugin.java diff --git a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java b/si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java similarity index 100% rename from org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java rename to si/src/test/java/org/synyx/hera/si/sample/SecondSamplePluginImpl.java diff --git a/org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java b/si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java similarity index 100% rename from org.synyx.hera.si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java rename to si/src/test/java/org/synyx/hera/si/sample/ThirdSamplePluginImpl.java diff --git a/org.synyx.hera.si/src/test/resources/dynamic-service-activator-test-context.xml b/si/src/test/resources/dynamic-service-activator-test-context.xml similarity index 100% rename from org.synyx.hera.si/src/test/resources/dynamic-service-activator-test-context.xml rename to si/src/test/resources/dynamic-service-activator-test-context.xml diff --git a/si/src/test/resources/log4j.properties b/si/src/test/resources/log4j.properties new file mode 100644 index 0000000..3774e1f --- /dev/null +++ b/si/src/test/resources/log4j.properties @@ -0,0 +1,12 @@ +# Direct log messages to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +# Root logger option +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 diff --git a/org.synyx.hera.si/template.mf b/si/template.mf similarity index 91% rename from org.synyx.hera.si/template.mf rename to si/template.mf index c46502d..a57881d 100644 --- a/org.synyx.hera.si/template.mf +++ b/si/template.mf @@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Template: ${project.artifactId}.*;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.integration.*;version="${spring.integration.version:[=.=.=.=,+1.0.0)}",