JBossWS SVN: r5485 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws/jbws1813 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-17 03:29:29 -0500 (Thu, 17 Jan 2008)
New Revision: 5485
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java
stack/native/trunk/version.properties
Log:
Keep 2.1.0.DEV
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-01-16 21:58:05 UTC (rev 5484)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-01-17 08:29:29 UTC (rev 5485)
@@ -50,11 +50,11 @@
public void testPositive() throws Exception
{
- if (isTargetJBoss42() || isTargetJBoss40())
+ /* if (isTargetJBoss42() || isTargetJBoss40())
{
System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored");
return;
- }
+ } */
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService");
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-01-16 21:58:05 UTC (rev 5484)
+++ stack/native/trunk/version.properties 2008-01-17 08:29:29 UTC (rev 5485)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.3.DEV
+version.id=2.1.0.DEV
repository.id=snapshot
implementation.title=JBoss Web Services - Native
16 years, 4 months
JBossWS SVN: r5484 - stack/metro/trunk/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-16 16:58:05 -0500 (Wed, 16 Jan 2008)
New Revision: 5484
Modified:
stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
Log:
[JBWS-1956] Parametrize Records Management
Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2008-01-16 21:57:35 UTC (rev 5483)
+++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2008-01-16 21:58:05 UTC (rev 5484)
@@ -39,6 +39,14 @@
</property>
</bean>
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
<!--
The stack specific deployment aspects
-->
@@ -51,7 +59,6 @@
</property>
</bean>
-
<bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerEndpointHandler</property>
<property name="provides">StackEndpointHandler</property>
@@ -61,6 +68,12 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
<property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
</bean>
<bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect">
16 years, 4 months
JBossWS SVN: r5483 - spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-16 16:57:35 -0500 (Wed, 16 Jan 2008)
New Revision: 5483
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java
spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
Log:
[JBWS-1956] Parametrize Records Management
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2008-01-16 21:57:30 UTC (rev 5482)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2008-01-16 21:57:35 UTC (rev 5483)
@@ -29,13 +29,15 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public interface RecordFilter
+public interface RecordFilter extends Cloneable
{
/**
* Returns true if the filter matches the given record.
- *
- * @param record
- * @return
*/
- public boolean match(Record record);
+ boolean match(Record record);
+
+ /**
+ * RecordFilters must override Object.clone()
+ */
+ Object clone() throws CloneNotSupportedException;
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2008-01-16 21:57:30 UTC (rev 5482)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2008-01-16 21:57:35 UTC (rev 5483)
@@ -5,14 +5,14 @@
* 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
+ * under the terms of the GNU Lesser General 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.
+ * Lesser General 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
@@ -33,49 +33,54 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public interface RecordProcessor
+public interface RecordProcessor extends Cloneable
{
- public String getName();
+ String getName();
- public void setName(String name);
+ void setName(String name);
- public boolean isRecording();
+ boolean isRecording();
- public void setRecording(boolean value);
+ void setRecording(boolean value);
- public void processRecord(Record record);
+ void processRecord(Record record);
- public List<RecordFilter> getFilters();
+ List<RecordFilter> getFilters();
- public void addFilter(RecordFilter filter);
+ void addFilter(RecordFilter filter);
- public void setFilters(List<RecordFilter> filters);
+ void setFilters(List<RecordFilter> filters);
- public boolean isProcessSourceHost();
+ boolean isProcessSourceHost();
- public void setProcessSourceHost(boolean value);
+ void setProcessSourceHost(boolean value);
- public boolean isProcessDestinationHost();
+ boolean isProcessDestinationHost();
- public void setProcessDestinationHost(boolean value);
+ void setProcessDestinationHost(boolean value);
- public boolean isProcessMessageType();
+ boolean isProcessMessageType();
- public void setProcessMessageType(boolean value);
+ void setProcessMessageType(boolean value);
- public boolean isProcessEnvelope();
+ boolean isProcessEnvelope();
- public void setProcessEnvelope(boolean value);
+ void setProcessEnvelope(boolean value);
- public boolean isProcessHeaders();
+ boolean isProcessHeaders();
- public void setProcessHeaders(boolean value);
+ void setProcessHeaders(boolean value);
- public boolean isProcessOperation();
+ boolean isProcessOperation();
- public void setProcessOperation(boolean value);
+ void setProcessOperation(boolean value);
- public boolean isProcessDate();
+ boolean isProcessDate();
- public void setProcessDate(boolean value);
+ void setProcessDate(boolean value);
+
+ /**
+ * RecordFilters must override Object.clone()
+ */
+ Object clone() throws CloneNotSupportedException;
}
16 years, 4 months
JBossWS SVN: r5482 - in framework/trunk: src/main/java/org/jboss/wsf/framework/deployment and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-16 16:57:30 -0500 (Wed, 16 Jan 2008)
New Revision: 5482
Modified:
framework/trunk/.classpath
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java
Log:
[JBWS-1956] Parametrize Records Management
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/.classpath 2008-01-16 21:57:30 UTC (rev 5482)
@@ -15,6 +15,6 @@
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -30,9 +30,7 @@
import javax.management.MBeanServer;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.framework.management.recording.LogRecorder;
import org.jboss.wsf.framework.management.recording.ManagedRecordProcessor;
-import org.jboss.wsf.framework.management.recording.MemoryBufferRecorder;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -47,28 +45,36 @@
public class EndpointRecordProcessorDeploymentAspect extends DeploymentAspect
{
private MBeanServer mbeanServer;
+ private List<RecordProcessor> processors;
+ public void setProcessors(List<RecordProcessor> processors)
+ {
+ this.processors = processors;
+ }
+
@Override
public void create(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
- /** Memory buffer recorder **/
- MemoryBufferRecorder memoryRecorder = new MemoryBufferRecorder();
- memoryRecorder.setName("MemoryBufferRecorder");
- this.registerRecordProcessor(memoryRecorder, ep);
- /** Log recorder **/
- LogRecorder logRecorder = new LogRecorder();
- logRecorder.setName("LogRecorder");
- this.registerRecordProcessor(logRecorder, ep);
-
- List<RecordProcessor> recordProcessorList = new LinkedList<RecordProcessor>();
- recordProcessorList.add(memoryRecorder);
- recordProcessorList.add(logRecorder);
- ep.setRecordProcessors(recordProcessorList);
+ List<RecordProcessor> processorList = new LinkedList<RecordProcessor>();
+ for (RecordProcessor pr : processors)
+ {
+ try
+ {
+ RecordProcessor clone = (RecordProcessor)pr.clone();
+ registerRecordProcessor(clone, ep);
+ processorList.add(clone);
+ }
+ catch (CloneNotSupportedException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }
+ ep.setRecordProcessors(processorList);
}
}
-
+
@Override
public void destroy(Deployment dep)
{
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -39,7 +39,6 @@
*/
public abstract class AbstractRecordProcessor implements RecordProcessor
{
-
protected List<RecordFilter> filters = new Vector<RecordFilter>();
protected boolean processDestinationHost = true;
protected boolean processSourceHost = true;
@@ -50,19 +49,19 @@
protected boolean processDate = true;
protected String name;
protected boolean recording = false;
-
+
public abstract void processRecord(Record record);
-
+
public void setName(String name)
{
this.name = name;
}
-
+
public String getName()
{
return name;
}
-
+
public void addFilter(RecordFilter filter)
{
filters.add(filter);
@@ -147,7 +146,7 @@
{
this.processDate = processDate;
}
-
+
public boolean isRecording()
{
return recording;
@@ -157,27 +156,41 @@
{
this.recording = recording;
}
-
+
+ @Override
+ public Object clone() throws CloneNotSupportedException
+ {
+ AbstractRecordProcessor retObj = (AbstractRecordProcessor)super.clone();
+ retObj.filters = new Vector<RecordFilter>();
+ for (RecordFilter fil : this.filters)
+ {
+ RecordFilter clFil = (RecordFilter)fil.clone();
+ retObj.filters.add(clFil);
+ }
+ retObj.processDestinationHost = this.processDestinationHost;
+ retObj.processSourceHost = this.processSourceHost;
+ retObj.processHeaders = this.processHeaders;
+ retObj.processEnvelope = this.processEnvelope;
+ retObj.processMessageType = this.processMessageType;
+ retObj.processOperation = this.processOperation;
+ retObj.processDate = this.processDate;
+ retObj.recording = this.recording;
+ retObj.name = this.name;
+ return retObj;
+ }
+
public String toString()
{
StringBuffer sb = new StringBuffer();
sb.append(super.toString());
- sb.append(" (recording = ");
- sb.append(recording);
- sb.append(", processDestinationHost = ");
- sb.append(processDestinationHost);
- sb.append(", processSourceHost = ");
- sb.append(processSourceHost);
- sb.append(", processHeaders = ");
- sb.append(processHeaders);
- sb.append(", processEnvelope = ");
- sb.append(processEnvelope);
- sb.append(", processMessageType = ");
- sb.append(processMessageType);
- sb.append(", processOperation = ");
- sb.append(processOperation);
- sb.append(", processDate = ");
- sb.append(processDate);
+ sb.append(" (recording = " + recording);
+ sb.append(", processDestinationHost = " + processDestinationHost);
+ sb.append(", processSourceHost = " + processSourceHost);
+ sb.append(", processHeaders = " + processHeaders);
+ sb.append(", processEnvelope = " + processEnvelope);
+ sb.append(", processMessageType = " + processMessageType);
+ sb.append(", processOperation = " + processOperation);
+ sb.append(", processDate = " + processDate);
sb.append(")");
return sb.toString();
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -35,7 +35,6 @@
*/
public class AndFilter implements RecordFilter
{
-
private RecordFilter filter1;
private RecordFilter filter2;
@@ -60,4 +59,12 @@
return filter2;
}
+ @Override
+ public Object clone() throws CloneNotSupportedException
+ {
+ AndFilter retObj = (AndFilter)super.clone();
+ retObj.filter1 = (RecordFilter)this.filter1.clone();
+ retObj.filter2 = (RecordFilter)this.filter2.clone();
+ return retObj;
+ }
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -75,4 +75,13 @@
{
return source;
}
+
+ @Override
+ public Object clone() throws CloneNotSupportedException
+ {
+ HostFilter retObj = (HostFilter)super.clone();
+ retObj.hosts = new LinkedList<String>(this.hosts);
+ retObj.source = this.source;
+ return retObj;
+ }
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -39,6 +39,11 @@
public class LogRecorder extends AbstractRecordProcessor
{
private Logger log = Logger.getLogger(this.getClass());
+
+ public LogRecorder()
+ {
+ this.name = "LogRecorder";
+ }
@Override
public void processRecord(Record record)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -47,13 +47,16 @@
*/
public class MemoryBufferRecorder extends AbstractRecordProcessor implements MemoryBufferRecorderMBean
{
-
private Map<String, List<Record>> recentRecords = Collections.synchronizedMap(new HashMap<String, List<Record>>());
private ConcurrentLinkedQueue<String> recentRecordGroups = new ConcurrentLinkedQueue<String>();
private int size = 0;
-
private int maxSize = 50;
+ public MemoryBufferRecorder()
+ {
+ this.name = "MemoryBufferRecorder";
+ }
+
@Override
public void processRecord(Record record)
{
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -35,22 +35,28 @@
*/
public class NotFilter implements RecordFilter
{
+ private RecordFilter filter;
- private RecordFilter filter;
-
public NotFilter(RecordFilter filter)
{
this.filter = filter;
}
-
+
public boolean match(Record record)
{
return !filter.match(record);
}
-
+
public RecordFilter getFilter()
{
return filter;
}
+ @Override
+ public Object clone() throws CloneNotSupportedException
+ {
+ NotFilter retObj = (NotFilter)super.clone();
+ retObj.filter = (RecordFilter)this.filter.clone();
+ return retObj;
+ }
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -36,7 +36,6 @@
*/
public class OperationFilter implements RecordFilter
{
-
private QName operation;
public OperationFilter(QName operation)
@@ -72,4 +71,11 @@
return operation;
}
+ @Override
+ public Object clone() throws CloneNotSupportedException
+ {
+ OperationFilter retObj = (OperationFilter)super.clone();
+ retObj.operation = this.operation;
+ return retObj;
+ }
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java 2008-01-16 21:57:11 UTC (rev 5481)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java 2008-01-16 21:57:30 UTC (rev 5482)
@@ -35,7 +35,6 @@
*/
public class OrFilter implements RecordFilter
{
-
private RecordFilter filter1;
private RecordFilter filter2;
@@ -60,4 +59,12 @@
return filter2;
}
+ @Override
+ public Object clone() throws CloneNotSupportedException
+ {
+ OrFilter retObj = (OrFilter)super.clone();
+ retObj.filter1 = (RecordFilter)this.filter1.clone();
+ retObj.filter2 = (RecordFilter)this.filter2.clone();
+ return retObj;
+ }
}
16 years, 4 months
JBossWS SVN: r5481 - stack/native/trunk/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-01-16 16:57:11 -0500 (Wed, 16 Jan 2008)
New Revision: 5481
Modified:
stack/native/trunk/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-1956] Parametrize Records Management
Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-01-16 20:07:09 UTC (rev 5480)
+++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-01-16 21:57:11 UTC (rev 5481)
@@ -34,6 +34,14 @@
<property name="bindAddress">${jboss.bind.address}</property>
</bean>
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
<!--
The stack specific deployment aspects
-->
@@ -60,6 +68,12 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
<property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
</bean>
<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
@@ -88,7 +102,7 @@
<property name="provides">JAXBIntros</property>
</bean>
- <!-- Deployment aspect installers -->
+ <!-- Deployment aspect installers -->
<!-- Phase 1 -->
<bean name="WSNativeDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
16 years, 4 months
JBossWS SVN: r5479 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-16 14:24:44 -0500 (Wed, 16 Jan 2008)
New Revision: 5479
Modified:
stack/native/trunk/version.properties
Log:
Update to jbossxb 2.0.0.CR5
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-01-16 14:17:50 UTC (rev 5478)
+++ stack/native/trunk/version.properties 2008-01-16 19:24:44 UTC (rev 5479)
@@ -31,7 +31,7 @@
jbossws-jboss42=4.2.1.GA
# JBossAS-5.0
-jboss-jbossxb-jboss50=snapshot
+jboss-jbossxb-jboss50=2.0.0.CR5
jboss-remoting-jboss50=2.2.2.SP2
# JBossAS-4.2
16 years, 4 months
JBossWS SVN: r5478 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-16 09:17:50 -0500 (Wed, 16 Jan 2008)
New Revision: 5478
Modified:
stack/native/trunk/version.properties
Log:
2.0.3.DEV for snapshot (Integration with 4.2.3)
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-01-16 14:17:10 UTC (rev 5477)
+++ stack/native/trunk/version.properties 2008-01-16 14:17:50 UTC (rev 5478)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.1.0.DEV
+version.id=2.0.3.DEV
repository.id=snapshot
implementation.title=JBoss Web Services - Native
16 years, 4 months
JBossWS SVN: r5477 - stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-16 09:17:10 -0500 (Wed, 16 Jan 2008)
New Revision: 5477
Modified:
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
Log:
JBWS-1841: Use correct bind address for tests
Modified: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2008-01-16 10:45:41 UTC (rev 5476)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2008-01-16 14:17:10 UTC (rev 5477)
@@ -33,7 +33,7 @@
<service name='TestService'>
<port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'>
- <soap:address location='http://localhost:8080/jaxws-jbws1841/EJB3Bean'/>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1841/EJB3Bean'/>
</port>
</service>
</definitions>
\ No newline at end of file
16 years, 4 months
JBossWS SVN: r5476 - in stack/native/trunk: src/main/java/org/jboss/ws/core/jaxws/client and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-01-16 05:45:41 -0500 (Wed, 16 Jan 2008)
New Revision: 5476
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java
stack/native/trunk/src/test/resources/jaxws/jbws1841/
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/application-client.xml
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/
stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java
stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
stack/native/trunk/src/test/resources/test-excludes-jboss405.txt
stack/native/trunk/src/test/resources/test-excludes-jboss421.txt
stack/native/trunk/src/test/resources/test-excludes-jboss422.txt
Log:
Fix JBWS-1841: WebServiceRef injection from DD doesn't work
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-16 09:26:39 UTC (rev 5475)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-16 10:45:41 UTC (rev 5476)
@@ -543,6 +543,18 @@
<include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/>
</fileset>
</jar>
+
+ <!-- jaxws-jbws1841 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF">
+ <include name="wsdl/*"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+ </jar>
<!-- jaxws-jbws1843 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml">
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2008-01-16 09:26:39 UTC (rev 5475)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2008-01-16 10:45:41 UTC (rev 5476)
@@ -24,6 +24,15 @@
// $Id$
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.ConfigProvider;
+import org.jboss.ws.core.client.ServiceObjectFactory;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+import javax.naming.*;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -33,21 +42,6 @@
import java.net.URL;
import java.util.Hashtable;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.ConfigProvider;
-import org.jboss.ws.core.client.ServiceObjectFactory;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-
/**
* This ServiceObjectFactory reconstructs a javax.xml.ws.Service
* for a given WSDL when the webservice client does a JNDI lookup
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jaxws.jbws1841;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+@WebService(
+ name = "EndpointInterface",
+ targetNamespace = "http://www.openuri.org/2004/04/HelloWorld",
+ serviceName = "TestService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1841.EndpointInterface"
+)
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EJB3Bean implements EndpointInterface
+{
+ public String echo(String input)
+ {
+ System.out.println("Recv: " + input);
+ return input;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jaxws.jbws1841;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.ejb.Remote;
+
+/**
+ * Test the JSR-181 javax.jws.WebService annotation on an SEI
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-Apr-2005
+ */
+@WebService(
+ name = "EndpointInterface",
+ targetNamespace = "http://www.openuri.org/2004/04/HelloWorld"
+)
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Remote
+public interface EndpointInterface
+{
+ String echo(String input);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,83 @@
+package org.jboss.test.ws.jaxws.jbws1841;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.naming.InitialContext;
+import java.net.URL;
+
+/**
+ * Serviceref thorugh ejb3 deployment descriptor.
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1841
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @since 09-Oct-2007
+ */
+public class JBWS1841TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1841/EJB3Bean";
+
+ private static EndpointInterface port;
+ private static StatelessRemote remote;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ if (port == null)
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "TestService");
+ port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class);
+
+
+ InitialContext ctx = new InitialContext();
+ remote = (StatelessRemote)ctx.lookup("/StatelessBean/remote");
+ }
+ }
+
+ /**
+ * Check if the servce was deploed correctly
+ * @throws Exception
+ */
+ public void testDirectWSInvocation() throws Exception
+ {
+ String result = port.echo("DirectWSInvocation");
+ assertEquals("DirectWSInvocation", result);
+
+ }
+
+ public void testEJBRelay1() throws Exception
+ {
+ String result = remote.echo1("Relay1");
+ assertEquals("Relay1", result);
+ }
+
+ public void testEJBRelay2() throws Exception
+ {
+ String result = remote.echo2("Relay2");
+ assertEquals("Relay2", result);
+ }
+
+
+ public void testEJBRelay3() throws Exception
+ {
+ String result = remote.echo3("Relay3");
+ assertEquals("Relay3", result);
+ }
+
+ public void testEJBRelay4() throws Exception
+ {
+ String result = remote.echo4("Relay4");
+ assertEquals("Relay4", result);
+ }
+
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jaxws.jbws1841;
+
+import org.jboss.logging.Logger;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.xml.ws.WebServiceRef;
+
+/**
+ * A test bean that delegates to a web service provided through serviceref injection.
+ *
+ * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+@Stateless(name="StatelessBean")
+(a)Remote(StatelessRemote.class)
+public class StatelessBean implements StatelessRemote
+{
+ private static final Logger log = Logger.getLogger(StatelessBean.class);
+
+ @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl")
+ EndpointInterface endpoint1;
+
+ EndpointInterface endpoint2;
+
+ @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl")
+ public void setEndpoint2(EndpointInterface endpoint2)
+ {
+ this.endpoint2 = endpoint2;
+ }
+
+ // via XML
+ EndpointInterface endpoint3;
+
+ // via XML
+ EndpointInterface endpoint4;
+
+ public void setEndpoint4(EndpointInterface endpoint4)
+ {
+ this.endpoint4 = endpoint4;
+ }
+
+
+ public String echo1(String string) throws Exception
+ {
+ if(null==endpoint1)
+ throw new IllegalArgumentException("Serviceref for property 'endpoint1' not injected");
+
+ return endpoint1.echo(string);
+ }
+
+ public String echo2(String string) throws Exception
+ {
+ if(null==endpoint2)
+ throw new IllegalArgumentException("Serviceref for property 'endpoint2' not injected");
+
+ return endpoint2.echo(string);
+ }
+
+ public String echo3(String string) throws Exception
+ {
+ if(null==endpoint3)
+ throw new IllegalArgumentException("Serviceref for property 'endpoint3' not injected");
+
+ return endpoint3.echo(string);
+ }
+
+ public String echo4(String string) throws Exception
+ {
+ if(null==endpoint4)
+ throw new IllegalArgumentException("Serviceref for property 'endpoint4' not injected");
+
+ return endpoint4.echo(string);
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jaxws.jbws1841;
+
+/**
+ * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a>
+ * @version $Revision$
+ */
+public interface StatelessRemote
+{
+ String echo1(String string) throws Exception;
+
+ String echo2(String string) throws Exception;
+
+ String echo3(String string) throws Exception;
+
+ String echo4(String string) throws Exception;
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/application-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/application-client.xml 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>JSR-181 Annotation test</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws1841.EndpointInterface</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+
+ <description>jBoss test application</description>
+ <display-name>Test</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatelessBean</ejb-name>
+ <service-ref>
+ <service-ref-name>service/Endpoint3</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <mapped-name>jbossws-client/service/TestService</mapped-name>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
+ <injection-target-name>endpoint3</injection-target-name>
+ </injection-target>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
+ <service-interface>javax.xml.ws.Service</service-interface>
+ <mapped-name>jbossws-client/service/TestService</mapped-name>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
+ <injection-target-name>setEndpoint4</injection-target-name>
+ </injection-target>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC
+ "-//JBoss//DTD Application Client 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+</jboss-client>
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatelessBean</ejb-name>
+ <service-ref>
+ <service-ref-name>service/Endpoint3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,39 @@
+<definitions name='TestService' targetNamespace='http://www.openuri.org/2004/04/HelloWorld'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://www.openuri.org/2004/04/HelloWorld'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types></types>
+ <message name='EndpointInterface_echoResponse'>
+ <part name='return' type='xsd:string'></part>
+ </message>
+ <message name='EndpointInterface_echo'>
+ <part name='arg0' type='xsd:string'></part>
+ </message>
+ <portType name='EndpointInterface'>
+
+ <operation name='echo' parameterOrder='arg0'>
+ <input message='tns:EndpointInterface_echo'></input>
+ <output message='tns:EndpointInterface_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='EndpointInterfaceBinding' type='tns:EndpointInterface'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+
+ <input>
+ <soap:body namespace='http://www.openuri.org/2004/04/HelloWorld' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://www.openuri.org/2004/04/HelloWorld' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+
+ <port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'>
+ <soap:address location='http://localhost:8080/jaxws-jbws1841/EJB3Bean'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml 2008-01-16 10:45:41 UTC (rev 5476)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
+
+<application>
+ <module>
+ <ejb>jsr181.jar</ejb>
+ </module>
+
+ <module>
+ <ejb>jsr181-client.jar</ejb>
+ </module>
+</application>
+
+
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-16 09:26:39 UTC (rev 5475)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-16 10:45:41 UTC (rev 5476)
@@ -56,3 +56,6 @@
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/*/jbws1762/**
+
+#[JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/*/jbws1841/**
\ No newline at end of file
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-16 09:26:39 UTC (rev 5475)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-16 10:45:41 UTC (rev 5476)
@@ -22,3 +22,6 @@
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/*/jbws1762/**
+
+#[JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/*/jbws1841/**
\ No newline at end of file
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-01-16 09:26:39 UTC (rev 5475)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-01-16 10:45:41 UTC (rev 5476)
@@ -16,3 +16,6 @@
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/*/jbws1762/**
+
+#[JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/*/jbws1841/**
\ No newline at end of file
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-01-16 09:26:39 UTC (rev 5475)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-01-16 10:45:41 UTC (rev 5476)
@@ -16,3 +16,6 @@
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/*/jbws1762/**
+
+#[JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/*/jbws1841/**
16 years, 4 months