JBossWS SVN: r5276 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: invocation and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-12 11:46:47 -0500 (Wed, 12 Dec 2007)
New Revision: 5276
Added:
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractorMBean.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordExtractor.java
Modified:
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
Log:
- new record processor deployment aspect
- updates due to new Endpoint and Record interface
- new management MBeans
- RecordFactory improvements
- minor changes
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -62,7 +62,6 @@
private List<BindingCustomization> bindingCustomizsations = new ArrayList<BindingCustomization>();
private String address;
private List<RecordProcessor> recordProcessors = new Vector<RecordProcessor>();
- private boolean recording = false;
DefaultEndpoint(String targetBean)
{
@@ -262,21 +261,11 @@
this.recordProcessors = new Vector<RecordProcessor>(recordProcessors);
}
- public boolean isRecording()
- {
- return recording;
- }
-
- public void setRecording(boolean value)
- {
- this.recording = value;
- }
-
public void processRecord(Record record)
{
- if (this.isRecording())
+ for (RecordProcessor processor : recordProcessors)
{
- for (RecordProcessor processor : recordProcessors)
+ if (processor.isRecording())
{
boolean match = true;
if (processor.getFilters() != null)
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -23,11 +23,6 @@
//$Id$
-import java.util.LinkedList;
-import java.util.List;
-
-import org.jboss.wsf.framework.management.recording.RecordBufferProcessor;
-import org.jboss.wsf.framework.management.recording.RecordDumpProcessor;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -40,7 +35,6 @@
import org.jboss.wsf.spi.invocation.InvocationType;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
-import org.jboss.wsf.spi.management.recording.RecordProcessor;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
@@ -77,12 +71,6 @@
if (invocationHandler != null)
ep.setInvocationHandler(invocationHandler);
- //TODO!! still to be configured...
- List<RecordProcessor> recordProcessorList = new LinkedList<RecordProcessor>();
- recordProcessorList.add(new RecordBufferProcessor());
- recordProcessorList.add(new RecordDumpProcessor());
- ep.setRecordProcessors(recordProcessorList);
-
}
}
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -0,0 +1,101 @@
+/*
+ * 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.wsf.framework.deployment;
+
+//$Id$
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.management.JMException;
+import javax.management.MBeanServer;
+
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.framework.management.recording.ManagedRecordExtractor;
+import org.jboss.wsf.framework.management.recording.ManagedRecordProcessor;
+import org.jboss.wsf.framework.management.recording.RecordBufferProcessor;
+import org.jboss.wsf.framework.management.recording.RecordDumpProcessor;
+import org.jboss.wsf.framework.management.recording.RecordExtractor;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
+
+/**
+ * A deployer that sets the record processors for each endpoint
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 12-Dec-2007
+ */
+public class EndpointRecordProcessorDeploymentAspect extends DeploymentAspect
+{
+ private MBeanServer mbeanServer;
+
+ @Override
+ public void create(Deployment dep)
+ {
+ System.out.println("DEPLOYOOOOOOOO");
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ /** Record buffer **/
+ RecordBufferProcessor bufferProc = new RecordBufferProcessor();
+ bufferProc.setName("RecordBuffer");
+ this.registerRecordProcessor(bufferProc, ep);
+ /** Record dump **/
+ RecordDumpProcessor dumpProc = new RecordDumpProcessor();
+ dumpProc.setName("RecordDump");
+ this.registerRecordProcessor(dumpProc, ep);
+
+ List<RecordProcessor> recordProcessorList = new LinkedList<RecordProcessor>();
+ recordProcessorList.add(bufferProc);
+ recordProcessorList.add(dumpProc);
+ ep.setRecordProcessors(recordProcessorList);
+ }
+ }
+
+ private void registerRecordProcessor(RecordProcessor processor, Endpoint ep)
+ {
+ try
+ {
+ mbeanServer.registerMBean(new ManagedRecordProcessor(processor), ObjectNameFactory.create(ep.getName() + ",recordProcessor=" + processor.getName()));
+ if (processor instanceof RecordExtractor)
+ {
+ mbeanServer.registerMBean(new ManagedRecordExtractor((RecordExtractor)processor), ObjectNameFactory.create(ep.getName() + ",recordExtractor="
+ + processor.getName()));
+ }
+ }
+ catch (JMException ex)
+ {
+ log.error("Cannot register record processor with JMX server", ex);
+ }
+ }
+
+ public MBeanServer getMbeanServer()
+ {
+ return mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer mbeanServer)
+ {
+ this.mbeanServer = mbeanServer;
+ }
+}
\ No newline at end of file
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -32,7 +32,6 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPMessageContext;
@@ -66,12 +65,10 @@
{
log.info("*** INBOUND ***");
Endpoint endpoint = EndpointAssociation.getEndpoint();
- if (endpoint.isRecording() && endpoint.getRecordProcessors() != null && !endpoint.getRecordProcessors().isEmpty())
+ if (this.isRecording(endpoint))
{
- Long groupID = RecordFactory.newGroupID();
- RecordGroupAssociation.pushGroupID(groupID);//check, perhaps we should try peeking before pushing...
- Record record = RecordFactory.newRecord(groupID);
- record = RecordFactory.newRecord(groupID);
+ Record record = RecordFactory.newRecord();
+ RecordGroupAssociation.pushGroupID(record.getGroupID());//check, perhaps we should try peeking before pushing...
record.setDate(new Date());
HttpServletRequest httpServletRequest = (HttpServletRequest)ctx.get(MessageContext.SERVLET_REQUEST);
if (httpServletRequest != null)
@@ -120,9 +117,9 @@
{
Endpoint endpoint = EndpointAssociation.getEndpoint();
log.info("*** OUTBOUND ***");
- if (endpoint.isRecording() && endpoint.getRecordProcessors() != null && !endpoint.getRecordProcessors().isEmpty())
+ if (this.isRecording(endpoint))
{
- Long groupID = RecordGroupAssociation.popGroupID();//check, perhaps we should try peeking before popping...
+ String groupID = RecordGroupAssociation.popGroupID();//check, perhaps we should try peeking before popping...
Record record = RecordFactory.newRecord(groupID);
record.setDate(new Date());
record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS)));
@@ -159,4 +156,28 @@
return handleOutbound(ctx);
}
+ /**
+ * Returns true if there's at least a record processor in recording mode
+ *
+ * @param endpoint
+ * @return
+ */
+ private boolean isRecording(Endpoint endpoint)
+ {
+ List<RecordProcessor> processors = endpoint.getRecordProcessors();
+ if (processors == null || processors.isEmpty())
+ {
+ return false;
+ }
+ for (RecordProcessor processor : processors)
+ {
+ if (processor.isRecording())
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -25,9 +25,14 @@
import java.util.Date;
import java.util.List;
-import java.util.Set;
-import org.jboss.wsf.framework.management.recording.RecordBufferProcessor;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.framework.management.recording.ManagedRecordExtractor;
+import org.jboss.wsf.framework.management.recording.RecordExtractor;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.recording.Record;
@@ -42,10 +47,13 @@
public class ManagedEndpoint implements ManagedEndpointMBean
{
private Endpoint endpoint;
+ private MBeanServer mbeanServer;
+ private Logger log = Logger.getLogger(this.getClass());
- public ManagedEndpoint(Endpoint endpoint)
+ public ManagedEndpoint(Endpoint endpoint, MBeanServer mbeanServer)
{
this.endpoint = endpoint;
+ this.mbeanServer = mbeanServer;
}
public long getAverageProcessingTime()
@@ -111,57 +119,53 @@
{
endpoint.getLifecycleHandler().stop(endpoint);
}
-
- public boolean isRecording()
+
+ public void processRecord(Record record)
{
- return endpoint.isRecording();
+ endpoint.processRecord(record);
}
-
- public void setRecording(boolean value)
- {
- endpoint.setRecording(value);
- }
- public void processRecord(Record record)
+ public void addRecordProcessor(RecordProcessor processor)
{
- if (this.isRecording())
+ this.getRecordProcessors().add(processor);
+ try
{
- for (RecordProcessor processor : endpoint.getRecordProcessors())
+ mbeanServer.registerMBean(processor, ObjectNameFactory.create(endpoint.getName() + ",recordProcessor=" + processor.getName()));
+ if (processor instanceof RecordExtractor)
{
- processor.processRecord(record);
+ mbeanServer.registerMBean(new ManagedRecordExtractor((RecordExtractor)processor), ObjectNameFactory.create(endpoint.getName() + ",recordExtractor="
+ + processor.getName()));
}
}
+ catch (JMException ex)
+ {
+ log.error("Cannot register endpoint with JMX server", ex);
+ }
}
- public void addRecordProcessor(RecordProcessor processor)
- {
- this.getRecordProcessors().add(processor);
- }
-
public List<RecordProcessor> getRecordProcessors()
{
return endpoint.getRecordProcessors();
}
- public void setRecordProcessors(List<RecordProcessor> processor)
+ public void setRecordProcessors(List<RecordProcessor> processors)
{
- endpoint.setRecordProcessors(processor);
- }
-
- public String getClientHosts()
- {
- StringBuffer result = new StringBuffer();
- for (RecordProcessor processor : endpoint.getRecordProcessors())
+ endpoint.setRecordProcessors(processors);
+ for (RecordProcessor processor : processors)
{
- if (processor instanceof RecordBufferProcessor)
+ try
{
- Set<String> set = ((RecordBufferProcessor)processor).getClientHosts();
- for (String s : set)
+ mbeanServer.registerMBean(processor, ObjectNameFactory.create(endpoint.getName() + ",recordProcessor=" + processor.getName()));
+ if (processor instanceof RecordExtractor)
{
- result.append(s+" ");
+ mbeanServer.registerMBean(new ManagedRecordExtractor((RecordExtractor)processor), ObjectNameFactory.create(endpoint.getName() + ",recordExtractor="
+ + processor.getName()));
}
}
+ catch (JMException ex)
+ {
+ log.error("Cannot register endpoint with JMX server", ex);
+ }
}
- return result.toString();
}
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -55,10 +55,6 @@
long getResponseCount();
- boolean isRecording();
-
- void setRecording(boolean value);
-
void processRecord(Record record);
void addRecordProcessor(RecordProcessor processor);
@@ -67,5 +63,4 @@
void setRecordProcessors(List<RecordProcessor> processors);
- public String getClientHosts();
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -60,7 +60,7 @@
try
{
- ManagedEndpoint jmxEndpoint = new ManagedEndpoint(endpoint);
+ ManagedEndpoint jmxEndpoint = new ManagedEndpoint(endpoint, mbeanServer);
getMbeanServer().registerMBean(jmxEndpoint, endpoint.getName());
}
catch (JMException ex)
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -31,6 +31,8 @@
import org.jboss.wsf.spi.management.recording.RecordProcessor;
/**
+ * An abstract record processor providing basic implementation
+ * of the processor configuration and filter's management
*
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
@@ -46,9 +48,21 @@
protected boolean processMessageType = true;
protected boolean processOperation = true;
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);
@@ -134,11 +148,23 @@
this.processDate = processDate;
}
+ public boolean isRecording()
+ {
+ return recording;
+ }
+
+ public void setRecording(boolean recording)
+ {
+ this.recording = recording;
+ }
+
public String toString()
{
StringBuffer sb = new StringBuffer();
sb.append(super.toString());
- sb.append(" (processDestinationHost = ");
+ sb.append(" (recording = ");
+ sb.append(recording);
+ sb.append(", processDestinationHost = ");
sb.append(processDestinationHost);
sb.append(", processSourceHost = ");
sb.append(processSourceHost);
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractor.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractor.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -0,0 +1,68 @@
+/*
+ * 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.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+
+/**
+ * The record extractor MBean representation
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 12-Dec-2007
+ */
+public class ManagedRecordExtractor implements ManagedRecordExtractorMBean
+{
+ private RecordExtractor extractor;
+
+ public ManagedRecordExtractor(RecordExtractor extractor)
+ {
+ this.extractor = extractor;
+ }
+
+ public Set<String> getClientHosts()
+ {
+ return ((RecordExtractor)extractor).getClientHosts();
+ }
+
+ public Map<String, List<Record>> getMatchingRecords(RecordFilter[] filters)
+ {
+ return ((RecordExtractor)extractor).getMatchingRecords(filters);
+ }
+
+ public Map<String, List<Record>> getRecordsByClientHost(String clientHost)
+ {
+ return ((RecordExtractor)extractor).getRecordsByClientHost(clientHost);
+ }
+
+ public Map<String, List<Record>> getRecordsByOperation(String namespace, String localPart)
+ {
+ return ((RecordExtractor)extractor).getRecordsByOperation(namespace, localPart);
+ }
+
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractorMBean.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractorMBean.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractorMBean.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -0,0 +1,48 @@
+/*
+ * 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.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+
+/**
+ * The record extractor MBean interface
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public interface ManagedRecordExtractorMBean
+{
+ public Map<String, List<Record>> getMatchingRecords(RecordFilter[] filters);
+
+ public Map<String, List<Record>> getRecordsByOperation(String namespace, String localPart);
+
+ public Map<String, List<Record>> getRecordsByClientHost(String clientHost);
+
+ public Set<String> getClientHosts();
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordExtractorMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -0,0 +1,146 @@
+/*
+ * 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.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.List;
+
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
+
+/**
+ * The record processor MBean representation
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 12-Dec-2007
+ */
+public class ManagedRecordProcessor implements ManagedRecordProcessorMBean
+{
+ private RecordProcessor processor;
+
+ public ManagedRecordProcessor(RecordProcessor processor)
+ {
+ this.processor = processor;
+ }
+
+ public void addFilter(RecordFilter filter)
+ {
+ processor.addFilter(filter);
+ }
+
+ public List<RecordFilter> getFilters()
+ {
+ return processor.getFilters();
+ }
+
+ public boolean isProcessDate()
+ {
+ return processor.isProcessDate();
+ }
+
+ public boolean isProcessDestinationHost()
+ {
+ return processor.isProcessDestinationHost();
+ }
+
+ public boolean isProcessHeaders()
+ {
+ return processor.isProcessHeaders();
+ }
+
+ public boolean isProcessMessage()
+ {
+ return processor.isProcessMessage();
+ }
+
+ public boolean isProcessMessageType()
+ {
+ return processor.isProcessMessageType();
+ }
+
+ public boolean isProcessOperation()
+ {
+ return processor.isProcessOperation();
+ }
+
+ public boolean isProcessSourceHost()
+ {
+ return processor.isProcessSourceHost();
+ }
+
+ public void processRecord(Record record)
+ {
+ processor.processRecord(record);
+ }
+
+ public void setFilters(List<RecordFilter> filters)
+ {
+ processor.setFilters(filters);
+ }
+
+ public void setProcessDate(boolean value)
+ {
+ processor.setProcessDate(value);
+ }
+
+ public void setProcessDestinationHost(boolean value)
+ {
+ processor.setProcessDestinationHost(value);
+ }
+
+ public void setProcessHeaders(boolean value)
+ {
+ processor.setProcessHeaders(value);
+ }
+
+ public void setProcessMessage(boolean value)
+ {
+ processor.setProcessMessage(value);
+ }
+
+ public void setProcessMessageType(boolean value)
+ {
+ processor.setProcessMessageType(value);
+ }
+
+ public void setProcessOperation(boolean value)
+ {
+ processor.setProcessOperation(value);
+ }
+
+ public void setProcessSourceHost(boolean value)
+ {
+ processor.setProcessSourceHost(value);
+ }
+
+ public boolean isRecording()
+ {
+ return processor.isRecording();
+ }
+
+ public void setRecording(boolean value)
+ {
+ processor.setRecording(value);
+ }
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -0,0 +1,80 @@
+/*
+ * 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.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+
+/**
+ * The record processor MBean interface
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public interface ManagedRecordProcessorMBean
+{
+ public void processRecord(Record record);
+
+ public void setRecording(boolean value);
+
+ public boolean isRecording();
+
+ public List<RecordFilter> getFilters();
+
+ public void addFilter(RecordFilter filter);
+
+ public void setFilters(List<RecordFilter> filters);
+
+ public boolean isProcessSourceHost();
+
+ public void setProcessSourceHost(boolean value);
+
+ public boolean isProcessDestinationHost();
+
+ public void setProcessDestinationHost(boolean value);
+
+ public boolean isProcessMessageType();
+
+ public void setProcessMessageType(boolean value);
+
+ public boolean isProcessMessage();
+
+ public void setProcessMessage(boolean value);
+
+ public boolean isProcessHeaders();
+
+ public void setProcessHeaders(boolean value);
+
+ public boolean isProcessOperation();
+
+ public void setProcessOperation(boolean value);
+
+ public boolean isProcessDate();
+
+ public void setProcessDate(boolean value);
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -32,18 +32,23 @@
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
+import javax.xml.namespace.QName;
+
import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
import org.jboss.wsf.spi.management.recording.Record.MessageType;
/**
+ * Keeps the last received records in memory and allows user to
+ * search / get statistics on them.
*
* @author alessio.soldano(a)jboss.com
* @since 12-Dec-2007
*/
-public class RecordBufferProcessor extends AbstractRecordProcessor
+public class RecordBufferProcessor extends AbstractRecordProcessor implements RecordExtractor
{
- private Map<Long, List<Record>> recentRecords = Collections.synchronizedMap(new HashMap<Long, List<Record>>());
+ private Map<String, List<Record>> recentRecords = Collections.synchronizedMap(new HashMap<String, List<Record>>());
private ConcurrentLinkedQueue<Long> recentRecordGroups = new ConcurrentLinkedQueue<Long>();
private int size = 0;
@@ -74,17 +79,17 @@
}
}
- public Map<Long, List<Record>> getRecentRecords()
+ private Map<String, List<Record>> getRecentRecords()
{
synchronized (recentRecords)
{
- return new HashMap<Long, List<Record>>(recentRecords);
+ return new HashMap<String, List<Record>>(recentRecords);
}
}
public Set<String> getClientHosts()
{
- Map<Long, List<Record>> map = this.getRecentRecords();
+ Map<String, List<Record>> map = this.getRecentRecords();
Set<String> hosts = new HashSet<String>();
for (List<Record> list : map.values())
{
@@ -99,17 +104,21 @@
return hosts;
}
- public Map<Long, List<Record>> getRecords(String clientHost)
+ public Map<String, List<Record>> getMatchingRecords(RecordFilter[] filters)
{
- Map<Long, List<Record>> map = this.getRecentRecords();
- Map<Long, List<Record>> result = new HashMap<Long, List<Record>>();
+ Map<String, List<Record>> map = this.getRecentRecords();
+ Map<String, List<Record>> result = new HashMap<String, List<Record>>();
for (List<Record> list : map.values())
{
for (Record record : list)
{
- if (MessageType.INBOUND.equals(record.getMessageType())
- && ((clientHost == null && record.getSourceHost() == null) || clientHost.equalsIgnoreCase(record.getSourceHost())))
+ boolean match = true;
+ for (int i = 0; i < filters.length && match; i++)
{
+ match = match && filters[i].match(record);
+ }
+ if (match)
+ {
result.put(record.getGroupID(), list);
break;
}
@@ -118,4 +127,18 @@
return result;
}
+ public Map<String, List<Record>> getRecordsByClientHost(String clientHost)
+ {
+ RecordFilter[] filters = new RecordFilter[1];
+ filters[0] = new HostFilter(clientHost, true);
+ return this.getMatchingRecords(filters);
+ }
+
+ public Map<String, List<Record>> getRecordsByOperation(String namespace, String localPart)
+ {
+ RecordFilter[] filters = new RecordFilter[1];
+ filters[0] = new OperationFilter(new QName(namespace, localPart));
+ return this.getMatchingRecords(filters);
+ }
+
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -80,6 +80,10 @@
}
}
}
+ else
+ {
+ sb.append("MESSAGE");
+ }
sb.append(":");
if (this.isProcessDate())
{
Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordExtractor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordExtractor.java (rev 0)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordExtractor.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -0,0 +1,49 @@
+/*
+ * 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.wsf.framework.management.recording;
+
+//$Id$
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+
+/**
+ * A record extractor provide users with statistics about the collected records
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public interface RecordExtractor
+{
+ public Map<String, List<Record>> getMatchingRecords(RecordFilter[] filters);
+
+ public Map<String, List<Record>> getRecordsByOperation(String namespace, String localPart);
+
+ public Map<String, List<Record>> getRecordsByClientHost(String clientHost);
+
+ public Set<String> getClientHosts();
+
+}
Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordExtractor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordFactory.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -26,22 +26,38 @@
import org.jboss.wsf.spi.management.recording.Record;
/**
+ * Simple record factory
*
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
public class RecordFactory
{
- public static Long newGroupID()
+ private static long count = 0;
+
+ public static String newGroupID()
{
- //TODO-ALE!! fare meglio... concorrenza
- return new Long(System.currentTimeMillis());
+ long time = System.currentTimeMillis();
+ StringBuilder sb = new StringBuilder();
+ synchronized (RecordFactory.class)
+ {
+ count++;
+ }
+ sb.append(count);
+ sb.append("-");
+ sb.append(time);
+ return sb.toString();
}
-
- public static Record newRecord(Long groupID)
+
+ public static Record newRecord(String groupID)
{
Record record = new RecordImpl();
record.setGroupID(groupID);
return record;
}
+
+ public static Record newRecord()
+ {
+ return newRecord(newGroupID());
+ }
}
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-12 16:41:32 UTC (rev 5275)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-12 16:46:47 UTC (rev 5276)
@@ -45,7 +45,7 @@
private byte[] payload;
private MessageType messageType;
private QName operation;
- private Long groupID;
+ private String groupID;
private Date date;
private String envelope;
@@ -105,7 +105,7 @@
this.headers = headers;
}
- public Long getGroupID()
+ public String getGroupID()
{
return groupID;
}
@@ -115,7 +115,7 @@
return operation;
}
- public void setGroupID(Long groupID)
+ public void setGroupID(String groupID)
{
this.groupID = groupID;
}
18 years, 4 months
- 1
- 0
JBossWS SVN: r5275 - in spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi: management/recording and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-12 11:41:32 -0500 (Wed, 12 Dec 2007)
New Revision: 5275
Modified:
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
Log:
Endpoint interface update and minor changes
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-12-12 16:25:28 UTC (rev 5274)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-12-12 16:41:32 UTC (rev 5275)
@@ -124,9 +124,5 @@
List<RecordProcessor> getRecordProcessors();
void setRecordProcessors(List<RecordProcessor> recordProcessors);
- boolean isRecording();
-
- void setRecording(boolean value);
-
void processRecord(Record record);
}
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-12 16:25:28 UTC (rev 5274)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-12 16:41:32 UTC (rev 5275)
@@ -38,9 +38,9 @@
{
public enum MessageType {INBOUND, OUTBOUND};
- public Long getGroupID();
+ public String getGroupID();
- public void setGroupID(Long groupID);
+ public void setGroupID(String groupID);
public Date getDate();
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2007-12-12 16:25:28 UTC (rev 5274)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2007-12-12 16:41:32 UTC (rev 5275)
@@ -34,28 +34,28 @@
*/
public class RecordGroupAssociation
{
- private static ThreadLocal<Stack<Long>> groupIDAssoc = new ThreadLocal<Stack<Long>>();
+ private static ThreadLocal<Stack<String>> groupIDAssoc = new ThreadLocal<Stack<String>>();
// provide logging
private static Logger log = Logger.getLogger(RecordGroupAssociation.class);
- public static void pushGroupID(Long groupID)
+ public static void pushGroupID(String groupID)
{
if(log.isDebugEnabled()) log.debug("pushGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")");
- Stack<Long> stack = groupIDAssoc.get();
+ Stack<String> stack = groupIDAssoc.get();
if (stack == null)
{
- stack = new Stack<Long>();
+ stack = new Stack<String>();
groupIDAssoc.set(stack);
}
stack.push(groupID);
}
- public static Long peekGroupID()
+ public static String peekGroupID()
{
- Long groupID = null;
- Stack<Long> stack = groupIDAssoc.get();
+ String groupID = null;
+ Stack<String> stack = groupIDAssoc.get();
if (stack != null && stack.isEmpty() == false)
{
groupID = stack.peek();
@@ -64,10 +64,10 @@
return groupID;
}
- public static Long popGroupID()
+ public static String popGroupID()
{
- Long groupID = null;
- Stack<Long> stack = groupIDAssoc.get();
+ String groupID = null;
+ Stack<String> stack = groupIDAssoc.get();
if (stack != null && stack.isEmpty() == false)
{
groupID = stack.pop();
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-12 16:25:28 UTC (rev 5274)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-12 16:41:32 UTC (rev 5275)
@@ -26,37 +26,56 @@
import java.util.List;
/**
+ * Processes a record. A RecordProcessor may have filters to allow processing
+ * of records matching given criteria. It also gives users fine management of
+ * record's attributes to processed.
*
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
public interface RecordProcessor
{
- /**
- * To be used to have this processor process the specified record
- *
- * @param record
- */
+ public String getName();
+
+ public void setName(String epName);
+
+ public boolean isRecording();
+
+ public void setRecording(boolean value);
+
public void processRecord(Record record);
-
- /** Filters: a record is processed only if it matches all the processor's filters **/
+
public List<RecordFilter> getFilters();
+
public void addFilter(RecordFilter filter);
+
public void setFilters(List<RecordFilter> filters);
-
- /** Fine grained management of records' field to be processed **/
+
public boolean isProcessSourceHost();
+
public void setProcessSourceHost(boolean value);
+
public boolean isProcessDestinationHost();
+
public void setProcessDestinationHost(boolean value);
+
public boolean isProcessMessageType();
+
public void setProcessMessageType(boolean value);
+
public boolean isProcessMessage();
+
public void setProcessMessage(boolean value);
+
public boolean isProcessHeaders();
+
public void setProcessHeaders(boolean value);
+
public boolean isProcessOperation();
+
public void setProcessOperation(boolean value);
+
public boolean isProcessDate();
+
public void setProcessDate(boolean value);
}
18 years, 4 months
- 1
- 0
JBossWS SVN: r5274 - framework/trunk/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 11:25:28 -0500 (Wed, 12 Dec 2007)
New Revision: 5274
Modified:
framework/trunk/hudson/hudson-home/config.xml
Log:
Include AS-4.2.3 jobs in view
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
+++ framework/trunk/hudson/hudson-home/config.xml 2007-12-12 16:25:28 UTC (rev 5274)
@@ -58,17 +58,22 @@
<string>Native-Core-AS-4.2.1</string>
<string>Native-Core-AS-4.2.2</string>
<string>Native-Core-AS-4.2.2-JDK6</string>
+ <string>Native-Core-AS-4.2.3</string>
+ <string>Native-Core-AS-4.2.3-JDK6</string>
<string>Native-Core-AS-5.0.0</string>
<string>Native-Distro-AS-4.0.5</string>
<string>Native-Distro-AS-4.0.5-No-EJB3</string>
<string>Native-Distro-AS-4.2.1</string>
<string>Native-Distro-AS-4.2.2</string>
<string>Native-Distro-AS-4.2.2-JDK6</string>
+ <string>Native-Distro-AS-4.2.3</string>
+ <string>Native-Distro-AS-4.2.3-JDK6</string>
<string>Native-Distro-AS-5.0.0</string>
<string>Native-Integration-AS-4.0.5</string>
<string>Native-Integration-AS-4.0.5-No-EJB3</string>
<string>Native-Integration-AS-4.2.1</string>
<string>Native-Integration-AS-4.2.2</string>
+ <string>Native-Integration-AS-4.2.3</string>
<string>Native-Integration-AS-5.0.0</string>
</jobNames>
<name>Native Tests</name>
@@ -88,8 +93,10 @@
<no-comparator/>
<string>Metro-ALL</string>
<string>Metro-Distro-AS-4.2.2</string>
+ <string>Metro-Distro-AS-4.2.3</string>
<string>Metro-Distro-AS-5.0.0</string>
<string>Metro-Integration-AS-4.2.2</string>
+ <string>Metro-Integration-AS-4.2.3</string>
<string>Metro-Integration-AS-5.0.0</string>
</jobNames>
<name>Metro Tests</name>
@@ -109,8 +116,10 @@
<no-comparator/>
<string>CXF-ALL</string>
<string>CXF-Distro-AS-4.2.2</string>
+ <string>CXF-Distro-AS-4.2.3</string>
<string>CXF-Distro-AS-5.0.0</string>
<string>CXF-Integration-AS-4.2.2</string>
+ <string>CXF-Integration-AS-4.2.3</string>
<string>CXF-Integration-AS-5.0.0</string>
</jobNames>
<name>CXF Tests</name>
18 years, 4 months
- 1
- 0
JBossWS SVN: r5273 - in framework/trunk/hudson/hudson-home/jobs: CXF-ALL and 25 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 09:50:14 -0500 (Wed, 12 Dec 2007)
New Revision: 5273
Added:
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5-No-EJB3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
Log:
Add AS423 target test jobs
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -3,7 +3,10 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>CXF-Distro-AS-4.2.2, CXF-Distro-AS-5.0.0, CXF-Integration-AS-4.2.2, CXF-Integration-AS-5.0.0</childProjects>
+ <childProjects>
+ CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-5.0.0,
+ CXF-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-5.0.0
+ </childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -14,10 +14,8 @@
STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS_INSTANCE=$JBOSS422_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Distro-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# Build distro
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
+
+#
+# Deploy distro
+#
+cd output/jbossws-cxf-(a)version.id@
+./build.sh $ENVIRONMENT deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/output/jbossws-cxf-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-Integration-AS-5.0.0
+MODULE=CXF-Integration-AS-4.2.2
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Integration-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# build and deploy
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -3,7 +3,10 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Metro-Distro-AS-4.2.2, Metro-Distro-AS-5.0.0, Metro-Integration-AS-4.2.2, Metro-Integration-AS-5.0.0</childProjects>
+ <childProjects>
+ Metro-Distro-AS-4.2.2, Metro-Distro-AS-4.2.3, Metro-Distro-AS-5.0.0,
+ Metro-Integration-AS-4.2.2, Metro-Integration-AS-4.2.3, Metro-Integration-AS-5.0.0
+ </childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Distro-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# Build distro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
+
+#
+# Deploy distro
+#
+cd output/jbossws-metro-(a)version.id@
+./build.sh $ENVIRONMENT deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Integration-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# build and deploy
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -4,9 +4,9 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- Native-Core-AS-4.0.5, Native-Core-AS-4.0.5-No-EJB3, Native-Core-AS-4.2.1, Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-5.0.0,
- Native-Distro-AS-4.0.5, Native-Distro-AS-4.0.5-No-EJB3, Native-Distro-AS-4.2.1, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-5.0.0,
- Native-Integration-AS-4.0.5, Native-Integration-AS-4.0.5-No-EJB3, Native-Integration-AS-4.2.1, Native-Integration-AS-4.2.2, Native-Integration-AS-5.0.0
+ Native-Core-AS-4.0.5, Native-Core-AS-4.0.5-No-EJB3, Native-Core-AS-4.2.1, Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6, Native-Core-AS-5.0.0,
+ Native-Distro-AS-4.0.5, Native-Distro-AS-4.0.5-No-EJB3, Native-Distro-AS-4.2.1, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6, Native-Distro-AS-5.0.0,
+ Native-Integration-AS-4.0.5, Native-Integration-AS-4.0.5-No-EJB3, Native-Integration-AS-4.2.1, Native-Integration-AS-4.2.2, Native-Integration-AS-4.2.3, Native-Integration-AS-5.0.0
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-4.0.5
+MODULE=Native-Core-AS-4.0.5
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5-No-EJB3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5-No-EJB3/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.0.5-No-EJB3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-4.0.5-No-EJB3
+MODULE=Native-Core-AS-4.0.5-No-EJB3
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-4.2.1
+MODULE=Native-Core-AS-4.2.1
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-4.2.2
+MODULE=Native-Core-AS-4.2.2
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-4.2.2-JDK6
+MODULE=Native-Core-AS-4.2.2-JDK6
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Core-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# build and deploy
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,130 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Core-AS-4.2.3-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# build and deploy
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=JBWS-CoreTests-AS-5.0.0
+MODULE=Native-Core-AS-5.0.0
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -14,11 +14,8 @@
STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3
-JBOSS_INSTANCE=$JBOSS405_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405 -Djboss405.home=$JBOSS_INSTANCE"
#
# stop jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.0.5-No-EJB3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -14,11 +14,8 @@
STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/(a)hudson.jboss405.build@
-JBOSS_INSTANCE=$JBOSS405_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405.no.ejb3 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/(a)hudson.jboss405.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss405.no.ejb3 -Djboss405.home=$JBOSS_INSTANCE"
#
# stop jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -12,11 +12,8 @@
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS421_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@
-JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3
-JBOSS_INSTANCE=$JBOSS421_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss500.home=$JBOSS500_INSTANCE -Djboss421.home=$JBOSS421_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE"
#
# stop jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -14,11 +14,8 @@
STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3
-JBOSS_INSTANCE=$JBOSS422_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -14,11 +14,8 @@
STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3
-JBOSS_INSTANCE=$JBOSS422_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS422_INSTANCE"
#
# Verify JDK1.6 availablility
Added: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Distro-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# Build distro
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
+
+#
+# Deploy distro
+#
+cd output/jbossws-native-(a)version.id@
+./build.sh $ENVIRONMENT deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/output/jbossws-native-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,136 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Distro-AS-4.2.3-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS423_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# Build distro
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
+
+#
+# Deploy distro
+#
+cd output/jbossws-native-(a)version.id@
+./build.sh $ENVIRONMENT deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/output/jbossws-native-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2007-12-12 14:23:21 UTC (rev 5272)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -14,11 +14,8 @@
STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-JBOSS405_INSTANCE=@hudson.home@/jobs/AS-4.0.5/workspace/JBossAS-4.0.5/build/output/@hudson.jboss405.build(a)-ejb3
-JBOSS_INSTANCE=$JBOSS500_INSTANCE
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE -Djboss405.home=$JBOSS405_INSTANCE"
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE"
#
# stop jbossas
Added: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2007-12-12 14:50:14 UTC (rev 5273)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Integration-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-metro
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# build and deploy
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 4 months
- 1
- 0
JBossWS SVN: r5272 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxws/wsrm and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-12 09:23:21 -0500 (Wed, 12 Dec 2007)
New Revision: 5272
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
Log:
enabling server side RM handler
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -30,5 +30,17 @@
*/
public final class RMClientHandler extends RMHandler
{
+
+ @Override
+ protected boolean isClientSide()
+ {
+ return true;
+ }
+ @Override
+ protected boolean isServerSide()
+ {
+ return false;
+ }
+
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -64,9 +64,9 @@
* @since Oct 23, 2007
*/
@SuppressWarnings("unchecked")
-public class RMHandler extends GenericSOAPHandler
+public abstract class RMHandler extends GenericSOAPHandler
{
- private static final Logger log = Logger.getLogger(RMHandler.class);
+ protected final Logger log = Logger.getLogger(getClass());
private static final RMMessageFactory rmFactory = RMProvider.get().getMessageFactory();
private static final RMConstants rmConstants = RMProvider.get().getConstants();
private static final Set headers = RMConstant.PROTOCOL_OPERATION_QNAMES;
@@ -75,6 +75,10 @@
{
return headers;
}
+
+ protected abstract boolean isClientSide();
+
+ protected abstract boolean isServerSide();
protected final boolean handleOutbound(MessageContext msgContext)
{
@@ -94,16 +98,21 @@
SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage();
RMSequenceIface sequenceImpl = (RMSequenceIface)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
- QName msgQName = rmConstants.getCreateSequenceQName();
- if (outMsgs.contains(msgQName))
+ QName msgQName = null;
+
+ if (isClientSide())
{
- // try to serialize CreateSequence to message
- String replyTo = addrProps.getReplyTo().getAddress().getURI().toString();
- RMCreateSequence createSequence = rmFactory.newCreateSequence();
- createSequence.setAcksTo(replyTo);
- createSequence.serializeTo(soapMessage);
- data.put(msgQName, createSequence);
- log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ msgQName = rmConstants.getCreateSequenceQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize CreateSequence to message
+ String replyTo = addrProps.getReplyTo().getAddress().getURI().toString();
+ RMCreateSequence createSequence = rmFactory.newCreateSequence();
+ createSequence.setAcksTo(replyTo);
+ createSequence.serializeTo(soapMessage);
+ data.put(msgQName, createSequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
}
msgQName = rmConstants.getSequenceQName();
@@ -130,49 +139,61 @@
log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
}
- msgQName = rmConstants.getCloseSequenceQName();
- if (outMsgs.contains(msgQName))
+ if (isClientSide())
{
- // try to serialize CloseSequence to message
- RMCloseSequence closeSequence = rmFactory.newCloseSequence();
- closeSequence.setIdentifier(sequenceImpl.getOutboundId());
- closeSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
- closeSequence.serializeTo(soapMessage);
- data.put(msgQName, closeSequence);
- log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ msgQName = rmConstants.getCloseSequenceQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize CloseSequence to message
+ RMCloseSequence closeSequence = rmFactory.newCloseSequence();
+ closeSequence.setIdentifier(sequenceImpl.getOutboundId());
+ closeSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
+ closeSequence.serializeTo(soapMessage);
+ data.put(msgQName, closeSequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
}
- msgQName = rmConstants.getCloseSequenceResponseQName();
- if (outMsgs.contains(msgQName))
+ if (isServerSide())
{
- // try to serialize CloseSequenceResponse to message
- RMCloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse();
- closeSequenceResponse.setIdentifier(sequenceImpl.getOutboundId());
- data.put(msgQName, closeSequenceResponse);
- log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ msgQName = rmConstants.getCloseSequenceResponseQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize CloseSequenceResponse to message
+ RMCloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse();
+ closeSequenceResponse.setIdentifier(sequenceImpl.getOutboundId());
+ data.put(msgQName, closeSequenceResponse);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
}
- msgQName = rmConstants.getTerminateSequenceQName();
- if (outMsgs.contains(msgQName))
+ if (isClientSide())
{
- // try to serialize TerminateSequence to message
- RMTerminateSequence terminateSequence = rmFactory.newTerminateSequence();
- terminateSequence.setIdentifier(sequenceImpl.getOutboundId());
- terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
- terminateSequence.serializeTo(soapMessage);
- data.put(msgQName, terminateSequence);
- log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ msgQName = rmConstants.getTerminateSequenceQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize TerminateSequence to message
+ RMTerminateSequence terminateSequence = rmFactory.newTerminateSequence();
+ terminateSequence.setIdentifier(sequenceImpl.getOutboundId());
+ terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
+ terminateSequence.serializeTo(soapMessage);
+ data.put(msgQName, terminateSequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
}
- msgQName = rmConstants.getTerminateSequenceResponseQName();
- if (outMsgs.contains(msgQName))
+ if (isServerSide())
{
- // try to serialize terminateSequenceResponse to message
- RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse();
- terminateSequenceResponse.setIdentifier(sequenceImpl.getOutboundId());
- terminateSequenceResponse.serializeTo(soapMessage);
- data.put(msgQName, terminateSequenceResponse);
- log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ msgQName = rmConstants.getTerminateSequenceResponseQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize terminateSequenceResponse to message
+ RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse();
+ terminateSequenceResponse.setIdentifier(sequenceImpl.getOutboundId());
+ terminateSequenceResponse.serializeTo(soapMessage);
+ data.put(msgQName, terminateSequenceResponse);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
}
msgQName = rmConstants.getSequenceAcknowledgementQName();
@@ -194,6 +215,9 @@
data.put(msgQName, sequenceAcknowledgement);
log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
}
+
+ if (data.size() == 0)
+ throw new RMException("RM handler did not serialize WS-RM message to the payload");
// TODO: implement SequenceFault serialization
@@ -213,18 +237,36 @@
msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
msgContext.setScope(RMConstant.RESPONSE_CONTEXT, Scope.APPLICATION);
- try
+ if (isServerSide())
{
- // try to deserialize CreateSequenceResponse from message
- QName msgQName = rmConstants.getCreateSequenceResponseQName();
- RMCreateSequenceResponse wsrmMsg = rmFactory.newCreateSequenceResponse();
- wsrmMsg.deserializeFrom(soapMessage);
- messages.add(msgQName);
- data.put(msgQName, wsrmMsg);
- log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ try
+ {
+ // try to deserialize CreateSequence from message
+ QName msgQName = rmConstants.getCreateSequenceQName();
+ RMCreateSequence wsrmMsg = rmFactory.newCreateSequence();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
}
- catch (RMException ignore) {}
+ if (isClientSide())
+ {
+ try
+ {
+ // try to deserialize CreateSequenceResponse from message
+ QName msgQName = rmConstants.getCreateSequenceResponseQName();
+ RMCreateSequenceResponse wsrmMsg = rmFactory.newCreateSequenceResponse();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+ }
+
try
{
// try to deserialize AckRequested from message
@@ -261,53 +303,65 @@
}
catch (RMException ignore) {}
- try
+ if (isServerSide())
{
- // try to deserialize CloseSequence from message
- QName msgQName = rmConstants.getCloseSequenceQName();
- RMCloseSequence wsrmMsg = rmFactory.newCloseSequence();
- wsrmMsg.deserializeFrom(soapMessage);
- messages.add(msgQName);
- data.put(msgQName, wsrmMsg);
- log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ try
+ {
+ // try to deserialize CloseSequence from message
+ QName msgQName = rmConstants.getCloseSequenceQName();
+ RMCloseSequence wsrmMsg = rmFactory.newCloseSequence();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
}
- catch (RMException ignore) {}
- try
+ if (isClientSide())
{
- // try to deserialize CloseSequence from message
- QName msgQName = rmConstants.getCloseSequenceResponseQName();
- RMCloseSequenceResponse wsrmMsg = rmFactory.newCloseSequenceResponse();
- wsrmMsg.deserializeFrom(soapMessage);
- messages.add(msgQName);
- data.put(msgQName, wsrmMsg);
- log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ try
+ {
+ // try to deserialize CloseSequenceResponse from message
+ QName msgQName = rmConstants.getCloseSequenceResponseQName();
+ RMCloseSequenceResponse wsrmMsg = rmFactory.newCloseSequenceResponse();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
}
- catch (RMException ignore) {}
- try
+ if (isServerSide())
{
- // try to deserialize TerminateSequence from message
- QName msgQName = rmConstants.getTerminateSequenceQName();
- RMTerminateSequence wsrmMsg = rmFactory.newTerminateSequence();
- wsrmMsg.deserializeFrom(soapMessage);
- messages.add(msgQName);
- data.put(msgQName, wsrmMsg);
- log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ try
+ {
+ // try to deserialize TerminateSequence from message
+ QName msgQName = rmConstants.getTerminateSequenceQName();
+ RMTerminateSequence wsrmMsg = rmFactory.newTerminateSequence();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
}
- catch (RMException ignore) {}
- try
+ if (isClientSide())
{
- // try to deserialize TerminateSequenceResponse from message
- QName msgQName = rmConstants.getTerminateSequenceResponseQName();
- RMTerminateSequenceResponse wsrmMsg = rmFactory.newTerminateSequenceResponse();
- wsrmMsg.deserializeFrom(soapMessage);
- messages.add(msgQName);
- data.put(msgQName, wsrmMsg);
- log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ try
+ {
+ // try to deserialize TerminateSequenceResponse from message
+ QName msgQName = rmConstants.getTerminateSequenceResponseQName();
+ RMTerminateSequenceResponse wsrmMsg = rmFactory.newTerminateSequenceResponse();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
}
- catch (RMException ignore) {}
// TODO: implement SequenceFault deserialization
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -31,4 +31,16 @@
public final class RMServerHandler extends RMHandler
{
+ @Override
+ protected boolean isClientSide()
+ {
+ return false;
+ }
+
+ @Override
+ protected boolean isServerSide()
+ {
+ return true;
+ }
+
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -7,7 +7,11 @@
import org.jboss.ws.annotation.EndpointConfig;
@WebService
-@EndpointConfig(configName = "Standard WSRM Client", configFile = "META-INF/wsrm-jaxws-client-config.xml")
+@EndpointConfig
+(
+ configName = "Standard WSRM Client",
+ configFile = "META-INF/wsrm-jaxws-client-config.xml"
+)
public interface OneWayServiceIface
{
@Oneway
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -5,6 +5,7 @@
import javax.xml.ws.addressing.Action;
import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.annotation.Policy;
import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
@@ -25,6 +26,11 @@
scope = PolicyScopeLevel.WSDL_BINDING
)
)
+@EndpointConfig
+(
+ configName = "Standard WSRM Endpoint",
+ configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
+)
public class OneWayServiceImpl implements OneWayServiceIface
{
private Logger log = Logger.getLogger(OneWayServiceImpl.class);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -17,7 +17,11 @@
@WebService(name = "ReqRes", targetNamespace = "http://org.jboss.ws/jaxws/wsrm")
@SOAPBinding(style = Style.RPC)
-@EndpointConfig(configName = "Standard WSRM Client", configFile = "META-INF/wsrm-jaxws-client-config.xml")
+@EndpointConfig
+(
+ configName = "Standard WSRM Client",
+ configFile = "META-INF/wsrm-jaxws-client-config.xml"
+)
public interface ReqResServiceIface
{
@WebMethod(operationName = "echo")
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-12 14:23:21 UTC (rev 5272)
@@ -9,6 +9,7 @@
import javax.xml.ws.addressing.Action;
import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.annotation.Policy;
import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
@@ -31,6 +32,11 @@
scope = PolicyScopeLevel.WSDL_BINDING
)
)
+@EndpointConfig
+(
+ configName = "Standard WSRM Endpoint",
+ configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
+)
public class ReqResServiceImpl
{
private static Logger log = Logger.getLogger(ReqResServiceImpl.class);
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-12-12 14:08:19 UTC (rev 5271)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-12-12 14:23:21 UTC (rev 5272)
@@ -8,13 +8,11 @@
<endpoint-config>
<config-name>Standard WSRM Endpoint</config-name>
- <reliable-messaging>
- <delivery-assurance inOrder="true" quality="AtLeastOnce"/>
- <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <!--reliable-messaging>
<message-store id="wsrmStoreId" class="custom.MessageStoreImpl">
<config-file>META-INF/config.xml</config-file>
</message-store>
- </reliable-messaging>
+ </reliable-messaging-->
<post-handler-chains>
<javaee:handler-chain>
<javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
@@ -22,10 +20,10 @@
<javaee:handler-name>WSAddressing Handler</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
</javaee:handler>
- <!--javaee:handler>
+ <javaee:handler>
<javaee:handler-name>WSRM Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.wsrm.RMServerHandler</javaee:handler-class>
- </javaee:handler-->
+ <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class>
+ </javaee:handler>
</javaee:handler-chain>
</post-handler-chains>
</endpoint-config>
18 years, 4 months
- 1
- 0
JBossWS SVN: r5271 - in stack/cxf/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 09:08:19 -0500 (Wed, 12 Dec 2007)
New Revision: 5271
Added:
stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
Modified:
stack/cxf/trunk/ant-import/build-setup.xml
stack/cxf/trunk/ant.properties.example
Log:
Add deploy-jboss423
Modified: stack/cxf/trunk/ant-import/build-setup.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-setup.xml 2007-12-12 14:07:51 UTC (rev 5270)
+++ stack/cxf/trunk/ant-import/build-setup.xml 2007-12-12 14:08:19 UTC (rev 5271)
@@ -30,6 +30,12 @@
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+ <property name="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -40,13 +46,18 @@
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<condition property="jbossws.integration.jboss42" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Modified: stack/cxf/trunk/ant.properties.example
===================================================================
--- stack/cxf/trunk/ant.properties.example 2007-12-12 14:07:51 UTC (rev 5270)
+++ stack/cxf/trunk/ant.properties.example 2007-12-12 14:08:19 UTC (rev 5271)
@@ -9,8 +9,9 @@
# Optional JBoss Home
#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
-# The JBoss server under test. This can be [jboss422|jboss500]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
jbossws.integration.target=jboss422
# The JBoss settings
Added: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt (rev 0)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-12 14:08:19 UTC (rev 5271)
@@ -0,0 +1,43 @@
+#
+# $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/**
+#
+###################################################################
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [JBWS-1683] Fix JAXR samples for CXF
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
+org/jboss/test/ws/jaxws/smoke/tools/**
+
+# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [CXF-1244] Application Exception not initialized properly
+org/jboss/test/ws/jaxws/samples/exception/**
+
+# [CXF-1250] SOAPMessage.getSOAPHeader returns null
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+
+# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/provider/**
+
+# [CXF-1253] CXF does not respect @HandlerChain on client SEI
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+
+# Won't Fix: [CXF-1261] Handler does not see XOP message properly
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
Property changes on: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 4 months
- 1
- 0
JBossWS SVN: r5270 - in stack/metro/trunk: src/test/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 09:07:51 -0500 (Wed, 12 Dec 2007)
New Revision: 5270
Added:
stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
Modified:
stack/metro/trunk/ant-import/build-setup.xml
Log:
Add deploy-jboss423
Modified: stack/metro/trunk/ant-import/build-setup.xml
===================================================================
--- stack/metro/trunk/ant-import/build-setup.xml 2007-12-12 14:02:14 UTC (rev 5269)
+++ stack/metro/trunk/ant-import/build-setup.xml 2007-12-12 14:07:51 UTC (rev 5270)
@@ -57,7 +57,7 @@
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
+ </or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Added: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt (rev 0)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-12 14:07:51 UTC (rev 5270)
@@ -0,0 +1,19 @@
+#
+# $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/**
+
+# [JBWS-1674] Fix @WebServiceRef with SunRI
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Property changes on: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 4 months
- 1
- 0
JBossWS SVN: r5269 - in stack/metro/trunk: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 09:02:14 -0500 (Wed, 12 Dec 2007)
New Revision: 5269
Modified:
stack/metro/trunk/ant-import/build-setup.xml
stack/metro/trunk/ant.properties.example
Log:
Add deploy-jboss423
Modified: stack/metro/trunk/ant-import/build-setup.xml
===================================================================
--- stack/metro/trunk/ant-import/build-setup.xml 2007-12-12 13:58:45 UTC (rev 5268)
+++ stack/metro/trunk/ant-import/build-setup.xml 2007-12-12 14:02:14 UTC (rev 5269)
@@ -30,6 +30,12 @@
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+ <property name="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -40,13 +46,18 @@
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<condition property="jbossws.integration.jboss42" value="true">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Modified: stack/metro/trunk/ant.properties.example
===================================================================
--- stack/metro/trunk/ant.properties.example 2007-12-12 13:58:45 UTC (rev 5268)
+++ stack/metro/trunk/ant.properties.example 2007-12-12 14:02:14 UTC (rev 5269)
@@ -9,8 +9,9 @@
# Optional JBoss Home
#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
-# The JBoss server under test. This can be [jboss422|jboss500]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
jbossws.integration.target=jboss422
# The JBoss settings
18 years, 4 months
- 1
- 0
JBossWS SVN: r5268 - stack/metro/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 08:58:45 -0500 (Wed, 12 Dec 2007)
New Revision: 5268
Modified:
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
Log:
Add deploy-jboss423
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2007-12-12 13:54:55 UTC (rev 5267)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2007-12-12 13:58:45 UTC (rev 5268)
@@ -17,41 +17,63 @@
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
<!-- ================================================================== -->
- <!-- Deployment -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
- <!-- Deploy to jboss50 -->
- <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
- <macro-deploy-sunri500
+ <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri422
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss500.home}"/>
+ jbosshome="${jboss422.home}"/>
</target>
- <!-- Remove from jboss50 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri500/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ <!-- Remove from jboss422 -->
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri422/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
- <!-- Deploy to jboss42 -->
- <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri422
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri423
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss422.home}"/>
+ jbosshome="${jboss423.home}"/>
</target>
- <!-- Remove from jboss42 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri422/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ <!-- Remove from jboss423 -->
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri423/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
+ <macro-deploy-sunri500
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.sunri.dir}/thirdparty"
+ jbosshome="${jboss500.home}"/>
+ </target>
+
+ <!-- Remove from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ </target>
+
</project>
Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-12-12 13:54:55 UTC (rev 5267)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-12-12 13:58:45 UTC (rev 5268)
@@ -53,7 +53,7 @@
</sequential>
</macrodef>
- <!-- Remove jbossws/sunri from jboss42 -->
+ <!-- Remove jbossws/sunri from jboss422 -->
<macrodef name="macro-undeploy-sunri422">
<sequential>
<delete>
@@ -78,6 +78,70 @@
</macrodef>
<!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss423.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss423 -->
+ <macrodef name="macro-undeploy-sunri423">
+ <sequential>
+ <delete>
+ <fileset dir="${jboss423.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
18 years, 4 months
- 1
- 0
JBossWS SVN: r5267 - stack/cxf/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-12 08:54:55 -0500 (Wed, 12 Dec 2007)
New Revision: 5267
Modified:
stack/cxf/trunk/ant-import/build-deploy.xml
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
Log:
Add deploy-jboss423
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2007-12-12 13:31:36 UTC (rev 5266)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2007-12-12 13:54:55 UTC (rev 5267)
@@ -20,8 +20,8 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy to jboss50 -->
- <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50">
+ <!-- Deploy to jboss500 -->
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss500">
<macro-deploy-cxf500
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
@@ -31,14 +31,14 @@
jbosshome="${jboss500.home}"/>
</target>
- <!-- Remove from jboss50 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50">
+ <!-- Remove from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500">
<macro-undeploy-cxf500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
- <!-- Deploy to jboss42 -->
- <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42">
+ <!-- Deploy to jboss422 -->
+ <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss422">
<macro-deploy-cxf422
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
@@ -48,10 +48,27 @@
jbosshome="${jboss422.home}"/>
</target>
- <!-- Remove from jboss42 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42">
+ <!-- Remove from jboss422 -->
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422">
<macro-undeploy-cxf422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
+ <!-- Deploy to jboss423 -->
+ <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss423">
+ <macro-deploy-cxf423
+ stacklibs="${int.cxf.dir}/output/lib"
+ thirdpartylibs="${int.cxf.dir}/thirdparty"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss423.home}"/>
+ </target>
+
+ <!-- Remove from jboss423 -->
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423">
+ <macro-undeploy-cxf423/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
+ </target>
+
</project>
Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2007-12-12 13:31:36 UTC (rev 5266)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2007-12-12 13:54:55 UTC (rev 5267)
@@ -17,7 +17,7 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy to jboss50 -->
+ <!-- Deploy jbossws/cxf to jboss500 -->
<macrodef name="macro-deploy-cxf500">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
@@ -56,7 +56,7 @@
</sequential>
</macrodef>
- <!-- Undeploy from jboss50 -->
+ <!-- Undeploy jbossws/cxf from jboss500 -->
<macrodef name="macro-undeploy-cxf500">
<sequential>
<delete>
@@ -85,6 +85,7 @@
</sequential>
</macrodef>
+ <!-- Deploy jbossws/cxf to jboss422 -->
<macrodef name="macro-deploy-cxf422">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
@@ -116,7 +117,7 @@
</sequential>
</macrodef>
- <!-- Remove jbossws/cxf from jboss42 -->
+ <!-- Undeploy jbossws/cxf from jboss422 -->
<macrodef name="macro-undeploy-cxf422">
<sequential>
<delete>
@@ -131,4 +132,51 @@
</sequential>
</macrodef>
+ <!-- Deploy jbossws/cxf to jboss423 -->
+ <macrodef name="macro-deploy-cxf423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss423.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss423.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.sar"/>
+ <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Undeploy jbossws/cxf from jboss423 -->
+ <macrodef name="macro-undeploy-cxf423">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss423.home}/client">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
+ <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
</project>
18 years, 4 months
- 1
- 0