Author: alessio.soldano(a)jboss.com Date: 2010-09-04 13:28:37 -0400 (Sat, 04 Sep 2010) New Revision: 393 Added: core/trunk/core-native/src/main/resources/META-INF/services/ core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate Removed: core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate Modified: core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java Log: [WISE-169] Fixing position of EnablerDelegate service configuration in produced artifact, adding setConfigName/File methods to EnablerDelegate interface for allowing concrete implementations to be retrieved via Service API Modified: core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java 2010-09-04 16:57:41 UTC (rev 392) +++ core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/DefaultEnablerDelegate.java 2010-09-04 17:28:37 UTC (rev 393) @@ -38,6 +38,24 @@ /** * {@inheritDoc} * + * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigFile(String) + */ + public void setConfigFile(String configFile) { + //NOOP + } + + /** + * {@inheritDoc} + * + * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigName(String) + */ + public void setConfigName(String configName) { + //NOOP + } + + /** + * {@inheritDoc} + * * @see org.jboss.wise.core.wsextensions.EnablerDelegate#visitMTOM(Object) */ public void visitMTOM( Object endpointInstance ) throws UnsupportedOperationException { Modified: core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java 2010-09-04 16:57:41 UTC (rev 392) +++ core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegate.java 2010-09-04 17:28:37 UTC (rev 393) @@ -41,7 +41,21 @@ public interface EnablerDelegate { /** + * Sets the configFile to be used, if any * + * @param configFile + */ + public void setConfigFile(String configFile); + + /** + * Sets the configName to be used, if any + * + * @param configName + */ + public void setConfigName(String configName); + + /** + * * @param endpointInstance * @throws UnsupportedOperationException * @throws IllegalStateException Modified: core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java 2010-09-04 16:57:41 UTC (rev 392) +++ core/trunk/core/src/main/java/org/jboss/wise/core/wsextensions/EnablerDelegateProvider.java 2010-09-04 17:28:37 UTC (rev 393) @@ -21,7 +21,7 @@ */ package org.jboss.wise.core.wsextensions; -import org.jboss.wsf.spi.util.ServiceLoader; +import org.jboss.wise.core.client.SpiLoader; /** @@ -35,6 +35,9 @@ public static EnablerDelegate newEnablerDelegate(String configFile, String configName) { - return (EnablerDelegate)ServiceLoader.loadService(EnablerDelegate.class.getName(), DefaultEnablerDelegate.class.getName()); + EnablerDelegate ed = (EnablerDelegate)SpiLoader.loadService(EnablerDelegate.class.getName(), DefaultEnablerDelegate.class.getName()); + ed.setConfigFile(configFile); + ed.setConfigName(configName); + return ed; } } Modified: core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java =================================================================== --- core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java 2010-09-04 16:57:41 UTC (rev 392) +++ core/trunk/core-native/src/main/java/org/jboss/wise/core/wsextensions/impl/jbosswsnative/ReflectionEnablerDelegate.java 2010-09-04 17:28:37 UTC (rev 393) @@ -45,8 +45,12 @@ @Immutable public class ReflectionEnablerDelegate extends DefaultEnablerDelegate { - private final String configFileURL; - private final String configName; + private String configFileURL; + private String configName; + + public ReflectionEnablerDelegate() { + super(); + } /** * @param configFileURL @@ -58,6 +62,24 @@ this.configFileURL = configFileURL; this.configName = configName; } + + /** + * {@inheritDoc} + * + * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigFile(String) + */ + public void setConfigFile(String configFile) { + this.configFileURL = configFile; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.wise.core.wsextensions.EnablerDelegate#setConfigName(String) + */ + public void setConfigName(String configName) { + this.configName = configName; + } /** * {@inheritDoc} Deleted: core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate =================================================================== --- core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-09-04 16:57:41 UTC (rev 392) +++ core/trunk/core-native/src/main/resources/META-INF/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-09-04 17:28:37 UTC (rev 393) @@ -1 +0,0 @@ -org.jboss.wise.core.wsextensions.impl.jbosswsnative.ReflectionEnablerDelegate \ No newline at end of file Added: core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate =================================================================== --- core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate (rev 0) +++ core/trunk/core-native/src/main/resources/META-INF/services/org.jboss.wise.core.wsextensions.EnablerDelegate 2010-09-04 17:28:37 UTC (rev 393) @@ -0,0 +1 @@ +org.jboss.wise.core.wsextensions.impl.jbosswsnative.ReflectionEnablerDelegate \ No newline at end of file