[jbossws-commits] JBossWS SVN: r2245 - in branches/jbossws-1.2.0: integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 and 10 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Feb 1 19:31:29 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-01 19:31:28 -0500 (Thu, 01 Feb 2007)
New Revision: 2245
Modified:
branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java
branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java
branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
Log:
Simplify Configurable, ConfigurationProvider
Modified: branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -29,7 +29,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.server.AbstractServiceEndpointServlet;
import org.jboss.ws.core.server.ServiceEndpoint;
-import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
/**
@@ -61,13 +60,8 @@
{
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
+ sepMetaData.setConfigName(configName, configFile);
- ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData;
- configProvider.setConfigName(configName, configFile);
-
- // configure handler chain
- configProvider.configure(sepMetaData);
-
log.debug("Updated server meta data" + sepMetaData);
}
}
Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -62,12 +62,8 @@
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
- ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData;
- configProvider.setConfigName(configName, configFile);
+ sepMetaData.setConfigName(configName, configFile);
- // configure handler chain
- configProvider.configure(sepMetaData);
-
log.debug("Updated server meta data" + sepMetaData);
}
}
Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/log4j.xml 2007-02-02 00:31:28 UTC (rev 2245)
@@ -60,11 +60,10 @@
<priority value="INFO"/>
</category>
- <!-- Enable SOAP message tracing
+ <!-- Enable SOAP message tracing -->
<category name="jbossws.SOAPMessage">
<priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
- -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -65,22 +65,19 @@
private void configure()
{
// process MTOM config elements
- if(epMetaData!=null)
+ if (epMetaData != null)
{
- ConfigurationProvider configProvider = (ConfigurationProvider)epMetaData;
- configProvider.configure(this);
+ epMetaData.configure(this);
}
}
protected void initBinding(String bindingId, Type type)
{
- if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)
- || CommonSOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId))
+ if (CommonSOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) || CommonSOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId))
{
binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS() : new SOAP11BindingJAXRPC());
}
- else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)
- || CommonSOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
+ else if (CommonSOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || CommonSOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
{
binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS() : new SOAP12BindingJAXRPC());
}
@@ -88,7 +85,7 @@
{
throw new WSException("Unsupported binding: " + bindingId);
}
-
+
}
public CommonBinding getCommonBinding()
@@ -96,7 +93,8 @@
return binding;
}
- public void update(Observable observable, Object object) {
+ public void update(Observable observable, Object object)
+ {
log.debug("Update config: " + object);
configure();
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -21,6 +21,8 @@
*/
package org.jboss.ws.core.jaxws;
+// $Id: $
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -35,18 +37,19 @@
* Cache JAXBContext's.
*
* @author Heiko.Braun at jboss.org
- * @version $Id:$
* @since 26.01.2007
*/
-public class JAXBContextCache {
-
+public class JAXBContextCache
+{
private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
- private JAXBContext get(Integer id) {
+ private JAXBContext get(Integer id)
+ {
return cache.get(id);
}
- private void add(Integer id, JAXBContext context) {
+ private void add(Integer id, JAXBContext context)
+ {
cache.put(id, context);
}
@@ -61,7 +64,7 @@
{
Integer id = buildId(classes);
JAXBContext ctx = get(id);
- if(null==ctx)
+ if (null == ctx)
{
ctx = JAXBContext.newInstance(classes);
add(id, ctx);
@@ -81,7 +84,7 @@
{
Integer id = buildId(clazz);
JAXBContext ctx = get(id);
- if(null==ctx)
+ if (null == ctx)
{
ctx = JAXBContext.newInstance(clazz);
add(id, ctx);
@@ -105,7 +108,7 @@
private static Integer buildId(Class[] classes)
{
int sum = 0;
- for(Class cls : classes)
+ for (Class cls : classes)
{
sum += cls.hashCode();
}
@@ -114,6 +117,6 @@
private static Integer buildId(Class clazz)
{
- return buildId(new Class[] {clazz});
+ return buildId(new Class[] { clazz });
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -127,9 +127,6 @@
{
log.debug("Configuration change event received. Reconfigure handler chain: " + object);
- // reconfigure endpoint meta data handler information from config
- ((ConfigurationProvider)epMetaData).configure(epMetaData);
-
// re-populate the binding handler chain
resetCreateBindingHandlerChain();
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -33,8 +33,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -223,14 +221,6 @@
private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData)
{
- // Add pre handlers
- UnifiedVirtualFile vfsRoot = epMetaData.getRootFile();
- String configName = epMetaData.getConfigName();
- String configFile = epMetaData.getConfigFile();
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile);
- epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE));
-
// Setup the endpoint handlers
if (serviceRefMetaData != null)
{
@@ -243,9 +233,6 @@
}
}
}
-
- // Add post handlers
- epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.POST));
}
private void setupSecurity(WSSecurityConfiguration securityConfig, UnifiedVirtualFile vfsRoot)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -22,7 +22,6 @@
// $Id$
package org.jboss.ws.metadata.builder.jaxrpc;
-import java.net.URL;
import java.util.Set;
import javax.management.ObjectName;
@@ -30,9 +29,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.UnifiedVirtualFile;
-import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
@@ -220,14 +216,6 @@
// Setup the endpoint operations
setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping);
- // Add pre handlers
- UnifiedVirtualFile vfsRoot = sepMetaData.getRootFile();
- String configName = sepMetaData.getConfigName();
- String configFile = sepMetaData.getConfigFile();
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile);
- sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE));
-
// Setup the endpoint handlers
for (UnifiedHandlerMetaData uhmd : pcMetaData.getHandlers())
{
@@ -237,9 +225,6 @@
sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(sepMetaData, HandlerType.ENDPOINT));
}
}
-
- // Add post handlers
- sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.POST));
}
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -196,7 +196,7 @@
processSOAPBinding(epMetaData, wsClass);
// process config, this will as well setup the handler
- epMetaData.configure(epMetaData);
+ epMetaData.initEndpointConfig();
// Process an optional @HandlerChain annotation
processHandlerChain(epMetaData, wsClass);
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -146,7 +146,7 @@
processWebContext(udi, sepClass, linkName, sepMetaData);
// setup handler chain from config
- sepMetaData.configure(sepMetaData);
+ sepMetaData.initEndpointConfig();
// Process an optional @HandlerChain annotation
if (sepClass.isAnnotationPresent(HandlerChain.class))
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ws.metadata.config;
import java.util.Observer;
@@ -8,8 +29,8 @@
* to get notified then the configuration changes.
*
* @author Heiko.Braun at jboss.org
- * @version $Id$
* @since 15.12.2006
*/
-public interface Configurable extends Observer {
+public interface Configurable extends Observer
+{
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -31,15 +31,16 @@
*
* @see org.jboss.ws.metadata.umdm.EndpointMetaData
*/
-public interface ConfigurationProvider {
+public interface ConfigurationProvider
+{
- static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml";
- static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml";
- static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint";
+ static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml";
+ static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml";
+ static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint";
- static final String DEFAULT_JAXRPC_CLIENT_CONFIG_FILE = "META-INF/standard-jaxrpc-client-config.xml";
- static final String DEFAULT_JAXWS_CLIENT_CONFIG_FILE = "META-INF/standard-jaxws-client-config.xml";
- static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client";
+ static final String DEFAULT_JAXRPC_CLIENT_CONFIG_FILE = "META-INF/standard-jaxrpc-client-config.xml";
+ static final String DEFAULT_JAXWS_CLIENT_CONFIG_FILE = "META-INF/standard-jaxws-client-config.xml";
+ static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client";
/**
* Callback for components that require configuration through jbossws-dd
@@ -55,6 +56,6 @@
String getConfigName();
void setConfigName(String configName);
-
+
void setConfigName(String configName, String configFile);
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -68,7 +68,7 @@
* @author Thomas.Diesler at jboss.org
* @since 12-May-2005
*/
-public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, Configurable
+public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider
{
// provide logging
private static Logger log = Logger.getLogger(EndpointMetaData.class);
@@ -127,7 +127,7 @@
private ConfigObservable configObservable = new ConfigObservable();
- private JAXBContextCache jaxbCache;
+ private JAXBContextCache jaxbCache = new JAXBContextCache();
public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
@@ -579,8 +579,6 @@
}
public JAXBContextCache getJaxbCache() {
- if(null == jaxbCache)
- jaxbCache = new JAXBContextCache();
return jaxbCache;
}
@@ -589,26 +587,13 @@
/**
* Callback for components that require configuration through jbossws-dd
- *
- * @param configurable
*/
public void configure(Configurable configurable)
{
-
- // emit notificatins when the config changes
- registerConfigObserver(configurable);
-
- if (null == config)
- {
- log.trace("Create new config: " + getConfigFile() + ":" + getConfigName());
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
- }
- else
- {
- log.trace("Reusing cached config. Current should be: " + getConfigFile() + ":" + getConfigName());
- }
-
+ // Make sure we have a configuration
+ if (config == null)
+ initEndpointConfig();
+
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
@@ -621,30 +606,6 @@
log.debug("Enable MTOM on endpoint " + this.getPortName());
}
}
-
- // Configure EndpointMetaData
- else if (configurable instanceof EndpointMetaData)
- {
-
- log.debug("Configure EndpointMetaData");
-
- // It's not necessarily the same instance
- EndpointMetaData epmd = (EndpointMetaData)configurable;
-
- // TODO: Why should we keep them?
- List<HandlerMetaData> sepHandlers = epmd.getHandlerMetaData(HandlerType.ENDPOINT);
- epmd.clearHandlers();
-
- List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE);
- List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST);
-
- epmd.addHandlers(preHandlers);
- epmd.addHandlers(sepHandlers);
- epmd.addHandlers(postHandlers);
-
- log.debug("Added " + preHandlers.size() + " PRE handlers");
- log.debug("Added " + postHandlers.size() + " POST handlers");
- }
}
public UnifiedVirtualFile getRootFile()
@@ -688,27 +649,47 @@
if (configName.equals(this.configName) == false)
{
this.configName = configName;
- this.config = null;
-
- // notify observers
+
log.debug("Reconfiguration forced, new config is '" + configName + "'");
- this.configObservable.doNotify(configName);
+ initEndpointConfig();
+ reconfigHandlerMetaData();
+ configObservable.doNotify(configName);
}
}
+
+ public void initEndpointConfig()
+ {
+ log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
+ JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
+ config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
+ }
- public List<Class> getRegisteredTypes()
+ private void reconfigHandlerMetaData()
{
- return Collections.unmodifiableList(registeredTypes);
+ log.debug("Configure EndpointMetaData");
+
+ List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT);
+ clearHandlers();
+
+ List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE);
+ List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST);
+
+ addHandlers(preHandlers);
+ addHandlers(sepHandlers);
+ addHandlers(postHandlers);
+
+ log.debug("Added " + preHandlers.size() + " PRE handlers");
+ log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
+ log.debug("Added " + postHandlers.size() + " POST handlers");
}
- public void update(Observable observable, Object object)
+ public List<Class> getRegisteredTypes()
{
- log.trace("Ingore configuration change notification");
+ return Collections.unmodifiableList(registeredTypes);
}
class ConfigObservable extends Observable
{
-
public void doNotify(Object object)
{
setChanged();
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -91,7 +91,7 @@
private Use encStyle;
// The security configuration
- private WSSecurityConfiguration securityConfiguration;
+ private WSSecurityConfiguration securityConfig;
public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName)
{
@@ -323,12 +323,12 @@
public WSSecurityConfiguration getSecurityConfiguration()
{
- return securityConfiguration;
+ return securityConfig;
}
public void setSecurityConfiguration(WSSecurityConfiguration securityConfiguration)
{
- this.securityConfiguration = securityConfiguration;
+ this.securityConfig = securityConfiguration;
}
public Use getEncodingStyle()
@@ -373,7 +373,7 @@
{
// Validate that there is at least one handler configured
// if we have a security configuration
- if (securityConfiguration != null)
+ if (securityConfig != null)
{
int handlerCount = 0;
for (EndpointMetaData epMetaData : endpoints.values())
@@ -436,6 +436,7 @@
buffer.append("\n jaxrpcMapping=" + mappingLocation);
buffer.append("\n handlerChain=" + handlerChain);
buffer.append("\n publishLocation=" + wsdlPublishLocation);
+ buffer.append("\n securityConfig=" + (securityConfig != null ? "found" : null));
buffer.append("\n properties=" + properties);
buffer.append("\n" + types);
buffer.append("\n");
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -34,13 +34,9 @@
private static final long serialVersionUID = 4219543242657899910L;
private Timestamp timestamp;
-
private Username username;
-
private Sign sign;
-
private Encrypt encrypt;
-
private Requires requires;
public Encrypt getEncrypt()
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Encrypt.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -35,9 +35,7 @@
private static final long serialVersionUID = -2802677183149218760L;
private String type;
-
private String alias;
-
private String algorithm;
public Encrypt(String type, String alias, String algorithm)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Operation.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -35,7 +35,6 @@
private static final long serialVersionUID = 4223295703633326725L;
private Config config;
-
private String name;
public Operation(String name)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Port.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -36,9 +36,7 @@
private static final long serialVersionUID = 8294850341855208663L;
private String name;
-
private Config defaultConfig;
-
private HashMap<String, Operation> operations = new HashMap<String, Operation>();
public Port(String name)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Requires.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -34,9 +34,7 @@
private static final long serialVersionUID = 6899913633295989845L;
private RequireTimestamp requireTimestamp;
-
private RequireSignature requireSignature;
-
private RequireEncryption requireEncryption;
public RequireEncryption getRequireEncryption()
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/Sign.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -33,9 +33,7 @@
private static final long serialVersionUID = -2645745357707804441L;
private String type;
-
private String alias;
-
private boolean includeTimestamp;
public Sign(String type, String alias, boolean includeTimestamp)
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -21,21 +21,23 @@
*/
package org.jboss.ws.metadata.wsse;
+// $Id: $
+
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
+import org.jboss.logging.Logger;
import org.jboss.ws.core.UnifiedVirtualFile;
+import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder;
/**
- * Created by IntelliJ IDEA.
- * User: hbraun
- * Date: 14.12.2006
- * Time: 16:17:02
- * To change this template use File | Settings | File Templates.
+ * @author hbraun
+ * @author Thomas.Diesler at jboss.com
*/
public class WSSecurityConfigFactory
{
+ // provide logging
+ final Logger log = Logger.getLogger(JAXRPCServerMetaDataBuilder.class);
public static WSSecurityConfigFactory newInstance()
{
@@ -52,6 +54,7 @@
if (location != null)
{
+ log.debug("createConfiguration from: " + location);
config = WSSecurityOMFactory.newInstance().parse(location);
// Get and set deployment path to the keystore file
@@ -59,39 +62,32 @@
{
location = getResource(vfsRoot, config.getKeyStoreFile());
if (location != null)
+ {
+ log.debug("Add keystore: " + location);
config.setKeyStoreURL(location);
+ }
}
if (config.getTrustStoreFile() != null)
{
location = getResource(vfsRoot, config.getTrustStoreFile());
if (location != null)
+ {
+ log.debug("Add truststore: " + location);
config.setTrustStoreURL(location);
+ }
}
}
return config;
}
- /**
- *
- * @param vfsRoot
- * @param resource
- * @return null, when the resource cannot be found
- */
private URL getResource(UnifiedVirtualFile vfsRoot, String resource)
{
try
{
UnifiedVirtualFile child = vfsRoot.findChild(resource);
- URL url = child.toURL();
- if (url != null)
- {
- InputStream inputStream = url.openStream();
- inputStream.close();
- }
-
- return url;
+ return child.toURL();
}
catch (Exception e)
{
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-02-02 00:31:28 UTC (rev 2245)
@@ -36,25 +36,20 @@
private static final long serialVersionUID = 1022564645797303076L;
private Config defaultConfig;
-
private HashMap<String, Port> ports = new HashMap<String, Port>();
-
private String keyStoreFile;
-
private URL keyStoreURL;
-
private String keyStoreType;
-
private String keyStorePassword;
-
private String trustStoreFile;
-
private URL trustStoreURL;
-
private String trustStoreType;
-
private String trustStorePassword;
+ public WSSecurityConfiguration()
+ {
+ }
+
public Config getDefaultConfig()
{
return defaultConfig;
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml 2007-02-01 22:03:24 UTC (rev 2244)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-benchmark.xml 2007-02-02 00:31:28 UTC (rev 2245)
@@ -8,7 +8,7 @@
<!-- $Id$ -->
-<project>
+<project name="JBossWS Benchamrks">
<!-- ================================================================== -->
<!-- Building -->
More information about the jbossws-commits
mailing list