JBossWS SVN: r5366 - in stack/native/trunk/src/main/java/org/jboss/ws: metadata/umdm and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-20 04:50:42 -0500 (Thu, 20 Dec 2007)
New Revision: 5366
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
Log:
remove useless imports
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-20 09:28:15 UTC (rev 5365)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-20 09:50:42 UTC (rev 5366)
@@ -39,7 +39,6 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.wsrm.RMAddressingConstants;
import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.extensions.wsrm.spi.RMConstants;
import org.jboss.ws.extensions.wsrm.spi.RMProvider;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-12-20 09:28:15 UTC (rev 5365)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-12-20 09:50:42 UTC (rev 5366)
@@ -37,11 +37,8 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.wsrm.spi.RMProvider;
-import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.wsf.common.JavaUtils;
-import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.w3c.dom.Element;
/**
16 years, 4 months
JBossWS SVN: r5365 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-20 04:28:15 -0500 (Thu, 20 Dec 2007)
New Revision: 5365
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
Log:
remove useless code
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2007-12-20 09:26:55 UTC (rev 5364)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2007-12-20 09:28:15 UTC (rev 5365)
@@ -66,10 +66,6 @@
{
for (Endpoint ep : dep.getService().getEndpoints())
{
- ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class);
- if (sepMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
InvocationHandler invHandler = ep.getInvocationHandler();
if (invHandler instanceof RMInvocationHandler)
{
16 years, 4 months
JBossWS SVN: r5364 - common/trunk/src/main/java/org/jboss/wsf/common/log.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-20 04:26:55 -0500 (Thu, 20 Dec 2007)
New Revision: 5364
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java
common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
Log:
Fix jboss log level
Modified: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java 2007-12-20 09:25:39 UTC (rev 5363)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogHandler.java 2007-12-20 09:26:55 UTC (rev 5364)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.common.log;
+// $Id$
+
import java.util.logging.ErrorManager;
import java.util.logging.Handler;
import java.util.logging.Level;
@@ -35,12 +37,11 @@
*
* @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
* @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
+ * @author Thomas.Diesler(a)jboss.com
* @since 14-Jun-2007
- *
*/
public class JBossLogHandler extends Handler
{
-
public JBossLogHandler()
{
super.setFormatter(new SimpleFormatter());
@@ -49,11 +50,50 @@
@Override
public void publish(LogRecord record)
{
- if (!isLoggable(record))
+ if (isLoggable(record))
{
- return;
+ Logger logger = getJBossLogger(record);
+ Level level = record.getLevel();
+ if (level == Level.FINER || level == Level.FINEST)
+ {
+ String msg = getMessage(record);
+ logger.trace(msg);
+ }
+ else if (level == Level.FINE)
+ {
+ String msg = getMessage(record);
+ logger.debug(msg);
+ }
+ else if (level == Level.INFO || level == Level.CONFIG)
+ {
+ String msg = getMessage(record);
+ logger.info(msg);
+ }
+ else if (level == Level.WARNING)
+ {
+ String msg = getMessage(record);
+ logger.warn(msg);
+ }
+ else if (level == Level.SEVERE)
+ {
+ String msg = getMessage(record);
+ logger.error(msg);
+ }
+ else if (level == Level.OFF)
+ {
+ // do nothing
+ }
}
- String msg;
+ }
+
+ private Logger getJBossLogger(LogRecord record)
+ {
+ return Logger.getLogger(record.getLoggerName());
+ }
+
+ private String getMessage(LogRecord record)
+ {
+ String msg = null;
try
{
msg = getFormatter().formatMessage(record);
@@ -62,46 +102,38 @@
{
// We don't want to throw an exception here, but we
// report the exception to any registered ErrorManager.
- reportError(null, ex, ErrorManager.FORMAT_FAILURE);
- return;
+ reportError("Cannot obtain message from log record", ex, ErrorManager.FORMAT_FAILURE);
}
- if (record.getLevel() == Level.INFO)
+ return msg;
+ }
+
+ @Override
+ public boolean isLoggable(LogRecord record)
+ {
+ Logger logger = getJBossLogger(record);
+ Level level = record.getLevel();
+
+ boolean isLoggable = false;
+ if (level == Level.FINER || level == Level.FINEST)
{
- Logger.getLogger(record.getSourceClassName()).info(msg);
+ isLoggable = logger.isTraceEnabled();
}
- else if (record.getLevel() == Level.SEVERE)
+ else if (level == Level.FINE)
{
- Logger.getLogger(record.getSourceClassName()).error(msg);
+ isLoggable = logger.isDebugEnabled();
}
- else if (record.getLevel() == Level.WARNING)
+ else if (level == Level.INFO || level == Level.CONFIG)
{
- Logger.getLogger(record.getSourceClassName()).warn(msg);
+ isLoggable = logger.isInfoEnabled();
}
- else if (record.getLevel() == Level.FINE)
+ else if (level == Level.SEVERE || level == Level.WARNING)
{
- Logger.getLogger(record.getSourceClassName()).debug(msg);
+ isLoggable = true;
}
- else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST)
- {
- Logger.getLogger(record.getSourceClassName()).trace(msg);
- }
- else
- {
- Logger.getLogger(record.getSourceClassName()).debug(msg);
- }
+ return isLoggable;
}
@Override
- public boolean isLoggable(LogRecord record)
- {
- if (record == null)
- {
- return false;
- }
- return super.isLoggable(record);
- }
-
- @Override
public void flush()
{
//nothing to do
Modified: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-20 09:25:39 UTC (rev 5363)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-20 09:26:55 UTC (rev 5364)
@@ -41,17 +41,30 @@
Logger logger = super.getLogger(name);
if (logger == null)
logger = new JBossLogger(name);
-
+
logger.addHandler(new JBossLogHandler());
return logger;
}
-
+
static class JBossLogger extends Logger
{
protected JBossLogger(String name)
{
super(name, null);
- setLevel(Level.FINEST);
+
+ org.jboss.logging.Logger jbl = org.jboss.logging.Logger.getLogger(name);
+ if (jbl.isTraceEnabled())
+ {
+ setLevel(Level.FINEST);
+ }
+ else if (jbl.isDebugEnabled())
+ {
+ setLevel(Level.FINE);
+ }
+ else if (jbl.isInfoEnabled())
+ {
+ setLevel(Level.INFO);
+ }
}
}
}
\ No newline at end of file
16 years, 4 months
JBossWS SVN: r5363 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-20 04:25:39 -0500 (Thu, 20 Dec 2007)
New Revision: 5363
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
Log:
add logging information
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2007-12-20 09:11:50 UTC (rev 5362)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2007-12-20 09:25:39 UTC (rev 5363)
@@ -56,6 +56,7 @@
ep.setInvocationHandler(wsrmInvHandler);
ep.addAttachment(RMServerSequence.class, new LinkedList<RMServerSequence>());
RMHelper.setupRMOperations(sepMetaData);
+ log.info("WS-RM invocation handler associated with endpoint " + ep.getAddress());
}
}
}
@@ -75,6 +76,7 @@
RMInvocationHandler rmInvHandler = (RMInvocationHandler)invHandler;
ep.setInvocationHandler(rmInvHandler.getDelegate());
ep.removeAttachment(RMServerSequence.class);
+ log.info("WS-RM invocation handler removed from endpoint " + ep.getAddress());
}
}
}
16 years, 4 months
JBossWS SVN: r5362 - in stack/native/trunk/src: test/resources/common/config and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-20 04:11:50 -0500 (Thu, 20 Dec 2007)
New Revision: 5362
Modified:
stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd
stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml
Log:
removing useless WS-RM configuration elements
Modified: stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd
===================================================================
--- stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-12-19 19:56:24 UTC (rev 5361)
+++ stack/native/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-12-20 09:11:50 UTC (rev 5362)
@@ -93,13 +93,6 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="message-store" type="tns:msgStoreType" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- WS-RM message store to be used for reliable messaging.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
<xsd:element name="port" type="tns:portType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
@@ -149,31 +142,6 @@
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
- <xsd:complexType name="msgStoreType">
- <xsd:sequence>
- <xsd:element name="config-file" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- Message store specific configuration file.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Message store identifier.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="class" type="xsd:string" use="required">
- <xsd:annotation>
- <xsd:documentation>
- Message store class name providing public default constructor.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
<xsd:complexType name="deliveryAssuranceType">
<xsd:attribute name="quality" use="required">
<xsd:annotation>
Modified: stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml 2007-12-19 19:56:24 UTC (rev 5361)
+++ stack/native/trunk/src/test/resources/common/config/jaxws-endpoint-config.xml 2007-12-20 09:11:50 UTC (rev 5362)
@@ -44,25 +44,19 @@
<endpoint-config>
<config-name>Standard WSRM Endpoint</config-name>
- <reliable-messaging>
- <delivery-assurance inOrder="true" quality="AtLeastOnce"/>
- <backports-server host="realhostname.realdomain" port="9999"/>
- <message-retransmission attempts="50" interval="10" timeout="3"/>
- <provider
- specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
- <message-store
- id="wsrmStoreId"
- class="custom.MessageStoreImpl">
- <config-file>META-INF/config.xml</config-file>
- </message-store>
- <port name="{http://custom/namespace/}Port1">
- <delivery-assurance inOrder="false" quality="AtMostOnce"/>
- </port>
- <port name="{http://custom/namespace/}Port2">
- <delivery-assurance inOrder="true" quality="ExactlyOnce"/>
- </port>
- </reliable-messaging>
+ <reliable-messaging>
+ <delivery-assurance inOrder="true" quality="AtLeastOnce"/>
+ <backports-server host="realhostname.realdomain" port="9999"/>
+ <message-retransmission attempts="50" interval="10" timeout="3"/>
+ <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <port name="{http://custom/namespace/}Port1">
+ <delivery-assurance inOrder="false" quality="AtMostOnce"/>
+ </port>
+ <port name="{http://custom/namespace/}Port2">
+ <delivery-assurance inOrder="true" quality="ExactlyOnce"/>
+ </port>
+ </reliable-messaging>
</endpoint-config>
-</jaxws-config>
\ No newline at end of file
+</jaxws-config>
16 years, 4 months
JBossWS SVN: r5361 - in stack/cxf/trunk/src/test: java/org/jboss/test/ws/jaxws/cxf/logging and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-19 14:56:24 -0500 (Wed, 19 Dec 2007)
New Revision: 5361
Added:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java
Modified:
stack/cxf/trunk/src/test/etc/log4j.xml
Log:
Add CXFLoggingTestCase
Modified: stack/cxf/trunk/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-19 19:54:56 UTC (rev 5360)
+++ stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-19 19:56:24 UTC (rev 5361)
@@ -56,6 +56,10 @@
<priority value="DEBUG"/>
</category>
+ <category name="org.jboss.test.ws">
+ <priority value="TRACE"/>
+ </category>
+
<category name="org.apache.cxf">
<priority value="DEBUG"/>
</category>
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java 2007-12-19 19:56:24 UTC (rev 5361)
@@ -0,0 +1,60 @@
+/*
+ * 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.test.ws.jaxws.cxf.logging;
+
+import java.util.logging.Handler;
+import java.util.logging.Logger;
+
+import org.apache.cxf.common.logging.LogUtils;
+import org.jboss.wsf.common.log.JBossLogHandler;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test redirection of CXF logging on the client side
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 18-Dec-2007
+ */
+public class CXFLoggingTestCase extends JBossWSTest
+{
+ public void testLogging() throws Exception
+ {
+ Logger log = LogUtils.getL7dLogger(CXFLoggingTestCase.class);
+ assertHandlers(log);
+
+ log = LogUtils.getL7dLogger(CXFLoggingTestCase.class);
+ assertHandlers(log);
+
+ log.finest("test message");
+ }
+
+ private void assertHandlers(Logger log)
+ {
+ int found = 0;
+ for (Handler handler : log.getHandlers())
+ {
+ if (handler instanceof JBossLogHandler)
+ found++;
+ }
+ assertEquals("Expected one jboss handler", 1, found);
+ }
+}
\ No newline at end of file
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 4 months
JBossWS SVN: r5360 - common/trunk/src/main/java/org/jboss/wsf/common/log.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-19 14:54:56 -0500 (Wed, 19 Dec 2007)
New Revision: 5360
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
Log:
set log level FINEST on all loggers
Modified: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-19 17:37:59 UTC (rev 5359)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-19 19:54:56 UTC (rev 5360)
@@ -23,6 +23,7 @@
// $Id$
+import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
@@ -50,6 +51,7 @@
protected JBossLogger(String name)
{
super(name, null);
+ setLevel(Level.FINEST);
}
}
}
\ No newline at end of file
16 years, 4 months
JBossWS SVN: r5359 - in stack/native/trunk/src: main/java/org/jboss/ws/metadata/config/binding and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-19 12:37:59 -0500 (Wed, 19 Dec 2007)
New Revision: 5359
Removed:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java
stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
Log:
removing useless configuration element
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java 2007-12-19 15:45:32 UTC (rev 5358)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java 2007-12-19 17:37:59 UTC (rev 5359)
@@ -36,7 +36,6 @@
private RMProviderConfig provider;
private RMBackPortsServerConfig backportsServer;
private RMMessageRetransmissionConfig messageRetransmission;
- private RMMessageStoreConfig messageStore;
private List<RMPortConfig> ports = new LinkedList<RMPortConfig>();
public final void setMessageRetransmission(RMMessageRetransmissionConfig messageRetransmission)
@@ -79,16 +78,6 @@
return this.provider;
}
- public final void setMessageStore(RMMessageStoreConfig messageStore)
- {
- this.messageStore = messageStore;
- }
-
- public final RMMessageStoreConfig getMessageStore()
- {
- return this.messageStore;
- }
-
public final List<RMPortConfig> getPorts()
{
return this.ports;
Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java 2007-12-19 15:45:32 UTC (rev 5358)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java 2007-12-19 17:37:59 UTC (rev 5359)
@@ -1,75 +0,0 @@
-/*
- * 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.extensions.wsrm.config;
-
-/**
- * Message store metadata
- *
- * @author richard.opalka(a)jboss.com
- */
-public final class RMMessageStoreConfig
-{
-
- private String id;
- private String className;
- private String configFile;
-
- public final void setId(String id)
- {
- if (id == null)
- throw new IllegalArgumentException();
-
- this.id = id;
- }
-
- public final String getId()
- {
- return this.id;
- }
-
- public final void setClassName(String className)
- {
- if (className == null)
- throw new IllegalArgumentException();
-
- this.className = className;
- }
-
- public final String getClassName()
- {
- return this.className;
- }
-
- public final void setConfigFile(String configFile)
- {
- if (configFile == null)
- throw new IllegalArgumentException();
-
- this.configFile = configFile;
- }
-
- public final String getConfigFile()
- {
- return this.configFile;
- }
-
-}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-12-19 15:45:32 UTC (rev 5358)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-12-19 17:37:59 UTC (rev 5359)
@@ -36,16 +36,12 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
-import org.jboss.ws.extensions.wsrm.RMDeliveryAssurance;
-import org.jboss.ws.extensions.wsrm.RMDeliveryAssuranceFactory;
import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig;
import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig;
import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
-import org.jboss.ws.extensions.wsrm.config.RMMessageStoreConfig;
import org.jboss.ws.extensions.wsrm.config.RMConfig;
import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
import org.jboss.ws.extensions.wsrm.config.RMProviderConfig;
-import org.jboss.ws.extensions.wsrm.spi.RMProvider;
/**
* ObjectModelFactory for JAXRPC configurations.
@@ -209,24 +205,6 @@
wsrmConfig.setProvider(provider);
return provider;
}
- if (localName.equals("message-store"))
- {
- String className = null, id = null;
- for (int i = 0; i < countOfAttributes && (className == null || id == null); i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("id"))
- id = attrs.getValue(i);
- if (attrLocalName.equals("class"))
- className = attrs.getValue(i);
- }
-
- RMMessageStoreConfig messageStore = new RMMessageStoreConfig();
- messageStore.setId(id);
- messageStore.setClassName(className);
- wsrmConfig.setMessageStore(messageStore);
- return messageStore;
- }
if (localName.equals("port"))
{
String portName = null;
@@ -276,14 +254,6 @@
return deliveryAssurance;
}
- public void setValue(RMMessageStoreConfig messageStore, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
- {
- if (localName.equals("config-file"))
- {
- messageStore.setConfigFile(value);
- }
- }
-
/**
* Called when parsing of a new element started.
*/
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-12-19 15:45:32 UTC (rev 5358)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-12-19 17:37:59 UTC (rev 5359)
@@ -29,7 +29,6 @@
import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig;
import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig;
import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
-import org.jboss.ws.extensions.wsrm.config.RMMessageStoreConfig;
import org.jboss.ws.extensions.wsrm.config.RMConfig;
import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
import org.jboss.ws.extensions.wsrm.config.RMProviderConfig;
@@ -143,10 +142,6 @@
assertEquals(deliveryAssurance.getQuality(), "AtLeastOnce");
RMProviderConfig provider = wsrmConfig.getProvider();
assertEquals(provider.getSpecVersion(), "http://docs.oasis-open.org/ws-rx/wsrm/200702");
- RMMessageStoreConfig messageStore = wsrmConfig.getMessageStore();
- assertEquals(messageStore.getId(), "wsrmStoreId");
- assertEquals(messageStore.getClassName(), "custom.MessageStoreImpl");
- assertEquals(messageStore.getConfigFile(), "META-INF/config.xml");
List<RMPortConfig> ports = wsrmConfig.getPorts();
RMPortConfig port1 = ports.get(0);
assertEquals(port1.getPortName(), new QName("http://custom/namespace/", "Port1"));
16 years, 4 months
JBossWS SVN: r5358 - stack/metro/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-19 10:45:32 -0500 (Wed, 19 Dec 2007)
New Revision: 5358
Modified:
stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
Log:
Remove redundat excludes
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-19 11:25:07 UTC (rev 5357)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-19 15:45:32 UTC (rev 5358)
@@ -2,15 +2,6 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
# [JBWS-1673] Fix JAXR samples for SunRI
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-19 11:25:07 UTC (rev 5357)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-19 15:45:32 UTC (rev 5358)
@@ -2,15 +2,6 @@
# $Id$
#
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
# [JBWS-1673] Fix JAXR samples for SunRI
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-19 11:25:07 UTC (rev 5357)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-19 15:45:32 UTC (rev 5358)
@@ -2,15 +2,6 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
# [JBWS-1673] Fix JAXR samples for SunRI
org/jboss/test/ws/jaxws/samples/jaxr/**
16 years, 4 months
JBossWS SVN: r5357 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-19 06:25:07 -0500 (Wed, 19 Dec 2007)
New Revision: 5357
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java
Log:
remove useless code and comment
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2007-12-19 11:16:02 UTC (rev 5356)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2007-12-19 11:25:07 UTC (rev 5357)
@@ -223,20 +223,10 @@
public final void close() throws RMException
{
- try
- {
- sendCloseMessage();
- sendTerminateMessage();
- }
- finally
- {
- this.client.setWSRMSequence(null);
- }
+ sendCloseMessage();
+ sendTerminateMessage();
}
- /**
- * Sets up terminated flag to true.
- */
private void sendMessage(String action, QName operationQName, List protocolMessages) throws RMException
{
try
16 years, 4 months