JBossWS SVN: r6686 - stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-25 07:01:10 -0400 (Fri, 25 Apr 2008)
New Revision: 6686
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
Log:
refactoring + enforced JBossWS coding convention, no functional change
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-25 10:58:15 UTC (rev 6685)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-25 11:01:10 UTC (rev 6686)
@@ -86,8 +86,8 @@
if (this.endpoint == null)
{
ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-25 10:58:15 UTC (rev 6685)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-25 11:01:10 UTC (rev 6686)
@@ -35,7 +35,6 @@
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
-import com.sun.istack.NotNull;
import com.sun.xml.ws.api.message.Packet;
import com.sun.xml.ws.api.server.InstanceResolver;
import com.sun.xml.ws.api.server.Invoker;
@@ -51,8 +50,7 @@
public class InvokerEJB3 extends Invoker
{
private final InstanceResolver resolver;
-
- private WSWebServiceContext wsc;
+ private WSWebServiceContext webServiceCtx;
public InvokerEJB3(InstanceResolver resolver)
{
@@ -60,43 +58,41 @@
}
@Override
- public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint)
+ public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
{
- resolver.start(wsc, endpoint);
- this.wsc = wsc;
+ this.resolver.start(webServiceCtx, endpoint);
+ this.webServiceCtx = webServiceCtx;
}
@Override
public void dispose()
{
- resolver.dispose();
+ this.resolver.dispose();
}
@Override
- public <T> T invokeProvider(@NotNull Packet p, T arg)
+ public <T> T invokeProvider(Packet p, T arg)
{
- Object targetBean = resolver.resolve(p);
+ Object targetBean = this.resolver.resolve(p);
return ((Provider<T>)targetBean).invoke(arg);
}
@Override
- public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException
+ public Object invoke(Packet p, Method m, Object... args)
+ throws InvocationTargetException, IllegalAccessException
{
- Endpoint ep = EndpointAssociation.getEndpoint();
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ InvocationHandler invocationHandler = endpoint.getInvocationHandler();
+ Invocation invocation = invocationHandler.createInvocation();
+ invocation.getInvocationContext().addAttachment(MessageContext.class, this.webServiceCtx.getMessageContext());
+ invocation.setJavaMethod(m);
+ invocation.setArgs(args);
- InvocationHandler invHandler = ep.getInvocationHandler();
- Invocation inv = invHandler.createInvocation();
-
- inv.getInvocationContext().addAttachment(MessageContext.class, wsc.getMessageContext());
-
- inv.setJavaMethod(m);
- inv.setArgs(args);
-
Object retObj = null;
try
{
- invHandler.invoke(ep, inv);
- retObj = inv.getReturnValue();
+ invocationHandler.invoke(endpoint, invocation);
+ retObj = invocation.getReturnValue();
}
catch (Exception ex)
{
@@ -106,7 +102,8 @@
return retObj;
}
- private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException
+ private void handleException(Exception ex)
+ throws InvocationTargetException, IllegalAccessException
{
if (ex instanceof InvocationTargetException)
throw (InvocationTargetException)ex;
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-25 10:58:15 UTC (rev 6685)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-25 11:01:10 UTC (rev 6686)
@@ -35,7 +35,6 @@
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
-import com.sun.istack.NotNull;
import com.sun.xml.ws.api.message.Packet;
import com.sun.xml.ws.api.server.InstanceResolver;
import com.sun.xml.ws.api.server.Invoker;
@@ -58,11 +57,9 @@
}
@Override
- public void start(@NotNull
- WSWebServiceContext wsc, @NotNull
- WSEndpoint endpoint)
+ public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
{
- resolver.start(wsc, endpoint);
+ resolver.start(webServiceCtx, endpoint);
}
@Override
@@ -72,34 +69,30 @@
}
@Override
- public <T> T invokeProvider(@NotNull
- Packet p, T arg)
+ public <T> T invokeProvider(Packet p, T arg)
{
Object targetBean = resolver.resolve(p);
return ((Provider<T>)targetBean).invoke(arg);
}
@Override
- public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException
+ public Object invoke(Packet p, Method m, Object... args)
+ throws InvocationTargetException, IllegalAccessException
{
- Endpoint ep = EndpointAssociation.getEndpoint();
- if(null == ep)
- throw new IllegalArgumentException("EndpointAssociation.getEndpoint() may not be null");
-
- InvocationHandler invHandler = ep.getInvocationHandler();
-
- Invocation inv = invHandler.createInvocation();
- InvocationContext invContext = inv.getInvocationContext();
- inv.setJavaMethod(m);
- inv.setArgs(args);
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ InvocationHandler invocationHandler = endpoint.getInvocationHandler();
+ Invocation invocation = invocationHandler.createInvocation();
+ InvocationContext invContext = invocation.getInvocationContext();
+ invocation.setJavaMethod(m);
+ invocation.setArgs(args);
Object retObj = null;
try
{
Object targetBean = resolver.resolve(p);
invContext.setTargetBean(targetBean);
- invHandler.invoke(ep, inv);
- retObj = inv.getReturnValue();
+ invocationHandler.invoke(endpoint, invocation);
+ retObj = invocation.getReturnValue();
}
catch (Exception ex)
{
@@ -109,7 +102,8 @@
return retObj;
}
- private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException
+ private void handleException(Exception ex)
+ throws InvocationTargetException, IllegalAccessException
{
if (ex instanceof InvocationTargetException)
throw (InvocationTargetException)ex;
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-25 10:58:15 UTC (rev 6685)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-25 11:01:10 UTC (rev 6686)
@@ -36,45 +36,56 @@
/**
* @author Heiko Braun
*/
-public class MessageStreamAdapter extends Adapter<MessageStreamAdapter.StreamToolkit> {
-
- final String name;
-
- public MessageStreamAdapter(String name, WSEndpoint endpoint)
+public class MessageStreamAdapter extends Adapter<MessageStreamAdapter.StreamToolkit>
+{
+ public static final AdapterFactory<MessageStreamAdapter> FACTORY = new AdapterFactory<MessageStreamAdapter>()
{
+ public MessageStreamAdapter createAdapter(String name, String urlPattern, WSEndpoint<?> endpoint)
+ {
+ return new MessageStreamAdapter(endpoint);
+ }
+ };
+
+ public MessageStreamAdapter(WSEndpoint endpoint)
+ {
super(endpoint);
- this.name = name;
}
- public void handle(MessageStreamContext context, InputStream in, OutputStream out) throws IOException
+ public void handle(MessageStreamContext context, InputStream in, OutputStream out)
+ throws IOException
{
MessageStreamConnectionImpl connection = new MessageStreamConnectionImpl(context, in, out);
StreamToolkit tk = pool.take();
- try {
+ try
+ {
tk.handle(connection);
connection.flush();
- } finally {
+ }
+ finally
+ {
pool.recycle(tk);
connection.close();
}
}
- protected StreamToolkit createToolkit() {
+ protected StreamToolkit createToolkit()
+ {
return new StreamToolkit();
}
- class StreamToolkit extends Adapter.Toolkit implements TransportBackChannel {
-
+ class StreamToolkit extends Adapter.Toolkit implements TransportBackChannel
+ {
private MessageStreamConnectionImpl connection;
- private void handle(MessageStreamConnectionImpl connection) throws IOException {
+ private void handle(MessageStreamConnectionImpl connection)
+ throws IOException
+ {
this.connection = connection;
String contentTypeStr = connection.getRequestHeader(MessageStreamContext.CONTENT_TYPE);
InputStream in = connection.getInputStream();
Packet packet = new Packet();
-
codec.decode(in, contentTypeStr, packet);
try
@@ -84,7 +95,7 @@
catch(Exception e)
{
e.printStackTrace();
- writeInternalServerError(connection);
+ connection.setStatus(MessageStreamContext.STATUS_INTERNAL_SERVER_ERROR);
return;
}
@@ -98,27 +109,13 @@
Map<String, String> headers = new HashMap();
headers.put(MessageStreamContext.CONTENT_TYPE, contentTypeStr);
connection.setResponseHeaders(headers);
-
codec.encode(packet, connection.getOutputStream());
}
-
}
- private void writeInternalServerError(MessageStreamConnectionImpl connection) {
- connection.setStatus(MessageStreamContext.STATUS_INTERNAL_SERVER_ERROR);
- }
-
- public void close() {
+ public void close()
+ {
connection.close();
}
-
}
-
- public static final AdapterFactory<MessageStreamAdapter> FACTORY = new AdapterFactory<MessageStreamAdapter>()
- {
- public MessageStreamAdapter createAdapter(String name, String urlPattern, WSEndpoint<?> endpoint)
- {
- return new MessageStreamAdapter(name, endpoint);
- }
- };
}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-25 10:58:15 UTC (rev 6685)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-25 11:01:10 UTC (rev 6686)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.stack.metro;
-import com.sun.istack.NotNull;
import com.sun.xml.ws.api.message.Packet;
import com.sun.xml.ws.api.server.WSEndpoint;
import com.sun.xml.ws.api.server.WebServiceContextDelegate;
@@ -36,92 +35,104 @@
/**
* @author Heiko Braun
*/
-public class MessageStreamConnectionImpl implements WebServiceContextDelegate {
-
- private MessageStreamContext messageContext;
+public class MessageStreamConnectionImpl implements WebServiceContextDelegate
+{
+ private int status;
+ private boolean isClosed;
private InputStream inputStream;
private OutputStream outputStream;
-
- private int status;
-
- private boolean isClosed;
-
- private Map<String, String> requestHeaders;
+ private MessageStreamContext messageContext;
+ private Map<String, String> requestHeaders = new HashMap<String, String>();
private Map<String, String> responseHeaders;
public MessageStreamConnectionImpl(MessageStreamContext context, InputStream in, OutputStream out)
{
- outputStream = out;
- inputStream = in;
- messageContext = context;
-
+ this.outputStream = out;
+ this.inputStream = in;
+ this.messageContext = context;
populateRequestHeaders();
}
- public int getStatus() {
- return status;
+ public int getStatus()
+ {
+ return this.status;
}
- public void setStatus(int statusCode) {
+ public void setStatus(int statusCode)
+ {
this.status = statusCode;
}
- public Map<String, String> getRequestHeaders() {
- return requestHeaders;
+ public Map<String, String> getRequestHeaders()
+ {
+ return this.requestHeaders;
}
- public void setRequestHeaders(Map<String, String> requestHeaders) {
+ public void setRequestHeaders(Map<String, String> requestHeaders)
+ {
this.requestHeaders = requestHeaders;
}
- public String getRequestHeader(String name) {
- return requestHeaders.get(name);
+ public String getRequestHeader(String name)
+ {
+ return this.requestHeaders.get(name);
}
- public Map<String, String> getResponseHeaders() {
- return responseHeaders;
+ public Map<String, String> getResponseHeaders()
+ {
+ return this.responseHeaders;
}
- public void setResponseHeaders(Map<String, String> responseHeaders) {
+ public void setResponseHeaders(Map<String, String> responseHeaders)
+ {
this.responseHeaders = responseHeaders;
}
- public InputStream getInputStream() {
- return inputStream;
+ public InputStream getInputStream()
+ {
+ return this.inputStream;
}
- public OutputStream getOutputStream() {
- return outputStream;
+ public OutputStream getOutputStream()
+ {
+ return this.outputStream;
}
- public void closeInput() {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException ex) {
+ public void closeInput()
+ {
+ if (this.inputStream != null)
+ {
+ try
+ {
+ this.inputStream.close();
}
-
- inputStream = null;
+ catch (IOException ignore) {}
+ this.inputStream = null;
}
}
- public void closeOutput() {
- if (outputStream != null) {
- try {
- outputStream.close();
- } catch (IOException ex) {
+ public void closeOutput()
+ {
+ if (this.outputStream != null)
+ {
+ try
+ {
+ this.outputStream.close();
}
-
- outputStream = null;
+ catch (IOException ignore) {}
+ this.outputStream = null;
}
}
- public void close() {
- if (!isClosed) {
- synchronized (this) {
- if (!isClosed) {
- isClosed = true;
-
+ public void close()
+ {
+ if (this.isClosed == false)
+ {
+ synchronized (this)
+ {
+ if (this.isClosed == false)
+ {
+ this.isClosed = true;
closeInput();
closeOutput();
}
@@ -129,36 +140,42 @@
}
}
- // Not supported
- public Principal getUserPrincipal(Packet request) {
- return null;
+ public void flush()
+ throws IOException
+ {
+ if (this.outputStream != null)
+ {
+ this.outputStream.flush();
+ }
}
- // Not supported
- public boolean isUserInRole(Packet request, String role) {
- return false;
+ public Principal getUserPrincipal(Packet request)
+ {
+ throw new UnsupportedOperationException();
}
- public @NotNull String getEPRAddress(@NotNull Packet request, @NotNull WSEndpoint endpoint) {
- return null;
+ public boolean isUserInRole(Packet request, String role)
+ {
+ throw new UnsupportedOperationException();
}
- public String getWSDLAddress(@NotNull Packet request, @NotNull WSEndpoint endpoint) {
- return null;
+ @SuppressWarnings("unchecked")
+ public String getEPRAddress(Packet request, WSEndpoint endpoint)
+ {
+ throw new UnsupportedOperationException();
}
- public void flush() throws IOException {
- if (outputStream != null) {
- outputStream.flush();
- }
+ @SuppressWarnings("unchecked")
+ public String getWSDLAddress(Packet request, WSEndpoint endpoint)
+ {
+ throw new UnsupportedOperationException();
}
- private void populateRequestHeaders() {
- requestHeaders = new HashMap();
-
- for(String s : messageContext.getRequestContext().keySet())
+ private void populateRequestHeaders()
+ {
+ for(String s : this.messageContext.getRequestContext().keySet())
{
- requestHeaders.put(s, messageContext.getRequestContext().get(s));
+ this.requestHeaders.put(s, this.messageContext.getRequestContext().get(s));
}
}
}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-25 10:58:15 UTC (rev 6685)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-25 11:01:10 UTC (rev 6686)
@@ -33,11 +33,13 @@
import javax.xml.ws.BindingType;
import javax.xml.ws.soap.SOAPBinding;
+
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
/**
- * A deployer that generates sun-jaxws.xml
+ * An aspect that generates sun-jaxws.xml
*
* @author Thomas.Diesler(a)jboss.org
* @since 10-May-2007
@@ -45,45 +47,36 @@
public class SunJaxwsDeploymentAspect extends DeploymentAspect
{
@Override
+ @SuppressWarnings("unchecked")
public void create(Deployment dep, WSFRuntime runtime)
{
-
- DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
- if (dd == null)
+ DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
+ if (ddEndpoints == null)
{
- dd = new DDEndpoints();
- for (Endpoint ep : dep.getService().getEndpoints())
+ ddEndpoints = new DDEndpoints();
+ for (Endpoint endpoint : dep.getService().getEndpoints())
{
- String epName = ep.getShortName();
- String targetBean = ep.getTargetBeanName();
- String urlPattern = ep.getURLPattern();
+ String endpointName = endpoint.getShortName();
+ String targetBean = endpoint.getTargetBeanName();
+ String urlPattern = endpoint.getURLPattern();
- DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern);
-
- Class beanClass = ep.getTargetBeanClass();
- BindingType anBindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
- if (anBindingType != null && anBindingType.value().length() > 0)
+ DDEndpoint ddEndpoint = new DDEndpoint(endpointName, targetBean, urlPattern);
+ Class beanClass = endpoint.getTargetBeanClass();
+ BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
+
+ if (bindingType != null && bindingType.value().length() > 0)
{
- String binding = anBindingType.value();
- ddep.setBinding(binding);
- if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING))
- ddep.setEnableMTOM(true);
+ String binding = bindingType.value();
+ ddEndpoint.setBinding(binding);
+ ddEndpoint.setEnableMTOM(isMtomEnabled(binding));
}
- log.info("Add " + ddep);
- dd.addEndpoint(ddep);
+ log.info("Add " + ddEndpoint);
+ ddEndpoints.addEndpoint(ddEndpoint);
}
- dep.addAttachment(DDEndpoints.class, dd);
-
- String propKey = "org.jboss.ws.webapp.ContextParameterMap";
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
- if (contextParams == null)
- {
- contextParams = new HashMap<String, String>();
- dep.setProperty(propKey, contextParams);
- }
- contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, dd.createFileURL().toExternalForm());
+ dep.addAttachment(DDEndpoints.class, ddEndpoints);
+ putSunJaxwsConfigToDeployment(dep, ddEndpoints.createFileURL());
}
}
@@ -96,4 +89,29 @@
dd.destroyFileURL();
}
}
+
+ /**
+ * Puts SUN JAX-WS config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map
+ * @param dep deployment where to put
+ * @param dd beans to be put
+ */
+ private static void putSunJaxwsConfigToDeployment(Deployment dep, URL jaxwsConfigURL)
+ {
+ // get property map
+ String propKey = "org.jboss.ws.webapp.ContextParameterMap";
+ Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
+ if (contextParams == null)
+ {
+ // if there's no associated map with the property create it now
+ contextParams = new HashMap<String, String>();
+ dep.setProperty(propKey, contextParams);
+ }
+ // put sun jaxws config URL to the property map
+ contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, jaxwsConfigURL.toExternalForm());
+ }
+
+ private static boolean isMtomEnabled(String binding)
+ {
+ return binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ }
}
\ No newline at end of file
18 years
- 1
- 0
JBossWS SVN: r6685 - in container/jboss50/branches/jbossws-jboss501: src/main/etc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 06:58:15 -0400 (Fri, 25 Apr 2008)
New Revision: 6685
Added:
container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml
Modified:
container/jboss50/branches/jbossws-jboss501/.classpath
container/jboss50/branches/jbossws-jboss501/pom.xml
container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml
container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml
container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
Log:
Add container.jar
Modified: container/jboss50/branches/jbossws-jboss501/.classpath
===================================================================
--- container/jboss50/branches/jbossws-jboss501/.classpath 2008-04-25 10:38:00 UTC (rev 6684)
+++ container/jboss50/branches/jbossws-jboss501/.classpath 2008-04-25 10:58:15 UTC (rev 6685)
@@ -1,15 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="lib" path="output/lib/jbossws-jboss50-container.jar"/>
- <classpathentry kind="lib" path="output/lib/jbossws-jboss50.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-jaxrpc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-jaxws.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-saaj.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-framework.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 10:38:00 UTC (rev 6684)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 10:58:15 UTC (rev 6685)
@@ -101,9 +101,6 @@
<directory>src/main/etc</directory>
<filtering>true</filtering>
</resource>
- <resource>
- <directory>src/main/resources/jbossws-jboss50.jar</directory>
- </resource>
</resources>
<plugins>
<plugin>
@@ -135,6 +132,7 @@
</goals>
<configuration>
<descriptors>
+ <descriptor>src/main/scripts/assembly-container.xml</descriptor>
<descriptor>src/main/scripts/assembly-resources.xml</descriptor>
</descriptors>
</configuration>
Modified: container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml 2008-04-25 10:38:00 UTC (rev 6684)
+++ container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml 2008-04-25 10:58:15 UTC (rev 6685)
@@ -1,26 +1,24 @@
-<project name="jboss/jbossws-jboss50">
+<project name="jboss/jbossws-jboss501">
- <component id="jboss/jbossws-jboss50"
+ <component id="jboss/jbossws-jboss501"
description="JBossWS container integration layer"
- version="@repository.id@"
+ version="${version}"
licenseType="lgpl">
- <artifact id="jbossws-jboss50.jar"/>
- <artifact id="jbossws-jboss50-deployer.zip"/>
- <artifact id="jbossws-jboss50-src.zip"/>
+ <artifact id="jbossws-jboss501.jar"/>
+ <artifact id="jbossws-jboss501-container.jar"/>
+ <artifact id="jbossws-jboss501-resources.zip"/>
+ <artifact id="jbossws-jboss501-src.jar"/>
<import componentref="jboss/jbossws-common">
- <compatible version="@jbossws-common@"/>
+ <compatible version="${jbossws.common.version}"/>
</import>
- <import componentref="jboss/jbossws-framework">
- <compatible version="@jbossws-framework@"/>
- </import>
<import componentref="jboss/jbossws-spi">
- <compatible version="@jbossws-spi@"/>
+ <compatible version="${jbossws.spi.version}"/>
</import>
<export>
- <include input="jbossws-jboss50.jar"/>
+ <include input="jbossws-jboss501.jar"/>
</export>
</component>
Modified: container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-04-25 10:38:00 UTC (rev 6684)
+++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-04-25 10:58:15 UTC (rev 6685)
@@ -53,6 +53,7 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/${artifact.id}/${repository.id}"/>
<mkdir dir="${jboss.repository.dir}/lib"/>
<copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/${artifact.id}-${version.id}-container.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-container.jar" overwrite="true"/>
<copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-src.jar" overwrite="true"/>
<copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/${artifact.id}-resources.zip" overwrite="true"/>
<copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
Added: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml 2008-04-25 10:58:15 UTC (rev 6685)
@@ -0,0 +1,14 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>container</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/jbossws-jboss50-container.jar</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-container.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 10:38:00 UTC (rev 6684)
+++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 10:58:15 UTC (rev 6685)
@@ -9,6 +9,10 @@
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossws-jboss50.deployer/**</include>
+ <include>jbossws-jboss50.jar/**</include>
+ </includes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
18 years
- 1
- 0
JBossWS SVN: r6684 - in container/jboss50/branches/jbossws-jboss501: src and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 06:38:00 -0400 (Fri, 25 Apr 2008)
New Revision: 6684
Removed:
container/jboss50/branches/jbossws-jboss501/THIS-IS-3.0
container/jboss50/branches/jbossws-jboss501/ant-import/
container/jboss50/branches/jbossws-jboss501/ant.properties.example
container/jboss50/branches/jbossws-jboss501/build-as.xml
container/jboss50/branches/jbossws-jboss501/build.xml
container/jboss50/branches/jbossws-jboss501/src/assembly/
container/jboss50/branches/jbossws-jboss501/version.properties
container/jboss50/branches/jbossws-jboss501/version.properties.md5
Modified:
container/jboss50/branches/jbossws-jboss501/pom.xml
container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
Log:
Switch build to maven
Deleted: container/jboss50/branches/jbossws-jboss501/THIS-IS-3.0
===================================================================
Deleted: container/jboss50/branches/jbossws-jboss501/ant.properties.example
===================================================================
--- container/jboss50/branches/jbossws-jboss501/ant.properties.example 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/ant.properties.example 2008-04-25 10:38:00 UTC (rev 6684)
@@ -1,26 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# JBoss Home
-jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-
-# The JBoss settings
-jboss.server.instance=default
-
-# JBoss Repository
-jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-#jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
Deleted: container/jboss50/branches/jbossws-jboss501/build-as.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/build-as.xml 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/build-as.xml 2008-04-25 10:38:00 UTC (rev 6684)
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" name="JBoss/Webservices">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
-
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
-
- <target name="configure" unless="configure.disable">
-
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="webservices"/>
- <property name="module.Name" value="JBossWS Container Integration"/>
- <property name="module.version" value="DEV"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <!-- The combined library classpath -->
- <!--path id="library.classpath">
- <path refid="apache.xerces.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.jboss.ejb3.core.classpath" />
- <path refid="jboss.jboss.ejb3.ext.api.classpath" />
- <path refid="jboss.jboss.ejb3.interceptors.classpath" />
- <path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.jboss.security.spi.classpath"/>
- <path refid="jboss.jboss.vfs.classpath"/>
- <path refid="jboss.jbosssx.classpath"/>
- <path refid="jboss.jbossws.classpath"/>
- <path refid="jboss.jbossws.common.classpath"/>
- <path refid="jboss.jbossws.framework.classpath"/>
- <path refid="jboss.jbossws.spi.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.metadata.classpath"/>
- <path refid="jboss.jboss.deployers.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="sun.jaxb.classpath"/>
- <path refid="sun.servlet.classpath"/>
- </path-->
-
-
- <!-- The combined dependant module classpath -->
- <!--path id="dependentmodule.classpath">
- <path refid="jboss.aspects.classpath"/>
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.jmx.classpath"/>
- <path refid="jboss.server.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.tomcat.classpath"/>
- </path-->
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <property name="jar.prefix" value="jbossws-jboss50"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
-
- <call target="_default:task-init"/>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes,
- _default:compile-resources,
- _default:compile-etc"/>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars" depends="compile">
-
- <!-- Concat jbossws-beans.xml -->
- <concat destfile="${build.resources}/jbossws-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${jboss.jbossws.resources}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-jboss50.jar -->
- <jar jarfile="${build.lib}/jbossws-jboss50.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}" />
- <metainf dir="${build.resources}/jbossws-jboss50.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-native50.deployer -->
- <zip zipfile="${build.lib}/jbossws-jboss50-deployer.zip">
- <fileset dir="${build.lib}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossws.common.lib}">
- <include name="jbossws-common.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossws.framework.lib}">
- <include name="jbossws-framework.jar"/>
- </fileset>
- <fileset dir="${build.resources}/jbossws-jboss50.deployer">
- <include name="META-INF/jbossws-deployer-beans.xml"/>
- </fileset>
- </zip>
-
- <!-- Build jbossws.sar -->
- <jar jarfile="${build.lib}/jbossws.sar">
- <fileset dir="${jboss.jbossws.lib}">
- <include name="jbossws-core.jar"/>
- </fileset>
- <fileset dir="${wscommons.policy.lib}">
- <include name="policy.jar"/>
- </fileset>
- <fileset dir="${ibm.wsdl4j.lib}">
- <include name="wsdl4j.jar"/>
- </fileset>
- <fileset dir="${apache.xmlsec.lib}">
- <include name="xmlsec.jar"/>
- </fileset>
- <fileset dir="${jboss.jaxbintros.lib}">
- <include name="jboss-jaxb-intros.jar"/>
- </fileset>
- <metainf dir="${jboss.jbossws.resources}">
- <include name="standard-*-config.xml"/>
- </metainf>
- <metainf dir="${build.resources}">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jboss50-container.jar -->
- <jar jarfile="${build.lib}/jbossws-jboss50-container.jar">
- <metainf dir="${build.resources}/jbossws-jboss50-container.jar/META-INF">
- <include name="jbossws-container-beans.xml"/>
- </metainf>
- </jar>
-
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="deploy" depends="main,module-jars">
-
-
- <!-- Build jbossws-native50.deployer -->
- <unzip dest="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer"
- src="${build.lib}/jbossws-jboss50-deployer.zip">
- </unzip>
-
- <copy todir="../build/output/jboss-${specification.version}/server/default/deploy">
- <fileset dir="${build.lib}">
- <include name="jbossws-jboss50-container.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
Deleted: container/jboss50/branches/jbossws-jboss501/build.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/build.xml 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/build.xml 2008-04-25 10:38:00 UTC (rev 6684)
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS-JBoss50">
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="jbws50.dir" value="${int.jboss50.dir}"/>
- <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/>
- <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/>
- <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/>
- <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/>
- <property name="jbws50.output.dir" value="${jbws50.dir}/output"/>
- <property name="jbws50.output.apidocs.dir" value="${jbws50.output.dir}/apidocs"/>
- <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/>
- <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/>
- <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty-get">
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
-
- <!-- Compile integration java sources -->
- <target name="compile-classes" depends="init">
- <mkdir dir="${jbws50.output.classes.dir}"/>
- <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/**"/>
- <include name="org/jboss/wsf/container/jboss50/**"/>
- <exclude name="org/jboss/wsf/container/jboss50/jms/**"/>
- <classpath refid="jbws50.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${jbws50.output.etc.dir}"/>
- <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${jbws50.etc.dir}">
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${jbws50.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars" depends="init">
-
- <!-- Build jbossws-jboss50.jar -->
- <mkdir dir="${jbws50.output.lib.dir}"/>
- <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jbws50.output.etc.dir}/default.mf">
- <fileset dir="${jbws50.output.classes.dir}">
- <include name="org/jboss/ws/integration/**"/>
- <include name="org/jboss/wsf/container/jboss50/**"/>
- </fileset>
- <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-jboss50-resources.zip -->
- <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-resources.zip" >
- <fileset dir="${jbws50.resources.dir}"/>
- </zip>
-
- <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-deployer-resources.zip">
- <fileset dir="${jbws50.resources.dir}/jbossws-jboss50.deployer/META-INF">
- <include name="jbossws-deployer-beans.xml"/>
- </fileset>
- </zip>
- <!-- Build jbossws-jboss50-src.zip -->
- <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-src.zip" >
- <fileset dir="${jbws50.java.dir}"/>
- </zip>
-
- <!-- jbossws-jboss50-container.jar -->
- <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50-container.jar">
- <metainf dir="${jbws50.resources.dir}/jbossws-jboss50-container.jar/META-INF">
- <include name="jbossws-container-beans.xml"/>
- </metainf>
- </jar>
-
- </target>
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc">
-
- <mkdir dir="${jbws50.output.apidocs.dir}"/>
- <javadoc destdir="${jbws50.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <path refid="jbws50.integration.classpath"/>
- </classpath>
- <packageset dir="${jbws50.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${jbws50.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${jbws50.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars"/>
-
- <target name="all" description="Create a distribution zip file" depends="main">
- </target>
-
-</project>
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 10:38:00 UTC (rev 6684)
@@ -10,9 +10,9 @@
<!-- Parent -->
<parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
@@ -22,9 +22,29 @@
<jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
</properties>
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>${jboss.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- Dependencies -->
<dependencies>
+ <!-- FIXME: Remove this dependency -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </dependency>
+
<!-- jbossws dependencies -->
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -39,6 +59,13 @@
<!-- provided apis -->
+ <!-- jboss dependencies -->
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+
<!-- jboss thirdparty dependencies -->
<dependency>
<groupId>org.jboss</groupId>
@@ -56,6 +83,14 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
</dependencies>
<!-- Plugins -->
Modified: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-25 10:38:00 UTC (rev 6684)
@@ -9,10 +9,6 @@
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossws-jboss42.sar/**</include>
- <include>jbossws-jboss42-config.xml</include>
- </includes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Deleted: container/jboss50/branches/jbossws-jboss501/version.properties
===================================================================
--- container/jboss50/branches/jbossws-jboss501/version.properties 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/version.properties 2008-04-25 10:38:00 UTC (rev 6684)
@@ -1,44 +0,0 @@
-
-# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-3.0
-
-version.id=5.0.1.DEV
-repository.id=5.0.1.DEV
-
-implementation.title=JBoss Web Services - Integration JBoss42
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Dependend integration projects
-jbossws=snapshot
-jbossws-spi=3.0.0-SNAPSHOT
-jbossws-common=snapshot
-jbossws-framework=3.0.2-SNAPSHOT
-
-# JBossAS-5.0
-jboss-jbossxb-jboss50=2.0.0.CR5
-jboss-remoting-jboss50=2.4.0.Beta2
-
-# Thirdparty library versions
-apache-xerces=2.9.0
-dom4j=1.6.1
-
-jboss-common-core=2.2.3.GA
-jboss-common-logging-log4j=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3
-jboss-jaxbintros=1.0.0.beta2
-
-jboss-microcontainer=2.0.0.Beta11
-jboss-reflect=2.0.0.Beta12
-jboss-mdr=2.0.0.Beta12
-
-jboss-security=4.0.5.GA
-jboss-vfs=2.0.0.Beta2
-jbossas-core-libs=4.2.0.GA
-
-sun-servlet=2.4
Deleted: container/jboss50/branches/jbossws-jboss501/version.properties.md5
===================================================================
--- container/jboss50/branches/jbossws-jboss501/version.properties.md5 2008-04-25 09:58:15 UTC (rev 6683)
+++ container/jboss50/branches/jbossws-jboss501/version.properties.md5 2008-04-25 10:38:00 UTC (rev 6684)
@@ -1 +0,0 @@
-fbfda5f69d542401d6ca5854decba9cb
18 years
- 1
- 0
JBossWS SVN: r6683 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 05:58:15 -0400 (Fri, 25 Apr 2008)
New Revision: 6683
Modified:
stack/native/trunk/ant-import/build-thirdparty.xml
Log:
Revome thirdparty-get dependecy on integration.target
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 09:40:52 UTC (rev 6682)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 09:58:15 UTC (rev 6683)
@@ -48,15 +48,7 @@
thirdpartry-get
-->
- <target name="get501-jars" if="jbossws.integration.jboss501">
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/>
- </target>
-
- <target name="thirdparty-get" depends="thirdparty-delete,get501-jars" if="force.thirdparty"
+ <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty"
description="Gets the thirdparty libraries">
<!--
@@ -82,6 +74,10 @@
<get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423.jar" dest="${thirdparty.dir}/jbossws-jboss423.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-src.jar" dest="${thirdparty.dir}/jbossws-jboss423-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-resources.zip" dest="${thirdparty.dir}/jbossws-jboss423-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
18 years
- 1
- 0
JBossWS SVN: r6682 - in stack/native/trunk: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 05:40:52 -0400 (Fri, 25 Apr 2008)
New Revision: 6682
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-prepare-deploy.xml
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
stack/native/trunk/build.xml
stack/native/trunk/version.properties
Log:
Switch to jbossws-jboss42x-3.0.0-SNAPSHOT
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -21,8 +21,9 @@
<delete dir="${deploy.structure.jboss42}"/>
<antcall target="deploy-jbossws-native42" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
- <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
+ <param name="resourcesdir" value="${deploy.artifacts.dir}/resources"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="jbossid" value="${deploy.target}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
</target>
@@ -30,6 +31,10 @@
<!-- ================================================================== -->
<!-- Deployment JBoss421 -->
<!-- ================================================================== -->
+
+ <target name="deploy-target-jboss421" depends="prepare">
+ <property name="deploy.target" value="jboss421"/>
+ </target>
<target name="deploy-jboss421" depends="undeploy-jboss421,deploy-structure-jboss42" description="Deploy jbossws to jboss421">
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
@@ -58,7 +63,7 @@
</copy>
</target>
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
+ <target name="undeploy-jboss421" depends="deploy-target-jboss421" description="Remove jbossws from jboss421">
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
<macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete file="${jboss421.server.lib}/jbossws-integration.jar"/>
@@ -69,6 +74,10 @@
<!-- Deployment JBoss422 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss422" depends="prepare">
+ <property name="deploy.target" value="jboss422"/>
+ </target>
+
<target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<copy todir="${jboss422.home}" overwrite="true">
@@ -78,7 +87,7 @@
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <target name="undeploy-jboss422" depends="deploy-target-jboss422" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss422.server.deploy}/juddi-service.sar"/>
@@ -88,6 +97,10 @@
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss423" depends="prepare">
+ <property name="deploy.target" value="jboss423"/>
+ </target>
+
<target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<copy todir="${jboss423.home}" overwrite="true">
@@ -97,7 +110,7 @@
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <target name="undeploy-jboss423" depends="deploy-target-jboss423" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss423.server.deploy}/juddi-service.sar"/>
@@ -112,6 +125,7 @@
<antcall target="deploy-jbossws-native50" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="jbossid" value="${deploy.target}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/>
</target>
@@ -120,6 +134,10 @@
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss500" depends="prepare">
+ <property name="deploy.target" value="jboss500"/>
+ </target>
+
<target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
@@ -129,7 +147,7 @@
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
+ <target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
@@ -139,6 +157,10 @@
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss501" depends="prepare">
+ <property name="deploy.target" value="jboss501"/>
+ </target>
+
<target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
@@ -148,7 +170,7 @@
<chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
Modified: stack/native/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -32,7 +32,8 @@
<patternset refid="jbossws.service.lib.patternset"/>
<include name="jboss-xml-binding.jar"/>
<include name="jbossws-jboss421.jar"/>
- <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss422.jar"/>
+ <include name="jbossws-jboss423.jar"/>
<include name="jbossws-jboss50.jar"/>
<include name="jbossws-jboss50-container.jar"/>
<include name="juddi-service.sar"/>
@@ -49,9 +50,7 @@
<copy todir="${deploy.artifacts.dir}/resources">
<fileset dir="${core.output.resources.dir}">
<include name="standard-*-config.xml"/>
- <include name="jbossws-native42-beans.xml"/>
- <include name="jbossws-native50-beans.xml"/>
- <include name="jbossws-jboss42.sar/**"/>
+ <include name="jbossws-jboss*/**"/>
<include name="jbossws-deployer-beans.xml"/>
</fileset>
</copy>
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -48,20 +48,6 @@
thirdpartry-get
-->
- <target name="get422-jars" if="jbossws.integration.jboss422">
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
- </target>
-
- <target name="get423-jars" if="jbossws.integration.jboss423">
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
- </target>
-
<target name="get501-jars" if="jbossws.integration.jboss501">
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
@@ -70,7 +56,7 @@
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/>
</target>
- <target name="thirdparty-get" depends="thirdparty-delete, get422-jars, get423-jars, get501-jars" if="force.thirdparty"
+ <target name="thirdparty-get" depends="thirdparty-delete,get501-jars" if="force.thirdparty"
description="Gets the thirdparty libraries">
<!--
@@ -90,6 +76,12 @@
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.jar" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.jar" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422.jar" dest="${thirdparty.dir}/jbossws-jboss422.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422-src.jar" dest="${thirdparty.dir}/jbossws-jboss422-src.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422-resources.zip" dest="${thirdparty.dir}/jbossws-jboss422-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423.jar" dest="${thirdparty.dir}/jbossws-jboss423.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-src.jar" dest="${thirdparty.dir}/jbossws-jboss423-src.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-resources.zip" dest="${thirdparty.dir}/jbossws-jboss423-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -201,59 +201,50 @@
<macrodef name="macro-deploy-jbossws-client">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib">
+ <macrodef name="macro-deploy-jbossws-server-lib42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
- <macrodef name="macro-deploy-jbossws-server-lib42">
+
+ <macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss42.jar"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
@@ -262,6 +253,7 @@
<attribute name="thirdpartydir"/>
<attribute name="resourcesdir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
@@ -281,16 +273,16 @@
</unzip>
<copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native42-beans.xml"/>
+ <include name="**/jbossws-(a){jbossid}-beans.xml"/>
</fileset>
</copy>
- <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-native42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-(a){jbossid}-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<include name="**/standard-jaxrpc-*-config.xml"/>
<include name="**/standard-jaxws-*-config.xml"/>
</fileset>
- <fileset dir="@{resourcesdir}/META-INF"/>
+ <fileset dir="@{resourcesdir}/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
</copy>
</sequential>
</macrodef>
@@ -298,6 +290,7 @@
<macrodef name="macro-deploy-jbossws-native50-sar">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
@@ -315,7 +308,7 @@
<fileset dir="@{thirdpartydir}">
<include name="**/standard-jaxrpc-*-config.xml"/>
<include name="**/standard-jaxws-*-config.xml"/>
- <include name="**/jbossws-native50-beans.xml"/>
+ <include name="**/jbossws-(a){jbossid}-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -330,22 +323,20 @@
<target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/build.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -88,9 +88,9 @@
-->
<project default="main" basedir="." name="JBossWS-Native">
-
+
<property name="core.dir" value="${basedir}"/>
-
+
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
<import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
@@ -113,7 +113,7 @@
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
<property name="core.output.resources.dir" value="${core.output.dir}/resources"/>
-
+
<property name="deploy.artifacts.dir" value="${core.output.deploy.dir}-artifacts"/>
<property name="deploy.structure.jboss42" value="${core.output.deploy.dir}-jboss42"/>
<property name="deploy.structure.jboss50" value="${core.output.deploy.dir}-jboss50"/>
@@ -121,38 +121,37 @@
<target name="init" depends="prepare,thirdparty">
</target>
-
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
-
+
<!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc,compile-resources"
- description="Compile all source files."/>
-
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
+
<!-- Compile java sources -->
<target name="compile-classes" depends="init">
-
+
<!-- Compile interfaces with jdk1.4 -->
<mkdir dir="${core.output.classes14.dir}"/>
- <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
+ <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
<classpath refid="thirdparty.classpath"/>
</javac>
-
+
<!-- Compile core classes with jdk1.5 -->
<mkdir dir="${core.output.classes.dir}"/>
<javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="javax/annotation/**"/>
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
@@ -162,14 +161,14 @@
<classpath path="${core.output.classes14.dir}"/>
<classpath refid="thirdparty.classpath"/>
</javac>
-
+
<copy todir="${core.output.classes.dir}">
- <fileset dir="${core.java.dir}">
- <include name="**/*.xml"/>
- </fileset>
+ <fileset dir="${core.java.dir}">
+ <include name="**/*.xml"/>
+ </fileset>
</copy>
</target>
-
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${core.output.etc.dir}"/>
@@ -184,61 +183,70 @@
</filterset>
</copy>
</target>
-
- <!-- Compile resource files -->
- <target name="compile42-resources" if="jbossws.integration.jboss42">
- <mkdir dir="${core.output.resources.dir}"/>
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${core.output.resources.dir}/jbossws-native42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- </target>
-
-
- <target name="compile50-resources" if="jbossws.integration.jboss50">
- <mkdir dir="${core.output.resources.dir}"/>
- <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${core.output.resources.dir}"/>
-
- <!-- Concat jbossws-native50-beans.xml -->
- <concat destfile="${core.output.resources.dir}/jbossws-native50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
- </target>
-
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
- <mkdir dir="${core.output.resources.dir}"/>
- <copy todir="${core.output.resources.dir}">
- <fileset dir="${core.resources.dir}/standard-config">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
-
+
+ <!-- Compile resource files -->
+ <target name="compile42-resources">
+
+ <unzip dest="${core.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
+ <unzip dest="${core.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
+
+ <!-- Concat jbossws-jboss422-beans.xml -->
+ <concat destfile="${core.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <fileset file="${core.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss423-beans.xml -->
+ <concat destfile="${core.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <fileset file="${core.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
</target>
-
+
+ <target name="compile50-resources">
+
+ <unzip dest="${core.output.resources.dir}" src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip"/>
+
+ <!-- Concat jbossws-jboss501-beans.xml -->
+ <concat destfile="${core.output.resources.dir}/jbossws-jboss501-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+ </target>
+
+ <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
+ <mkdir dir="${core.output.resources.dir}"/>
+ <copy todir="${core.output.resources.dir}">
+ <fileset dir="${core.resources.dir}/standard-config">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
-
+
<!--
- | Build all jar files.
- -->
+ | Build all jar files.
+ -->
<target name="jars" depends="compile" description="Builds all jar files.">
-
+
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -246,7 +254,7 @@
<include name="javax/xml/rpc/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-saaj.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -255,7 +263,7 @@
</fileset>
<metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
-
+
<!-- Build jboss-jaxws.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -281,7 +289,7 @@
</fileset>
<metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
</jar>
-
+
<!-- Build jboss-jaxws-ext.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-jaxws-ext.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -301,10 +309,11 @@
<include name="javax/xml/ws/soap/Addressing.class"/>
<include name="javax/xml/ws/soap/MTOM.class"/>
<include name="javax/xml/ws/soap/MTOMFeature.class"/>
- <include name="javax/xml/ws/wsaddressing/**"/> </fileset>
+ <include name="javax/xml/ws/wsaddressing/**"/>
+ </fileset>
<metainf dir="${core.resources.dir}/jboss-jaxws-ext.jar/META-INF"/>
</jar>
-
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -320,24 +329,23 @@
</fileset>
<metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
</jar>
-
- <!-- Build jbossws-embedded.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jbossws-embedded.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/wsf/stack/jbws/embedded/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/>
- </jar>
-
-
- <!-- Build jbossws-client.jar -->
+
+ <!-- Build jbossws-embedded.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jbossws-embedded.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/jbws/embedded/**"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-client.jar -->
<jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf">
<fileset dir="${core.output.classes.dir}">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/wsf/stack/jbws/embedded/**"/>
-
+
<!-- JAX-WS 2.1 extensions -->
<include name="javax/xml/ws/**/*21.class"/>
<include name="javax/xml/ws/Action.class"/>
@@ -367,7 +375,7 @@
<metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
<metainf dir="${core.resources.dir}/standard-config"/>
</jar>
-
+
<!-- Build jbossws-context.war -->
<copy todir="${core.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
<fileset dir="${core.resources.dir}/jbossws-context.war"/>
@@ -377,8 +385,7 @@
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
- <war warfile="${core.output.lib.dir}/jbossws-context.war"
- webxml="${core.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
+ <war warfile="${core.output.lib.dir}/jbossws-context.war" webxml="${core.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
manifest="${core.output.etc.dir}/default.mf">
<fileset dir="${core.output.resources.dir}/jbossws-context.war">
<include name="index.html"/>
@@ -388,9 +395,9 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
+
<!-- Build jbossws-core-scripts.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" >
+ <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip">
<fileset dir="${core.output.etc.dir}">
<include name="wsrunclient.bat"/>
<include name="wstools.bat"/>
@@ -400,28 +407,29 @@
<include name="wstools.sh"/>
</zipfileset>
</zip>
-
+
<!-- Build jbossws-core-src.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" >
+ <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip">
<fileset dir="${core.java.dir}"/>
</zip>
-
+
</target>
-
+
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
-
+
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
-
+
<mkdir dir="${core.output.apidocs.dir}"/>
<javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath refid="thirdparty.classpath"/>
<packageset dir="${core.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
</packageset>
- <doctitle><![CDATA[<h1>JBossWS Native</h1>]]></doctitle>
+ <doctitle><![CDATA[<h1>JBossWS Native</h1>]]>
+ </doctitle>
<tag name="todo" scope="all" description="To do:"/>
<group title="Core" packages="org.jboss.ws.core*"/>
<group title="Metadata" packages="org.jboss.ws.metadata*"/>
@@ -430,20 +438,20 @@
<group title="Tools" packages="org.jboss.ws.tools*"/>
</javadoc>
</target>
-
+
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${core.output.dir}"/>
</target>
-
+
<target name="clobber" depends="clean" description="Cleans up all generated files.">
<delete dir="${core.dir}/thirdparty"/>
</target>
-
+
<target name="main" description="Executes the default target (most)." depends="most"/>
-
+
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
+
<target name="all" description="Create a distribution zip file" depends="most">
</target>
-
+
</project>
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/version.properties 2008-04-25 09:40:52 UTC (rev 6682)
@@ -28,8 +28,8 @@
jbossws-common=3.0.0-SNAPSHOT
jbossws-framework=3.0.2-SNAPSHOT
-jbossws-jboss422=4.2.2.DEV
-jbossws-jboss423=4.2.3.DEV
+jbossws-jboss422=3.0.0-SNAPSHOT
+jbossws-jboss423=3.0.0-SNAPSHOT
jbossws-jboss501=5.0.1.DEV
# JBossAS-5.0
18 years
- 1
- 0
JBossWS SVN: r6681 - stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-25 05:07:01 -0400 (Fri, 25 Apr 2008)
New Revision: 6681
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
Log:
refactoring + added javadoc, no functional change
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-25 09:04:23 UTC (rev 6680)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-25 09:07:01 UTC (rev 6681)
@@ -27,11 +27,10 @@
/**
* @author Heiko Braun
*/
-public class MessageStreamContext
+class MessageStreamContext
{
-
public static final int STATUS_INTERNAL_SERVER_ERROR = 500;
- public final static String CONTENT_TYPE = "Content-Type";
+ public static final String CONTENT_TYPE = "Content-Type";
private Map<String, String> requestContext = new HashMap<String, String>();
private Map<String, String> responseContext = new HashMap<String, String>();
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-25 09:04:23 UTC (rev 6680)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-25 09:07:01 UTC (rev 6681)
@@ -40,16 +40,17 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Writer;
+import java.util.Map;
import java.util.Properties;
import java.net.URL;
/**
- * A request handler
+ * Request handler that delegates to Metro's ServletAdapter.
*
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class RequestHandlerImpl implements RequestHandler
+class RequestHandlerImpl implements RequestHandler
{
// provide logging
private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
@@ -58,24 +59,33 @@
{
}
- public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
+ /**
+ * Handles HTTP requests. It supports <b>POST</b> and <b>GET</b> HTTP methods only.
+ * @param endpoint endpoint
+ * @param req servlet request to handle
+ * @param res servlet response to return
+ * @param servletCtx servlet context
+ * @throws ServletException when some problem occurs
+ * @throws IOException when some IO problem occurs
+ */
+ public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext servletCtx)
+ throws ServletException, IOException
{
ServletAdapter target = endpoint.getAttachment(ServletAdapter.class);
if(null == target)
- throw new IllegalArgumentException("Cannot obtain ServletAdapter");
+ throw new IllegalStateException("Cannot obtain ServletAdapter");
-
EndpointAssociation.setEndpoint(endpoint);
try
{
String method = req.getMethod();
if (method.equals("POST"))
{
- doPost(target, context, req, res);
+ doPost(target, servletCtx, req, res);
}
else if(method.equals("GET"))
{
- doGet(target, req, context, res);
+ doGet(target, req, servletCtx, res);
}
else
{
@@ -88,15 +98,99 @@
}
}
- private void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res)
- throws ServletException
+ /**
+ * The InvocationContext accepts a {@link Properties} attachment that can carry request properties.<br/>
+ * The properties keys are derived from {@link org.jboss.wsf.stack.metro.MessageStreamContext}
+ * @param endpoint endpoint
+ * @param inStream input stream
+ * @param outStream output stream
+ * @param invCtx invocation context
+ */
+ public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext invCtx)
{
- try {
+ MessageStreamAdapter adapter = endpoint.getAttachment(MessageStreamAdapter.class);
+ if (adapter == null)
+ throw new IllegalStateException("Cannot obtain: " + adapter.getClass().getName());
+ try
+ {
+ // Hacky, but the InvokerJSE requires it.
+ // It's better to do it here than outside the RequestHandler.
+ EndpointAssociation.setEndpoint(endpoint);
+
+ MessageStreamContext streamContext = new MessageStreamContext();
+ copyProperties(invCtx, streamContext);
+ adapter.handle(streamContext, inStream, outStream );
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Failed to process request: " + e.getMessage(), e);
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /**
+ * Handles HTTP get request. It obtains endpoint's address and constructs URL with <b>?wsdl</b> query string.
+ * The constructed URL is used to create the input stream to read WSDL content from and submited to the user.
+ * @param endpoint endpoint
+ * @param outStream output stream
+ * @param invCtx invocation context
+ */
+ public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext invCtx)
+ {
+ String endpointAddress = endpoint.getAddress();
+ if (endpointAddress == null)
+ throw new IllegalArgumentException("Invalid endpoint address: " + endpointAddress);
+
+ InputStream inStream = null;
+ try
+ {
+ URL wsdlUrl = new URL(endpointAddress + "?wsdl");
+ inStream = wsdlUrl.openStream();
+ IOUtils.copyStream(outStream, inStream);
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Failed to process WSDL request: " + e.getMessage(), e);
+ }
+ finally
+ {
+ // close input stream when available
+ try
+ {
+ if(inStream!=null) inStream.close();
+ }
+ catch (IOException ignore) {}
+ // close output stream when available
+ try
+ {
+ if(outStream!=null) outStream.close();
+ }
+ catch (IOException ignore) {}
+ }
+ }
+
+ /**
+ * Handles HTTP GET request using Metro's ServletAdapter <b>publishWSDL</b> method
+ * @param target Metro's ServletAdapter
+ * @param req request message
+ * @param context servlet context
+ * @param res response message
+ * @throws ServletException if some problem occurs
+ */
+ private static void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res)
+ throws ServletException
+ {
+ try
+ {
if (target != null)
{
String query = req.getQueryString();
- if (isMetadataQuery(query)) {
+ if (isMetadataQuery(query))
+ {
// Sends published WSDL and schema documents
target.publishWSDL(context, req, res);
return;
@@ -118,18 +212,16 @@
}
}
- private static void sendResponse(int status, String message, HttpServletResponse res)
- throws IOException
+ /**
+ * Handles HTTP POST request using Metro's ServletAdapter <b>handle</b> method
+ * @param target Metro's ServletAdapter
+ * @param req request message
+ * @param context servlet context
+ * @param res response message
+ * @throws ServletException if some problem occurs
+ */
+ private static void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res)
{
- res.setStatus(status);
- res.setContentType("text/plain");
- Writer out = res.getWriter();
- out.write(message);
- out.close();
- }
-
- private void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res)
- {
try
{
target.handle(context, req, res);
@@ -140,107 +232,57 @@
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
}
-
+
/**
- * The InvocationContext accepts a {@link Properties} attachment that can carry request properies.<br/>
- * Property keys are derived from {@link org.jboss.wsf.stack.metro.MessageStreamContext}
- * <p/>
- * Required propeties are:
- *
- * <ul>
- * <li><tt>Content-Type</tt> ({@link org.jboss.wsf.stack.metro.MessageStreamContext#CONTENT_TYPE})
- * </ul>
- * @param endpoint
- * @param inStream
- * @param outStream
- * @param context
+ * Copies properties from invocation context to message context when properties are available
+ * @param invCtx invocation context
+ * @param msgCtx message context
*/
- public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
+ private static void copyProperties(InvocationContext invCtx, MessageStreamContext msgCtx)
{
- MessageStreamAdapter adapter = endpoint.getAttachment(MessageStreamAdapter.class);
- if(null == adapter)
- throw new IllegalArgumentException("Cannot obtain MessageStreamAdapter");
-
- try
+ boolean invCtxAvailable = (invCtx != null);
+ boolean invCtxHasProps = (invCtx.getAttachment(Properties.class) != null);
+
+ if (invCtxAvailable && invCtxHasProps)
{
- MessageStreamContext streamContext = new MessageStreamContext();
-
- if(context!=null && context.getAttachment(Properties.class)!=null)
+ Map<String, String> msgReqCtx = msgCtx.getRequestContext();
+ Properties invCtxProps = invCtx.getAttachment(Properties.class);
+
+ // copy invocation properties to message request context
+ for(Object keyObject : invCtxProps.keySet())
{
- Properties props = context.getAttachment(Properties.class);
- for(Object o : props.keySet())
- {
- String key = (String)o;
- streamContext.getRequestContext().put(key, props.getProperty(key));
- }
+ String key = (String)keyObject;
+ msgReqCtx.put(key, invCtxProps.getProperty(key));
}
-
- // Hacky, but the InvokerJSE requires it.
- // However it's bette to do it here then outside the RequestHandler...
- EndpointAssociation.setEndpoint(endpoint);
- try
- {
- adapter.handle(streamContext, inStream, outStream );
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
-
}
- catch (IOException e)
- {
- throw new WebServiceException("Failed to process request: " + e.getMessage(), e);
-
- }
-
}
- public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
+ /**
+ * Sends HTTP text message to the client
+ * @param status HTTP status code to return
+ * @param message text message
+ * @param res response to write message to
+ * @throws IOException when some IO problem occurs
+ */
+ private static void sendResponse(int status, String message, HttpServletResponse res)
+ throws IOException
{
- InputStream inStream = null;
-
- try
- {
- String epAddress = endpoint.getAddress();
- if (epAddress == null)
- throw new IllegalArgumentException("Invalid endpoint address: " + epAddress);
-
- URL wsdlUrl = new URL(epAddress + "?wsdl");
- inStream = wsdlUrl.openStream();
- IOUtils.copyStream(outStream, inStream);
- }
- catch (IOException e)
- {
- throw new WebServiceException("Failed to process WSDL request: " + e.getMessage(), e);
- }
- finally
- {
- try
- {
- if(inStream!=null)inStream.close();
- if(outStream!=null)outStream.close();
- }
- catch (IOException e)
- {
- //
- }
- }
+ res.setStatus(status);
+ res.setContentType("text/plain");
+ Writer out = res.getWriter();
+ out.write(message);
+ out.close();
}
/**
* Returns true if the given query string is for metadata request.
- *
- * @param query
- * String like "xsd=1" or "perhaps=some&unrelated=query".
- * Can be null.
- * @return true for metadata requests
- * false for web service requests
+ * @param query HTTP query, can be null
+ * @return true for metadata requests false otherwise
*/
- private boolean isMetadataQuery(String query) {
- // we intentionally return true even if documents don't exist,
- // so that they get 404.
- return query != null && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
+ private static boolean isMetadataQuery(String query)
+ {
+ // we intentionally return true even if documents don't exist, so that they get 404.
+ return (query != null) && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
}
}
18 years
- 1
- 0
JBossWS SVN: r6680 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 05:04:23 -0400 (Fri, 25 Apr 2008)
New Revision: 6680
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
Use jbossws-jboss42x on classpath
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-24 20:01:45 UTC (rev 6679)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-25 09:04:23 UTC (rev 6680)
@@ -172,8 +172,9 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss42.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss421.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss422.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss423.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
18 years
- 1
- 0
JBossWS SVN: r6679 - container/jboss50/branches/jbossws-jboss501.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-24 16:01:45 -0400 (Thu, 24 Apr 2008)
New Revision: 6679
Added:
container/jboss50/branches/jbossws-jboss501/pom.xml
Modified:
container/jboss50/branches/jbossws-jboss501/
Log:
maven build (wip)
Property changes on: container/jboss50/branches/jbossws-jboss501
___________________________________________________________________
Name: svn:ignore
- .settings
pom.xml
+ .settings
Added: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-24 20:01:45 UTC (rev 6679)
@@ -0,0 +1,112 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Container JBoss-5.0.1</name>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+
+ <version>3.0.0-SNAPSHOT</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+
+ <!-- provided apis -->
+
+ <!-- jboss thirdparty dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>../etc</targetPath>
+ <directory>src/main/etc</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources/jbossws-jboss50.jar</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="artifact.id" value="${project.artifactId}"/>
+ <property name="version.id" value="${project.version}"/>
+ <property name="jboss.local.repository" value="${jboss.local.repository}"/>
+ <ant antfile="src/main/scripts/antrun-install.xml" target="install"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-resources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: container/jboss50/branches/jbossws-jboss501/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r6678 - in container/jboss50/branches/jbossws-jboss501: src/main and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-24 15:36:09 -0400 (Thu, 24 Apr 2008)
New Revision: 6678
Added:
container/jboss50/branches/jbossws-jboss501/src/main/scripts/
container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml
container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
Modified:
container/jboss50/branches/jbossws-jboss501/
container/jboss50/branches/jbossws-jboss501/.classpath
container/jboss50/branches/jbossws-jboss501/.project
Log:
maven build (wip)
Property changes on: container/jboss50/branches/jbossws-jboss501
___________________________________________________________________
Name: svn:ignore
- output
thirdparty
ant.properties
+ .settings
pom.xml
Modified: container/jboss50/branches/jbossws-jboss501/.classpath
===================================================================
--- container/jboss50/branches/jbossws-jboss501/.classpath 2008-04-24 19:03:51 UTC (rev 6677)
+++ container/jboss50/branches/jbossws-jboss501/.classpath 2008-04-24 19:36:09 UTC (rev 6678)
@@ -11,5 +11,6 @@
<classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="output/eclipse-classes"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: container/jboss50/branches/jbossws-jboss501/.project
===================================================================
--- container/jboss50/branches/jbossws-jboss501/.project 2008-04-24 19:03:51 UTC (rev 6677)
+++ container/jboss50/branches/jbossws-jboss501/.project 2008-04-24 19:36:09 UTC (rev 6678)
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml 2008-04-24 19:36:09 UTC (rev 6678)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="project.dir" value="${basedir}"/>
+ <property name="project.etc.dir" value="${project.dir}/src/main/etc"/>
+ <property name="project.target.dir" value="${project.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ <property name="repository.id" value="${version.id}"/>
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ <echo message="jboss.local.repository=${jboss.local.repository}"/>
+ </target>
+
+ <target name="check-properties" depends="init">
+ <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/>
+ <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Installation -->
+ <!-- ================================================================== -->
+
+ <!-- Install to jboss.local.repository -->
+ <target name="install" depends="check-properties" description="Install to jboss.local.repository">
+
+ <!-- Check if the target jar is available -->
+ <available property="jar.available" file="${project.target.dir}/${artifact.id}-${version.id}.jar"/>
+ <fail message="Cannot find ${artifact.id}-${version.id}.jar. Did you run 'mvn package'?" unless="jar.available"/>
+
+ <!-- jboss/jbossws-project -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/${artifact.id}/${repository.id}"/>
+ <mkdir dir="${jboss.repository.dir}/lib"/>
+ <copy file="${project.target.dir}/${artifact.id}-${version.id}.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/${artifact.id}-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/${artifact.id}-src.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/${artifact.id}-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/${artifact.id}-resources.zip" overwrite="true"/>
+ <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
+ </target>
+
+</project>
Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/scripts/antrun-install.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml 2008-04-24 19:36:09 UTC (rev 6678)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossws-jboss42.sar/**</include>
+ <include>jbossws-jboss42-config.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/scripts/assembly-resources.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r6677 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-24 15:03:51 -0400 (Thu, 24 Apr 2008)
New Revision: 6677
Modified:
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
Fix bin-dist etc
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-24 18:51:49 UTC (rev 6676)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-24 19:03:51 UTC (rev 6677)
@@ -53,10 +53,11 @@
</fileSet>
<!-- test excludes -->
<fileSet>
- <directory>modules/testsuite/cxf-tests/src/test/resources</directory>
- <outputDirectory>tests/resources</outputDirectory>
+ <directory>modules/testsuite/cxf-tests/src/test</directory>
+ <outputDirectory>tests</outputDirectory>
<includes>
- <include>test-excludes-*.txt</include>
+ <include>etc/**</include>
+ <include>resources/test-excludes-*.txt</include>
</includes>
</fileSet>
</fileSets>
@@ -73,7 +74,6 @@
<unpackOptions>
<includes>
<include>ant-import/**</include>
- <include>etc/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
<include>resources/jaxws/samples/**</include>
</includes>
18 years
- 1
- 0