JBossWS SVN: r11489 - in common/branches/jbossws-common-1.1.0/src: main/java/org/jboss/wsf/common and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-26 10:19:31 -0500 (Tue, 26 Jan 2010)
New Revision: 11489
Removed:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/JBossWSDocumentBuilderFactory.java
common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/DummyDocumentBuilderFactory.java
common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/JBossWSDocumentBuilderFactoryTestCase.java
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/DOMUtils.java
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/SecurityActions.java
Log:
[JBPAPP-3544] JBossWS - Optimize DocumentBuilderFactory creation using DocumentBuilderFactory.newInstance(String s, ClassLoader c)
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java 2010-01-26 08:53:42 UTC (rev 11488)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java 2010-01-26 15:19:31 UTC (rev 11489)
@@ -302,4 +302,6 @@
static final String EAGER_INITIALIZE_JAXB_CONTEXT_CACHE = "org.jboss.ws.eagerInitializeJAXBContextCache";
static final String DOM_CONTENT_CANONICAL_NORMALIZATION = "org.jboss.ws.DOMContentCanonicalNormalization";
+
+ static final String ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY = "org.jboss.ws.alwaysResolveDocumentBuilderFactory";
}
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-01-26 08:53:42 UTC (rev 11488)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-01-26 15:19:31 UTC (rev 11489)
@@ -48,6 +48,7 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.logging.Logger;
+import org.jboss.ws.Constants;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -71,7 +72,12 @@
private static final String DISABLE_DEFERRED_NODE_EXPANSION = "org.jboss.ws.disable_deferred_node_expansion";
private static final String DEFER_NODE_EXPANSION_FEATURE = "http://apache.org/xml/features/dom/defer-node-expansion";
-
+
+ private static String documentBuilderFactoryName;
+
+ private static final boolean alwaysResolveFactoryName = Boolean.getBoolean(Constants.ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY);
+ private static final boolean disableDeferedNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION);
+
// All elements created by the same thread are created by the same builder and belong to the same doc
private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>();
private static ThreadLocal<DocumentBuilder> builderThreadLocal = new ThreadLocal<DocumentBuilder>() {
@@ -80,14 +86,31 @@
DocumentBuilderFactory factory = null;
try
{
- factory = JBossWSDocumentBuilderFactory.newInstance();
+ //slow
+ //factory = DocumentBuilderFactory.newInstance();
+
+ //fast (requires JDK6 or greater)
+ if (documentBuilderFactoryName == null || alwaysResolveFactoryName)
+ {
+ factory = DocumentBuilderFactory.newInstance();
+ if (!alwaysResolveFactoryName)
+ {
+ documentBuilderFactoryName = factory.getClass().getCanonicalName();
+ }
+ }
+ else
+ {
+ factory = DocumentBuilderFactory.newInstance(documentBuilderFactoryName, SecurityActions.getContextClassLoader());
+ }
+
+
factory.setValidating(false);
factory.setNamespaceAware(true);
try
{
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
- if (Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION))
+ if (disableDeferedNodeExpansion)
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
}
Deleted: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/JBossWSDocumentBuilderFactory.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/JBossWSDocumentBuilderFactory.java 2010-01-26 08:53:42 UTC (rev 11488)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/JBossWSDocumentBuilderFactory.java 2010-01-26 15:19:31 UTC (rev 11489)
@@ -1,492 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.WeakHashMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.validation.Schema;
-
-import org.jboss.logging.Logger;
-
-/**
- * A thread-safe {@link DocumentBuilderFactory} that also adds a caching system
- * for preventing useless access to the filesystem due to the Service API when
- * the same context classloader is in place.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 22-Dec-2009
- *
- */
-public class JBossWSDocumentBuilderFactory extends DocumentBuilderFactory
-{
- private static Logger log = Logger.getLogger(JBossWSDocumentBuilderFactory.class);
- private static final String PROPERTY_NAME = "javax.xml.parsers.DocumentBuilderFactory";
- private static final boolean useJaxpProperty;
- /**
- * A weak hash map that keeps DocumentBuilderFactory instances for each classloader.
- * Weak keys are used to remove entries when classloaders are garbage collected.
- *
- * No need for a synchronized map as this accessed from the
- * static synchronized newInstance newInstance method.
- */
- private static Map<ClassLoader, JBossWSDocumentBuilderFactory> factoryMap = new WeakHashMap<ClassLoader, JBossWSDocumentBuilderFactory>();
-
- private final DocumentBuilderFactory delegate;
-
- //ThreadLocal attributes and features maps required to achieve thread safety
- private ThreadLocal<DocumentBuilderFactoryFields> fields = new ThreadLocal<DocumentBuilderFactoryFields>() {
- @Override
- protected DocumentBuilderFactoryFields initialValue()
- {
- return new DocumentBuilderFactoryFields();
- }
- };
-
- static
- {
- // Use the properties file "lib/jaxp.properties" in the JRE directory.
- // This configuration file is in standard java.util.Properties format and contains the fully
- // qualified name of the implementation class with the key being the system property defined above.
- PrivilegedAction<Object> action = new PropertyAccessAction("java.home");
- String javaHome = (String)AccessController.doPrivileged(action);
- File jaxmFile = new File(javaHome + "/lib/jaxp.properties");
- if ((Boolean)AccessController.doPrivileged(new PropertyFileExistAction(jaxmFile)))
- {
- String factoryName = null;
- boolean error = false;
- try
- {
- action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
- Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
- factoryName = jaxmProperties.getProperty(PROPERTY_NAME);
- }
- catch (IOException e)
- {
- log.warn("Can't read " + jaxmFile);
- error = true;
- }
- finally
- {
- useJaxpProperty = (error || (factoryName != null));
- }
- }
- else
- {
- useJaxpProperty = false;
- }
- }
-
- private JBossWSDocumentBuilderFactory(DocumentBuilderFactory delegate)
- {
- this.delegate = delegate;
- }
-
- @Override
- public Object getAttribute(String name) throws IllegalArgumentException
- {
- return fields.get().getAttribute(name);
- }
-
- @Override
- public boolean getFeature(String name) throws ParserConfigurationException
- {
- return fields.get().getFeature(name);
- }
-
- /**
- * The creation method for the document builder; it's synchronized to allow us configuring the underlying
- * DocumentBuilderFactory and delegate to it in a thread safe way.
- *
- */
- @Override
- public synchronized DocumentBuilder newDocumentBuilder() throws ParserConfigurationException
- {
- DocumentBuilderFactoryFields currentFields = fields.get();
- currentFields.copyTo(delegate);
- return delegate.newDocumentBuilder();
- }
-
- @Override
- public void setAttribute(String name, Object value) throws IllegalArgumentException
- {
- fields.get().setAttribute(name, value);
- }
-
- @Override
- public void setFeature(String name, boolean value) throws ParserConfigurationException
- {
- fields.get().setFeature(name, value);
- }
-
- @Override
- public boolean isCoalescing()
- {
- return fields.get().isCoalescing();
- }
-
- @Override
- public void setCoalescing(boolean coalescing)
- {
- fields.get().setCoalescing(coalescing);
- }
-
- @Override
- public boolean isExpandEntityReferences()
- {
- return fields.get().isExpandEntityReferences();
- }
-
- @Override
- public void setExpandEntityReferences(boolean expandEntityReferences)
- {
- fields.get().setExpandEntityReferences(expandEntityReferences);
- }
-
- @Override
- public boolean isIgnoringComments()
- {
- return fields.get().isIgnoringComments();
- }
-
- @Override
- public void setIgnoringComments(boolean ignoringComments)
- {
- fields.get().setIgnoringComments(ignoringComments);
- }
-
- @Override
- public boolean isIgnoringElementContentWhitespace()
- {
- return fields.get().isIgnoringElementContentWhitespace();
- }
-
- @Override
- public void setIgnoringElementContentWhitespace(boolean ignoringElementContentWhitespace)
- {
- fields.get().setIgnoringElementContentWhitespace(ignoringElementContentWhitespace);
- }
-
- @Override
- public boolean isNamespaceAware()
- {
- return fields.get().isNamespaceAware();
- }
-
- @Override
- public void setNamespaceAware(boolean namespaceAware)
- {
- fields.get().setNamespaceAware(namespaceAware);
- }
-
- @Override
- public Schema getSchema()
- {
- return fields.get().getSchema();
- }
-
- @Override
- public void setSchema(Schema schema)
- {
- fields.get().setSchema(schema);
- }
-
- @Override
- public boolean isValidating()
- {
- return fields.get().isValidating();
- }
-
- @Override
- public void setValidating(boolean validating)
- {
- fields.get().setValidating(validating);
- }
-
- @Override
- public boolean isXIncludeAware()
- {
- return fields.get().isXIncludeAware();
- }
-
- @Override
- public void setXIncludeAware(boolean includeAware)
- {
- fields.get().setXIncludeAware(includeAware);
- }
-
- /**
- * The {@link DocumentBuilderFactory#newInstance()} documentation defines the retrieval algorithm:
- *
- * 1) Use the javax.xml.parsers.DocumentBuilderFactory system property.
- * 2) Use the properties file "lib/jaxp.properties" in the JRE directory. This configuration file is in standard java.util.Properties format
- * and contains the fully qualified name of the implementation class with the key being the system property defined above. The jaxp.properties
- * file is read only once by the JAXP implementation and it's values are then cached for future use. If the file does not exist when the first
- * attempt is made to read from it, no further attempts are made to check for its existence. It is not possible to change the value of any
- * property in jaxp.properties after it has been read for the first time.
- * 3) Use the Services API (as detailed in the JAR specification), if available, to determine the classname. The Services API will look for a
- * classname in the file META-INF/services/javax.xml.parsers.DocumentBuilderFactory in jars available to the runtime.
- * 4) Platform default DocumentBuilderFactory instance.
- *
- * So we basically check if 1) or 2) applies: if yes, we simply delegate to the DocumentBuilderFactory, otherwise we first try using our classloader
- * cache and delegate to the DocumentBuilderFactory only in case of a miss in the cache. Then we wrap up the result into a JBossWSDocumentBuilderFactory
- * instance.
- *
- * @return a DocumentBuilderFactoryInstance
- */
- public static synchronized JBossWSDocumentBuilderFactory newInstance()
- {
- if (useJaxpProperty || getFactoryNameFromSystemProperty() != null)
- {
- return new JBossWSDocumentBuilderFactory(DocumentBuilderFactory.newInstance());
- }
- ClassLoader classLoader = SecurityActions.getContextClassLoader();
- JBossWSDocumentBuilderFactory factory = factoryMap.get(classLoader);
- if (factory == null)
- {
- factory = new JBossWSDocumentBuilderFactory(DocumentBuilderFactory.newInstance());
- factoryMap.put(classLoader, factory);
- }
- return factory;
- }
-
- private static String getFactoryNameFromSystemProperty()
- {
- PrivilegedAction<Object> action = new PropertyAccessAction(PROPERTY_NAME);
- return (String)AccessController.doPrivileged(action);
- }
-
-
- //--------------------------------- Utility privileged actions
-
- private static class PropertyAccessAction implements PrivilegedAction<Object>
- {
- private String name;
-
- PropertyAccessAction(String name)
- {
- this.name = name;
- }
-
- public Object run()
- {
- return System.getProperty(name);
- }
- }
-
- private static class PropertyFileAccessAction implements PrivilegedAction<Object>
- {
- private String filename;
-
- PropertyFileAccessAction(String filename)
- {
- this.filename = filename;
- }
-
- public Object run()
- {
- InputStream inStream = null;
- try
- {
- inStream = new FileInputStream(filename);
- Properties props = new Properties();
- props.load(inStream);
- return props;
- }
- catch (IOException ex)
- {
- throw new SecurityException("Cannot load properties: " + filename, ex);
- }
- finally
- {
- try
- {
- inStream.close();
- }
- catch (Exception e) {} //ignore
- }
- }
- }
-
- private static class PropertyFileExistAction implements PrivilegedAction<Object>
- {
- private File file;
-
- PropertyFileExistAction(File file)
- {
- this.file = file;
- }
-
- public Object run()
- {
- return file.exists();
- }
- }
-
- /**
- * A utility class for storing the document builder factory fields in the ThreadLocal
- */
- private static class DocumentBuilderFactoryFields {
- private boolean coalescing = false;
- private boolean expandEntityReferences = true;
- private boolean ignoringComments = false;
- private boolean ignoringElementContentWhitespace = false;
- private boolean namespaceAware = false;
- private Schema schema = null;
- private boolean validating = false;
- private boolean XIncludeAware = false;
- private Map<String, Object> attributes = new HashMap<String, Object>();
- private Map<String, Boolean> features = new HashMap<String, Boolean>();
-
- public void copyTo(DocumentBuilderFactory target) throws ParserConfigurationException
- {
- target.setCoalescing(coalescing);
- target.setExpandEntityReferences(expandEntityReferences);
- target.setIgnoringComments(ignoringComments);
- target.setIgnoringElementContentWhitespace(ignoringElementContentWhitespace);
- target.setNamespaceAware(namespaceAware);
- target.setSchema(schema);
- target.setValidating(validating);
- target.setXIncludeAware(XIncludeAware);
- for (String key : attributes.keySet())
- {
- target.setAttribute(key, attributes.get(key));
- }
- for (String key : features.keySet())
- {
- target.setFeature(key, features.get(key));
- }
- }
-
- public Object getAttribute(String name)
- {
- return attributes.get(name);
- }
-
- public Boolean getFeature(String name)
- {
- return features.get(name);
- }
-
- public void setAttribute(String key, Object value)
- {
- this.attributes.put(key, value);
- }
-
- public void setFeature(String key, Boolean value)
- {
- this.features.put(key, value);
- }
-
- public boolean isCoalescing()
- {
- return coalescing;
- }
-
- public void setCoalescing(boolean coalescing)
- {
- this.coalescing = coalescing;
- }
-
- public boolean isExpandEntityReferences()
- {
- return expandEntityReferences;
- }
-
- public void setExpandEntityReferences(boolean expandEntityReferences)
- {
- this.expandEntityReferences = expandEntityReferences;
- }
-
- public boolean isIgnoringComments()
- {
- return ignoringComments;
- }
-
- public void setIgnoringComments(boolean ignoringComments)
- {
- this.ignoringComments = ignoringComments;
- }
-
- public boolean isIgnoringElementContentWhitespace()
- {
- return ignoringElementContentWhitespace;
- }
-
- public void setIgnoringElementContentWhitespace(boolean ignoringElementContentWhitespace)
- {
- this.ignoringElementContentWhitespace = ignoringElementContentWhitespace;
- }
-
- public boolean isNamespaceAware()
- {
- return namespaceAware;
- }
-
- public void setNamespaceAware(boolean namespaceAware)
- {
- this.namespaceAware = namespaceAware;
- }
-
- public Schema getSchema()
- {
- return schema;
- }
-
- public void setSchema(Schema schema)
- {
- this.schema = schema;
- }
-
- public boolean isValidating()
- {
- return validating;
- }
-
- public void setValidating(boolean validating)
- {
- this.validating = validating;
- }
-
- public boolean isXIncludeAware()
- {
- return XIncludeAware;
- }
-
- public void setXIncludeAware(boolean includeAware)
- {
- XIncludeAware = includeAware;
- }
- }
-
-}
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/SecurityActions.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/SecurityActions.java 2010-01-26 08:53:42 UTC (rev 11488)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/SecurityActions.java 2010-01-26 15:19:31 UTC (rev 11489)
@@ -89,4 +89,23 @@
});
}
}
+
+ /**
+ * Return the current value of the specified system property
+ *
+ * @param name
+ * @param defaultValue
+ * @return
+ */
+ static String getSystemProperty(final String name, final String defaultValue)
+ {
+ PrivilegedAction<String> action = new PrivilegedAction<String>()
+ {
+ public String run()
+ {
+ return System.getProperty(name, defaultValue);
+ }
+ };
+ return AccessController.doPrivileged(action);
+ }
}
\ No newline at end of file
Deleted: common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/DummyDocumentBuilderFactory.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/DummyDocumentBuilderFactory.java 2010-01-26 08:53:42 UTC (rev 11488)
+++ common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/DummyDocumentBuilderFactory.java 2010-01-26 15:19:31 UTC (rev 11489)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.common.utils;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * A dummy document builder factory just for testing in {@link JBossWSDocumentBuilderFactoryTestCase}.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 23-Dec-2009
- *
- */
-public class DummyDocumentBuilderFactory extends DocumentBuilderFactory
-{
- @Override
- public Object getAttribute(String name) throws IllegalArgumentException
- {
- return null;
- }
-
- @Override
- public boolean getFeature(String name) throws ParserConfigurationException
- {
- return false;
- }
-
- @Override
- public DocumentBuilder newDocumentBuilder() throws ParserConfigurationException
- {
- return null;
- }
-
- @Override
- public void setAttribute(String name, Object value) throws IllegalArgumentException
- {
- }
-
- @Override
- public void setFeature(String name, boolean value) throws ParserConfigurationException
- {
- }
-}
Deleted: common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/JBossWSDocumentBuilderFactoryTestCase.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/JBossWSDocumentBuilderFactoryTestCase.java 2010-01-26 08:53:42 UTC (rev 11488)
+++ common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/utils/JBossWSDocumentBuilderFactoryTestCase.java 2010-01-26 15:19:31 UTC (rev 11489)
@@ -1,191 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.common.utils;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import junit.framework.TestCase;
-
-import org.jboss.wsf.common.JBossWSDocumentBuilderFactory;
-
-/**
- * Tests for the JBossWSDocumentBuilderFactory
- *
- * @author alessio.soldano(a)jboss.com
- * @since 23-Dec-2009
- *
- */
-public class JBossWSDocumentBuilderFactoryTestCase extends TestCase
-{
- public void testCaching() throws Exception
- {
- final String propName = "javax.xml.parsers.DocumentBuilderFactory";
- String origValue = System.getProperty(propName);
- try
- {
- //remove system prop if any, to get the same factory for a given classloader
- System.getProperties().remove(propName);
- DocumentBuilderFactory factory1 = JBossWSDocumentBuilderFactory.newInstance();
- DocumentBuilderFactory factory2 = JBossWSDocumentBuilderFactory.newInstance();
- assertTrue("Expected the same factory", factory1.equals(factory2));
-
- //set the system prop, we should get different factories every time as the classloader based cache is by-passed
- System.setProperty(propName, DummyDocumentBuilderFactory.class.getCanonicalName());
- DocumentBuilderFactory factory3 = JBossWSDocumentBuilderFactory.newInstance();
- assertTrue("Expected different factories", !factory3.equals(factory1));
- assertTrue("Expected different factories", !factory3.equals(factory2));
- DocumentBuilderFactory factory4 = JBossWSDocumentBuilderFactory.newInstance();
- assertTrue("Expected different factories", !factory4.equals(factory1));
- assertTrue("Expected different factories", !factory4.equals(factory2));
- assertTrue("Expected different factories", !factory4.equals(factory3));
-
- //remove the prop again, we should get the first factory
- System.getProperties().remove(propName);
- DocumentBuilderFactory factory5 = JBossWSDocumentBuilderFactory.newInstance();
- assertTrue("Expected the same factory", factory5.equals(factory1));
-
- ClassLoader origLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- //change context classloader
- Thread.currentThread().setContextClassLoader(new TestClassLoader(origLoader));
- DocumentBuilderFactory factory6 = JBossWSDocumentBuilderFactory.newInstance();
- assertTrue("Expected different factories", !factory6.equals(factory1));
- DocumentBuilderFactory factory7 = JBossWSDocumentBuilderFactory.newInstance();
- assertTrue("Expected the same factory", factory7.equals(factory6));
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(origLoader);
- }
- }
- finally
- {
- if (origValue == null)
- {
- System.getProperties().remove(propName);
- }
- else
- {
- System.setProperty(propName, origValue);
- }
- }
- }
-
- public void testThreadSafety() throws Exception
- {
- DocumentBuilderFactory factory = JBossWSDocumentBuilderFactory.newInstance();
- List<Callable<Boolean>> callables = new LinkedList<Callable<Boolean>>();
- for (int j = 0; j < 3; j++)
- {
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, true, true, true));
- }
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, true, true, false));
- }
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, true, false, false));
- }
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, false, false, false));
- }
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, false, false, true));
- }
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, false, true, true));
- }
- for (int i = 0; i < 10; i++)
- {
- callables.add(new TestCallable(factory, false, true, false));
- }
- }
- ExecutorService es = Executors.newFixedThreadPool(210);
- List<Future<Boolean>> futures = es.invokeAll(callables);
- for (Future<Boolean> f : futures)
- {
- assertTrue(f.get());
- }
- }
-
- /**
- * A Callable that use the provided thread safe factory to create a document builder and verifies it has the required configuration
- */
- public static class TestCallable implements Callable<Boolean>
- {
- private final DocumentBuilderFactory factory;
- private final Boolean namespaceAware;
- private final Boolean validating;
- private final Boolean XIncludeAware;
-
- public TestCallable(DocumentBuilderFactory factory, boolean namespaceAware, boolean validating, boolean includeAware)
- {
- this.factory = factory;
- this.namespaceAware = namespaceAware;
- this.validating = validating;
- this.XIncludeAware = includeAware;
- }
-
- public Boolean call() throws Exception
- {
- factory.setNamespaceAware(namespaceAware);
- factory.setValidating(validating);
- factory.setXIncludeAware(XIncludeAware);
- DocumentBuilder builder = factory.newDocumentBuilder();
- if (!namespaceAware.equals(builder.isNamespaceAware()))
- return false;
- if (!validating.equals(builder.isValidating()))
- return false;
- if (!XIncludeAware.equals(builder.isXIncludeAware()))
- return false;
- return true;
- }
-
- }
-
- /**
- * A ClassLoader doing nothing except falling back to its parent
- */
- public static class TestClassLoader extends ClassLoader
- {
- public TestClassLoader(ClassLoader parent)
- {
- super(parent);
- }
- }
-
-}
15 years
JBossWS SVN: r11488 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-26 03:53:42 -0500 (Tue, 26 Jan 2010)
New Revision: 11488
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
Log:
[JBAS-7652] cleanup endorsed JAX-WS 2.2 API
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-26 08:53:15 UTC (rev 11487)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-26 08:53:42 UTC (rev 11488)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/MET!
A-INF/standard-*-config.xml
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-26 08:53:15 UTC (rev 11487)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-26 08:53:42 UTC (rev 11488)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/defau!
lt/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-j!
boss-beans.xml server/default/deployers/jbossws.deployer/META-!
INF/stan
dard-*-config.xml
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-26 08:53:15 UTC (rev 11487)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-26 08:53:42 UTC (rev 11488)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xm!
l server/standard/deployers/jbossws.deployer/META-INF/standard!
-*-confi
g.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jboss!
ws-container-jboss-beans.xml server/standard/deployers/jbossws!
.deploye
r/META-INF/standard-*-config.xml
15 years
JBossWS SVN: r11487 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-26 03:53:15 -0500 (Tue, 26 Jan 2010)
New Revision: 11487
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
Log:
[JBAS-7652] cleanup endorsed JAX-WS 2.2 API
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-26 08:52:44 UTC (rev 11486)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-26 08:53:15 UTC (rev 11487)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/MET!
A-INF/standard-*-config.xml
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-26 08:52:44 UTC (rev 11486)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-26 08:53:15 UTC (rev 11487)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/defau!
lt/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-j!
boss-beans.xml server/default/deployers/jbossws.deployer/META-!
INF/stan
dard-*-config.xml
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-26 08:52:44 UTC (rev 11486)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-26 08:53:15 UTC (rev 11487)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xm!
l server/standard/deployers/jbossws.deployer/META-INF/standard!
-*-confi
g.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jboss!
ws-container-jboss-beans.xml server/standard/deployers/jbossws!
.deploye
r/META-INF/standard-*-config.xml
15 years
JBossWS SVN: r11486 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-26 03:52:44 -0500 (Tue, 26 Jan 2010)
New Revision: 11486
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
Log:
[JBAS-7652] cleanup endorsed JAX-WS 2.2 API
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-26 08:47:43 UTC (rev 11485)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-01-26 08:52:44 UTC (rev 11486)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/MET!
A-INF/standard-*-config.xml
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-26 08:47:43 UTC (rev 11485)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-01-26 08:52:44 UTC (rev 11486)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/defau!
lt/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-j!
boss-beans.xml server/default/deployers/jbossws.deployer/META-!
INF/stan
dard-*-config.xml
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-26 08:47:43 UTC (rev 11485)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-01-26 08:52:44 UTC (rev 11486)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xm!
l server/standard/deployers/jbossws.deployer/META-INF/standard!
-*-confi
g.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/li!
b/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jboss!
ws-container-jboss-beans.xml server/standard/deployers/jbossws!
.deploye
r/META-INF/standard-*-config.xml
15 years
JBossWS SVN: r11485 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-26 03:47:43 -0500 (Tue, 26 Jan 2010)
New Revision: 11485
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBAS-7652] endorsing JAX-WS 2.2 API
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-01-26 07:52:22 UTC (rev 11484)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-01-26 08:47:43 UTC (rev 11485)
@@ -58,6 +58,7 @@
<patternset id="jbossws.lib.endorsed.patternset">
<include name="**/jbossws-native-factories.jar"/>
<include name="**/jaxb-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
15 years
JBossWS SVN: r11484 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-26 02:52:22 -0500 (Tue, 26 Jan 2010)
New Revision: 11484
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBAS-7631] enabling test
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-01-25 10:32:47 UTC (rev 11483)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-01-26 07:52:22 UTC (rev 11484)
@@ -6,6 +6,3 @@
# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
org/jboss/test/ws/jaxws/jbws2718/**
-
-# [JBAS-7631] NPE in EjbReferenceResolverBase.getMatch() method
-org/jboss/test/ws/jaxws/jbws2634/**
15 years
JBossWS SVN: r11483 - common/trunk/src/main/java/org/jboss/wsf/common/management.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-01-25 05:32:47 -0500 (Mon, 25 Jan 2010)
New Revision: 11483
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
Log:
improving JBossWS boot message
Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-01-25 10:27:01 UTC (rev 11482)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-01-25 10:32:47 UTC (rev 11483)
@@ -157,9 +157,8 @@
//Retrieve the stackConfig using SPIProvider
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
this.stackConfig = spiProvider.getSPI(StackConfigFactory.class).getStackConfig();
-
- log.info(getImplementationTitle());
- log.info(getImplementationVersion());
+
+ log.info(getImplementationTitle() + ' ' + getImplementationVersion());
getMbeanServer().registerMBean(this, AbstractServerConfigMBean.OBJECT_NAME);
}
15 years
JBossWS SVN: r11482 - in stack/cxf/branches/jaxrpc-cxf/modules/server/src/main: resources and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-25 05:27:01 -0500 (Mon, 25 Jan 2010)
New Revision: 11482
Modified:
stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java
stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
Log:
Using new AbstractDeploymentAspect, moving WSAspectizedDeployer to stack specific config, providing sensible values for isForJaxWs / isForJaxRpc
Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-01-25 10:23:26 UTC (rev 11481)
+++ stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-01-25 10:27:01 UTC (rev 11482)
@@ -31,10 +31,10 @@
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
@@ -46,7 +46,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 10-May-2007
*/
-public class DescriptorDeploymentAspect extends DeploymentAspect
+public class DescriptorDeploymentAspect extends AbstractDeploymentAspect
{
// provide logging
private final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class);
Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java 2010-01-25 10:23:26 UTC (rev 11481)
+++ stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java 2010-01-25 10:27:01 UTC (rev 11482)
@@ -21,9 +21,9 @@
*/
package org.jboss.wsf.stack.cxf;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ResourceResolver;
@@ -36,7 +36,7 @@
* @author alessio.soldano(a)jboss.com
* @since 19-Nov-2009
*/
-public class ResourceResolverDeploymentAspect extends DeploymentAspect
+public class ResourceResolverDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-01-25 10:23:26 UTC (rev 11481)
+++ stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-01-25 10:27:01 UTC (rev 11482)
@@ -1,7 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+
+ <!-- WSDeploymentAspectDeployers factory -->
+ <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory">
+ <constructor>
+ <parameter>
+ <inject bean="Deployers"/>
+ </parameter>
+ </constructor>
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ <property name="includeJaxRpc">false</property>
+ </bean>
+
<!-- The registry for web service endpoints -->
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
@@ -35,6 +47,7 @@
</entry>
</map>
</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
@@ -42,16 +55,19 @@
<property name="provides">StackDescriptor</property>
<property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
<property name="provides">ResourceResolver</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">StackEndpointHandler</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
@@ -64,10 +80,12 @@
<inject bean="WSLogRecorder"/>
</list>
</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
<property name="provides">JAXBIntros</property>
+ <property name="forJaxRpc">false</property>
</bean>
</deployment>
15 years
JBossWS SVN: r11481 - stack/cxf/branches.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-25 05:23:26 -0500 (Mon, 25 Jan 2010)
New Revision: 11481
Added:
stack/cxf/branches/jaxrpc-cxf/
Log:
[JBWS-2895] Branching (-r 11464) for working on prototypes
Copied: stack/cxf/branches/jaxrpc-cxf (from rev 11464, stack/cxf/trunk)
15 years
JBossWS SVN: r11480 - in stack/native/branches/jaxrpc-cxf/modules/core/src/main: java/org/jboss/wsf/stack/jbws and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-01-25 05:21:43 -0500 (Mon, 25 Jan 2010)
New Revision: 11480
Modified:
stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml
Log:
Using new AbstractDeploymentAspect + moving WSAspectizedDeployerFactory to stack specific config file
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480)
@@ -23,9 +23,9 @@
import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -36,7 +36,7 @@
*
* @since Dec 11, 2007
*/
-public final class RMDeploymentAspect extends DeploymentAspect
+public final class RMDeploymentAspect extends AbstractDeploymentAspect
{
@Override
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480)
@@ -22,7 +22,7 @@
package org.jboss.wsf.stack.jbws;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
/**
@@ -31,7 +31,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class EagerInitializeDeploymentAspect extends DeploymentAspect
+public class EagerInitializeDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480)
@@ -27,7 +27,7 @@
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory;
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -38,7 +38,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class EventingDeploymentAspect extends DeploymentAspect
+public class EventingDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480)
@@ -24,9 +24,9 @@
import java.io.IOException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
@@ -35,7 +35,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class PublishContractDeploymentAspect extends DeploymentAspect
+public class PublishContractDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480)
@@ -23,7 +23,7 @@
import org.jboss.ws.core.server.ServiceEndpointInvoker;
import org.jboss.ws.core.server.ServiceEndpointInvokerEJB21;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -34,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect
+public class ServiceEndpointInvokerDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480)
@@ -28,9 +28,9 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -40,7 +40,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect
+public class UnifiedMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml 2010-01-25 10:15:58 UTC (rev 11479)
+++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml 2010-01-25 10:21:43 UTC (rev 11480)
@@ -2,6 +2,17 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- WSDeploymentAspectDeployers factory -->
+ <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory">
+ <constructor>
+ <parameter>
+ <inject bean="Deployers"/>
+ </parameter>
+ </constructor>
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
<!-- The registry for web service endpoints -->
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
15 years