JBossWS SVN: r4768 - in stack/native/tags/jbossws-native-2.0.1.SP2: src/test/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-16 03:22:47 -0400 (Tue, 16 Oct 2007)
New Revision: 4768
Modified:
stack/native/tags/jbossws-native-2.0.1.SP2/src/test/resources/test-excludes-jboss40.txt
stack/native/tags/jbossws-native-2.0.1.SP2/version.properties
Log:
Exclude [JBWS-1854] for AS40
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/test/resources/test-excludes-jboss40.txt
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/test/resources/test-excludes-jboss40.txt 2007-10-15 13:37:59 UTC (rev 4767)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/test/resources/test-excludes-jboss40.txt 2007-10-16 07:22:47 UTC (rev 4768)
@@ -1,5 +1,6 @@
# JBossAS-4.0 excludes
org/jboss/test/ws/jaxrpc/jbws723/**
+org/jboss/test/ws/jaxws/jbws1854/**
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/jbws1581/**
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/version.properties
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/version.properties 2007-10-15 13:37:59 UTC (rev 4767)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/version.properties 2007-10-16 07:22:47 UTC (rev 4768)
@@ -35,7 +35,7 @@
jboss-remoting-jboss50=2.2.2.SP1
# JBossAS-4.2
-jboss-jbossxb-jboss42=1.0.0.GA
+jboss-jbossxb-jboss42=1.0.0.SP1
jboss-remoting-jboss42=2.2.2.SP1
# JBossAS-4.0
17 years
JBossWS SVN: r4767 - in stack/native/trunk: src/main/java/org/jboss/ws/core and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-15 09:37:59 -0400 (Mon, 15 Oct 2007)
New Revision: 4767
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/version.properties
Log:
Fix JBWS-1856: Attachment part not cleanup correctly
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-10-15 13:37:59 UTC (rev 4767)
@@ -23,22 +23,25 @@
// $Id$
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext.Scope;
-
import org.jboss.logging.Logger;
import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.xb.binding.NamespaceRegistry;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.MessageContext.Scope;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
/**
* The common JAXRPC/JAXWS MessageContext
*
@@ -120,6 +123,8 @@
public SOAPMessage getSOAPMessage()
{
+ if(message!=null && ((message instanceof SOAPMessage) == false))
+ throw new UnsupportedOperationException("No SOAPMessage avilable. Current message context carries " + message.getClass());
return (SOAPMessage)message;
}
@@ -323,6 +328,33 @@
return valid;
}
+ public static void cleanupAttachments(CommonMessageContext messageContext)
+ {
+ // cleanup attachments
+ MessageAbstraction msg = messageContext.getMessageAbstraction();
+
+ if(msg!=null && (msg instanceof SOAPMessage)) // in case of http binding
+ {
+ Iterator it = ((SOAPMessage)msg).getAttachments();
+ while(it.hasNext())
+ {
+ AttachmentPart attachment = (AttachmentPart)it.next();
+ try
+ {
+ if(attachment.getDataHandler().getDataSource() instanceof SwapableMemoryDataSource)
+ {
+ SwapableMemoryDataSource swapFile = (SwapableMemoryDataSource)attachment.getDataHandler().getDataSource();
+ swapFile.cleanup();
+ }
+ }
+ catch (SOAPException e)
+ {
+ log.warn("Failed to cleanup attachment part", e);
+ }
+ }
+ }
+ }
+
private static class ImmutableEntry<K, V> implements Map.Entry<K, V>
{
final K k;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2007-10-15 13:37:59 UTC (rev 4767)
@@ -88,6 +88,7 @@
public static CommonMessageContext processPivot(CommonMessageContext requestContext)
{
log.debug("Begin response processing");
+ cleanupAttachments(requestContext);
return requestContext;
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2007-10-15 13:37:59 UTC (rev 4767)
@@ -24,16 +24,21 @@
// $Id: MessageContextImpl.java 275 2006-05-04 21:36:29Z jason.greene(a)jboss.com $
import javax.xml.ws.handler.MessageContext;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPException;
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxws.SerializationContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.xb.binding.NamespaceRegistry;
+import java.util.Iterator;
+
/**
* The interface MessageContext abstracts the message context that is processed by a handler in the handle method.
*
@@ -110,7 +115,9 @@
resContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, new Boolean(!outbound));
MessageContextAssociation.pushMessageContext(resContext);
+ cleanupAttachments(reqContext);
return resContext;
}
+
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2007-10-15 13:37:59 UTC (rev 4767)
@@ -153,28 +153,19 @@
if (dataHandler == null)
return 0;
- // In order to be accurate this method must be somewhat inefficient
- // TODO optimize this for specific data sources
- int count = 0, ret = 0;
- byte[] buffer = new byte[256];
-
try
{
- InputStream stream = dataHandler.getInputStream();
+ // We may need to buffer the stream, otherwise an additional read may fail
+ if((this.dataHandler.getDataSource() instanceof ByteArrayDataSource) == false)
+ this.dataHandler = new DataHandler(new ByteArrayDataSource(dataHandler.getInputStream(), dataHandler.getContentType()));
- do
- {
- count += ret;
- ret = stream.read(buffer);
- }
- while (ret != -1);
+ ByteArrayDataSource ds = (ByteArrayDataSource)this.dataHandler.getDataSource();
+ return ds.getSize();
}
catch (IOException e)
{
throw new SOAPException(e);
}
-
- return count;
}
public void removeAllMimeHeaders()
@@ -444,11 +435,7 @@
this.type = type;
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- int ch;
-
- while ((ch = is.read()) != -1)
- os.write(ch);
-
+ IOUtils.copyStream(os, is);
data = os.toByteArray();
} catch (IOException ioex) {
throw new WSException(ioex);
@@ -486,5 +473,9 @@
public String getName() {
return "ByteArrayDataSource";
}
+
+ public int getSize() {
+ return this.data.length;
+ }
}
}
\ No newline at end of file
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-10-15 13:37:59 UTC (rev 4767)
@@ -49,7 +49,7 @@
private static final int DEFAULT_MAX_MEMORY_SIZE = 64 * 1024;
- private static final String SWAP_PREFIX = "JBossWSsattachment";
+ private static final String SWAP_PREFIX = "JBossWSattachment";
private static final String SWAP_SUFFIX = ".dat";
@@ -119,7 +119,7 @@
rbaos = null;
}
- count = inputStream.read(buffer);
+ count = inputStream.read(buffer);
}
os.flush();
@@ -140,7 +140,11 @@
protected void finalize() throws Throwable
{
super.finalize();
+ cleanup();
+ }
+ public void cleanup()
+ {
if (swapFile != null)
swapFile.delete();
}
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-10-15 13:37:59 UTC (rev 4767)
@@ -311,6 +311,10 @@
}
finally
{
+
+ // Cleanup outbound attachments
+ CommonMessageContext.cleanupAttachments( MessageContextAssociation.peekMessageContext() );
+
// Reset the message context association
MessageContextAssociation.popMessageContext();
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-10-15 13:33:39 UTC (rev 4766)
+++ stack/native/trunk/version.properties 2007-10-15 13:37:59 UTC (rev 4767)
@@ -25,7 +25,7 @@
# Dependend integration projects
jbossws-spi=1.0.0.GA
-jbossws-common=1.0.0.GA
+jbossws-common=snapshot
jbossws-framework=snapshot
jbossws-jboss40=2.0.1.GA
jbossws-jboss42=2.0.1.GA
17 years
JBossWS SVN: r4766 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-15 09:33:39 -0400 (Mon, 15 Oct 2007)
New Revision: 4766
Added:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/FakeInputStream.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/GeneratorDataSource.java
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
Log:
Added JBWS-1856 test case
Added: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/FakeInputStream.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/FakeInputStream.java (rev 0)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/FakeInputStream.java 2007-10-15 13:33:39 UTC (rev 4766)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.xop.doclit;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class FakeInputStream extends InputStream
+{
+ private long size;
+
+ public FakeInputStream(long size)
+ {
+ this.size = size;
+ }
+
+ public int read(byte[] b, int off, int len) throws IOException
+ {
+ if (len < 1)
+ return 0;
+
+ if (size == 0)
+ return -1;
+
+ int ret = (int)Math.min(size, len);
+ Arrays.fill(b, off, off + ret, (byte)1);
+ size -= ret;
+
+ return ret;
+ }
+
+ public int read() throws IOException
+ {
+ if (size > 0)
+ {
+ size--;
+ return 1;
+ }
+
+ return -1;
+ }
+}
Property changes on: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/FakeInputStream.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/GeneratorDataSource.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/GeneratorDataSource.java (rev 0)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/GeneratorDataSource.java 2007-10-15 13:33:39 UTC (rev 4766)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.xop.doclit;
+
+import javax.activation.DataSource;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+
+public class GeneratorDataSource implements DataSource
+{
+ private long size;
+
+ public GeneratorDataSource(long size)
+ {
+ this.size = size;
+ }
+
+ public String getContentType()
+ {
+ return "application/octet-stream";
+ }
+
+ public InputStream getInputStream() throws IOException
+ {
+ return new FakeInputStream(size);
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public OutputStream getOutputStream() throws IOException
+ {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/GeneratorDataSource.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-10-15 10:00:03 UTC (rev 4765)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-10-15 13:33:39 UTC (rev 4766)
@@ -133,6 +133,24 @@
assertTrue(response.getData() instanceof Source);
}
+ public void testAttachmentpartSwap() throws Exception
+ {
+ getBinding().setMTOMEnabled(true);
+
+ DataHandler dh = new DataHandler( new GeneratorDataSource(1024*128) );
+ DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
+ assertNotNull(response);
+ assertNotNull(response.getDataHandler().getContent());
+
+ File tmpDir = new File(System.getProperty("jboss.home")+"/server/default/tmp/jbossws");
+ assertTrue("Temp dir doesn't exist", tmpDir.exists());
+
+ for(String fileName : tmpDir.list())
+ {
+ assertTrue("Attachment part swap file does still exist: "+fileName, fileName.indexOf("JBossWSattachment") == -1);
+ }
+ }
+
protected Object getContent(DataHandler dh) throws IOException
{
Object content = dh.getContent();
17 years
JBossWS SVN: r4765 - in framework/trunk/src/test/resources/jaxws/samples: eardeployment/WEB-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-15 06:00:03 -0400 (Mon, 15 Oct 2007)
New Revision: 4765
Modified:
framework/trunk/src/test/resources/jaxws/samples/context/WEB-INF/jboss-web.xml
framework/trunk/src/test/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml
framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml
Log:
Add doctype to jboss-web
Modified: framework/trunk/src/test/resources/jaxws/samples/context/WEB-INF/jboss-web.xml
===================================================================
--- framework/trunk/src/test/resources/jaxws/samples/context/WEB-INF/jboss-web.xml 2007-10-13 12:58:22 UTC (rev 4764)
+++ framework/trunk/src/test/resources/jaxws/samples/context/WEB-INF/jboss-web.xml 2007-10-15 10:00:03 UTC (rev 4765)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<security-domain>java:/jaas/JBossWS</security-domain>
</jboss-web>
\ No newline at end of file
Modified: framework/trunk/src/test/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml
===================================================================
--- framework/trunk/src/test/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml 2007-10-13 12:58:22 UTC (rev 4764)
+++ framework/trunk/src/test/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml 2007-10-15 10:00:03 UTC (rev 4765)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<!-- This is only needed for JBoss-5.0 deployments -->
<jboss-web>
Modified: framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml
===================================================================
--- framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml 2007-10-13 12:58:22 UTC (rev 4764)
+++ framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml 2007-10-15 10:00:03 UTC (rev 4765)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
<jboss-web>
17 years
JBossWS SVN: r4764 - stack/native/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-13 08:58:22 -0400 (Sat, 13 Oct 2007)
New Revision: 4764
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
Log:
Add jboss-metadata.jar to test classpath
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-13 12:56:41 UTC (rev 4763)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-13 12:58:22 UTC (rev 4764)
@@ -5,10 +5,6 @@
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
org/jboss/test/ws/jaxrpc/wsdlpublish/**
-# [JBWS-1853] Update ClientLaucher to new metadata model
-org/jboss/test/ws/jaxws/samples/webserviceref/*
-org/jboss/test/ws/jaxws/webserviceref/*
-
# [JBWS-1852] Failed to create a new SAX parser
org/jboss/test/ws/jaxws/samples/wssecurity/*
org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/*
17 years
JBossWS SVN: r4763 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-13 08:56:41 -0400 (Sat, 13 Oct 2007)
New Revision: 4763
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
Add jboss-metadata.jar to test classpath
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-13 11:58:36 UTC (rev 4762)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-10-13 12:56:41 UTC (rev 4763)
@@ -119,6 +119,7 @@
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-metadata.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
@@ -143,6 +144,7 @@
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jboss-metadata.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
17 years
JBossWS SVN: r4762 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-13 07:58:36 -0400 (Sat, 13 Oct 2007)
New Revision: 4762
Modified:
stack/native/trunk/.classpath
Log:
fix eclipse classpath
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2007-10-13 11:58:20 UTC (rev 4761)
+++ stack/native/trunk/.classpath 2007-10-13 11:58:36 UTC (rev 4762)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test-framework/java"/>
<classpathentry kind="src" path="output/tests/wsconsume/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -35,10 +36,9 @@
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years
JBossWS SVN: r4761 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-13 07:58:20 -0400 (Sat, 13 Oct 2007)
New Revision: 4761
Modified:
framework/trunk/.classpath
Log:
fix eclipse classpath
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2007-10-13 11:30:32 UTC (rev 4760)
+++ framework/trunk/.classpath 2007-10-13 11:58:20 UTC (rev 4761)
@@ -12,9 +12,9 @@
<classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years
JBossWS SVN: r4760 - framework/trunk/src/main/etc.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-13 07:30:32 -0400 (Sat, 13 Oct 2007)
New Revision: 4760
Modified:
framework/trunk/src/main/etc/component-info.xml
Log:
export jbossws-framework.jar
Modified: framework/trunk/src/main/etc/component-info.xml
===================================================================
--- framework/trunk/src/main/etc/component-info.xml 2007-10-13 11:26:32 UTC (rev 4759)
+++ framework/trunk/src/main/etc/component-info.xml 2007-10-13 11:30:32 UTC (rev 4760)
@@ -17,6 +17,7 @@
</import>
<export>
+ <include input="jbossws-framework.jar"/>
</export>
</component>
17 years
JBossWS SVN: r4759 - framework/trunk/src/main/etc.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-13 07:26:32 -0400 (Sat, 13 Oct 2007)
New Revision: 4759
Modified:
framework/trunk/src/main/etc/component-info.xml
Log:
fix typo
Modified: framework/trunk/src/main/etc/component-info.xml
===================================================================
--- framework/trunk/src/main/etc/component-info.xml 2007-10-13 11:16:31 UTC (rev 4758)
+++ framework/trunk/src/main/etc/component-info.xml 2007-10-13 11:26:32 UTC (rev 4759)
@@ -6,7 +6,7 @@
licenseType="lgpl">
<artifact id="jbossws-framework.jar"/>
- <artifact id="jbossws-framework-scr.zip"/>
+ <artifact id="jbossws-framework-src.zip"/>
<artifact id="jbossws-framework-scripts.zip"/>
<import componentref="jboss/jbossws-common">
17 years