Author: mmao
Date: Tue Apr 10 05:26:44 2007
New Revision: 527103
URL: http://svn.apache.org/viewvc?view=rev&rev=527103
Log:
* Add provider name for default cxf frontend (jaxws) and default cxf
databinding (jaxb)
* Allow to override the default frontend and databinding plugin
Modified:
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
Modified:
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties?view=diff&rev=527103&r1=527102&r2=527103
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
(original)
+++
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
Tue Apr 10 05:26:44 2007
@@ -21,4 +21,7 @@
FOUND_NO_PLUGINS = WSDLTo tools can not find any plugins defined in the
classpath.
LOAD_PLUGIN_EXCEPTION = IOException during loading plugins
-PLUGIN_FILE_NOT_FOUND = Plugin file {0} can not be found
\ No newline at end of file
+PLUGIN_FILE_NOT_FOUND = Plugin file {0} can not be found
+
+REPLACED_DEFAULT_DATABINDING = Replaced default databinding {0}
+REPLACED_DEFAULT_FRONTEND = Replaced default frontend {0}
\ No newline at end of file
Modified:
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java?view=diff&rev=527103&r1=527102&r2=527103
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
Tue Apr 10 05:26:44 2007
@@ -51,6 +51,7 @@
public final class PluginLoader {
public static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
+ public static final String DEFAULT_PROVIDER_NAME = "cxf.apache.org";
private static PluginLoader pluginLoader;
private static final String PLUGIN_FILE_NAME = "META-INF/tools-plugin.xml";
@@ -138,6 +139,13 @@
LOG.log(Level.WARNING, "FRONTEND_MISSING_NAME",
plugin.getName());
continue;
}
+
+ if (frontends.containsKey(frontend.getName())
+ && DEFAULT_PROVIDER_NAME.equals(plugin.getProvider())) {
+ Message msg = new Message("REPLACED_DEFAULT_FRONTEND", LOG,
frontend.getName());
+ LOG.log(Level.INFO, msg.toString());
+ continue;
+ }
frontends.put(frontend.getName(), frontend);
}
@@ -150,6 +158,12 @@
LOG.log(Level.INFO, "LOADING_DATABINDING", new
Object[]{databinding.getName(), plugin.getName()});
if (StringUtils.isEmpty(databinding.getName())) {
LOG.log(Level.WARNING, "DATABINDING_MISSING_NAME",
plugin.getName());
+ continue;
+ }
+ if (databindings.containsKey(databinding.getName())
+ && DEFAULT_PROVIDER_NAME.equals(plugin.getProvider())) {
+ Message msg = new Message("REPLACED_DEFAULT_DATABINDING", LOG,
databinding.getName());
+ LOG.log(Level.INFO, msg.toString());
continue;
}
databindings.put(databinding.getName(), databinding);
Modified:
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml?view=diff&rev=527103&r1=527102&r2=527103
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
(original)
+++
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
Tue Apr 10 05:26:44 2007
@@ -18,6 +18,6 @@
under the License.
-->
-<plugin name="jaxb" version="" provider=""
xmlns="http://cxf.apache.org/tools/plugin";>
+<plugin name="jaxb" version="" provider="cxf.apache.org"
xmlns="http://cxf.apache.org/tools/plugin";>
<databinding name="jaxb"
package="org.apache.cxf.tools.wsdlto.databinding.jaxb"
profile="JAXBDataBinding"/>
</plugin>
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml?view=diff&rev=527103&r1=527102&r2=527103
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
Tue Apr 10 05:26:44 2007
@@ -18,7 +18,7 @@
under the License.
-->
-<plugin name="jaxws" version="" provider=""
xmlns="http://cxf.apache.org/tools/plugin";>
+<plugin name="jaxws" version="" provider="cxf.apache.org"
xmlns="http://cxf.apache.org/tools/plugin";>
<frontend name="jaxws"
package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
<container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
<processor name="WSDLToJavaProcessor"
package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
