JBossWS SVN: r5924 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-11 20:33:29 -0400 (Tue, 11 Mar 2008)
New Revision: 5924
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
stack/native/trunk/src/test/resources/jaxws/jbws1988/
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties
stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java
stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/username-digest/
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/ant-import-tests/build-samples-jaxws.xml
Log:
[JBWS-1988] Test case
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 00:09:56 UTC (rev 5923)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 00:33:29 UTC (rev 5924)
@@ -664,6 +664,25 @@
</metainf>
</jar>
+ <!-- jaxws-jbws1988 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1988.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1988/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1988/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1988.sar">
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF">
+ <include name="jboss-service.xml"/>
+ <include name="login-config.xml"/>
+ <include name="jbossws-users.properties"/>
+ <include name="jbossws-roles.properties"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-jbws1991 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws1991.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: stack/native/trunk/ant-import-tests/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-03-12 00:09:56 UTC (rev 5923)
+++ stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-03-12 00:33:29 UTC (rev 5924)
@@ -271,19 +271,6 @@
<include name="jboss-wsse-server.xml"/>
</webinf>
</war>
-
- <!-- jaxws-samples-wssecurity-username-digest -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-username-digest.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/username-digest/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/username-digest/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- </war>
<!-- jaxws-samples-wssecurityAnnotatedpolicy-encrypt -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1988;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/jbws1988")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Hello
+{
+ @WebMethod
+ public String echo(String par);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/Hello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1988;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+
+@Stateless
+@WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1988")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+@SecurityDomain("JBossWSDigest")
+@RolesAllowed({"friend"})
+public class HelloJavaBean
+{
+ private Logger log = Logger.getLogger(HelloJavaBean.class);
+ @Resource
+ private WebServiceContext ctx;
+
+ @WebMethod
+ public String echo(String par)
+ {
+ log.info("User principal: " + ctx.getUserPrincipal());
+ return par;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1988;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * http://jira.jboss.org/jira/browse/JBWS-1988
+ * Complete username token profile with digest and nonces
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Mar-2008
+ */
+public class UsernameAuthTestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1988";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.sar jaxws-jbws1988.jar");
+ }
+
+ public void testAuth() throws Exception
+ {
+ Hello port = getPort();
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit");
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "therealfrog");
+ String msg = "Hi!";
+ try
+ {
+ String result = port.echo(msg);
+ assertEquals(msg, result);
+ }
+ catch (Exception e)
+ {
+ fail();
+ }
+ }
+
+ private Hello getPort() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws1988", "HelloService");
+ Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class);
+ URL securityURL = new File("resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml").toURL();
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+ ((BindingProvider)port).getRequestContext().put(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE);
+ return port;
+ }
+}
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java 2008-03-12 00:09:56 UTC (rev 5923)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernamePwdDigestTestCase.java 2008-03-12 00:33:29 UTC (rev 5924)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wssecurity;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.ws.core.StubExt;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test WS-Security for Username Token with password digest
- *
- * @author alessio.soldano(a)jboss.com
- * @since 10-Mar-2008
- */
-public class UsernamePwdDigestTestCase extends JBossWSTest
-{
- private static UsernameEndpoint port;
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(UsernamePwdDigestTestCase.class, "jaxws-samples-wssecurity-username-digest.war");
- }
-
- @Override
- protected void setUp() throws Exception
- {
- if (port == null)
- {
- URL wsdlURL = new File("resources/jaxws/samples/wssecurity/username-digest/META-INF/wsdl/UsernameService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/username-digest/META-INF/jboss-wsse-client.xml").toURL();
- QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
-
- Service service = Service.create(wsdlURL, serviceName);
-
- port = (UsernameEndpoint)service.getPort(UsernameEndpoint.class);
- ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
- ((StubExt)port).setConfigName("Standard WSSecurity Client");
- }
- }
-
- public void testUsernameTokenNegative() throws Exception
- {
- try
- {
- port.getUsernameToken();
- fail("Server should respond with [401] - Unauthorized");
- }
- catch (Exception ex)
- {
- // this should be ok
- }
- }
-
- public void testUsernameToken() throws Exception
- {
- Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
- reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit");
- reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
-
- String retObj = port.getUsernameToken();
- assertEquals("kermit", retObj);
- }
-}
\ No newline at end of file
Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="jboss:service=DynamicLoginConfig">
+ <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
+ <!-- The service which supports dynamic processing of login-config.xml
+ configurations.
+ -->
+ <depends optional-attribute-name="LoginConfigService">
+ jboss.security:service=XMLLoginConfig
+ </depends>
+ <!-- Optionally specify the security mgr service to use when
+ this service is stopped to flush the auth caches of the domains
+ registered by this service.
+ -->
+ <depends optional-attribute-name="SecurityManagerService">
+ jboss.security:service=JaasSecurityManager
+ </depends>
+ </mbean>
+</server>
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+
+ <config>
+ <username digestPassword="true"/>
+ <timestamp ttl="300"/>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,10 @@
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config
+ http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <timestamp ttl="300"/>
+ <requires/>
+ </config>
+
+</jboss-ws-security>
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-roles.properties 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+kermit=friend
\ No newline at end of file
Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jbossws-users.properties 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+kermit=therealfrog
Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml 2008-03-12 00:33:29 UTC (rev 5924)
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<policy>
+
+ <application-policy name="JBossWSDigest">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option>
+ <module-option name="hashAlgorithm">SHA</module-option>
+ <module-option name="hashEncoding">BASE64</module-option>
+ <module-option name="hashUserPassword">false</module-option>
+ <module-option name="hashStorePassword">true</module-option>
+ <module-option name="storeDigestCallback">org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+</policy>
+
Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 10 months
- 1
- 0
JBossWS SVN: r5923 - in stack/native/trunk/src/main/java/org/jboss/ws/core: jaxrpc/binding and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-03-11 20:09:56 -0400 (Tue, 11 Mar 2008)
New Revision: 5923
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
[JBWS-1763] Re-merge missing commit - Incorrect handling of charsets when the default charset is not UTF-8.
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2008-03-11 19:51:05 UTC (rev 5922)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2008-03-12 00:09:56 UTC (rev 5923)
@@ -27,6 +27,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
import javax.xml.transform.stream.StreamResult;
@@ -51,7 +52,7 @@
{
try
{
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8")));
}
catch (IOException e)
{
@@ -85,6 +86,16 @@
public String toString()
{
- return baos.toString();
+ String result = null;
+ try
+ {
+ result = baos.toString("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+
+ return result;
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2008-03-11 19:51:05 UTC (rev 5922)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2008-03-12 00:09:56 UTC (rev 5923)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -97,7 +98,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(),"UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -109,6 +110,10 @@
{
WSException.rethrow(e);
}
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
return xmlFragment;
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2008-03-11 19:51:05 UTC (rev 5922)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2008-03-12 00:09:56 UTC (rev 5923)
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamSource;
@@ -112,7 +113,16 @@
{
String retStr = null;
if (bytes != null)
- retStr = new String(bytes);
+ {
+ try
+ {
+ retStr = new String(bytes, "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+ }
else if (chars != null)
retStr = new String(chars);
return "" + retStr;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2008-03-11 19:51:05 UTC (rev 5922)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2008-03-12 00:09:56 UTC (rev 5923)
@@ -177,7 +177,7 @@
Reader reader = streamSource.getReader();
{
if (reader == null)
- reader = new InputStreamReader(streamSource.getInputStream());
+ reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
}
char[] cbuf = new char[1024];
17 years, 10 months
- 1
- 0
JBossWS SVN: r5922 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 15:51:05 -0400 (Tue, 11 Mar 2008)
New Revision: 5922
Modified:
stack/native/trunk/ant-import/build-deploy.xml
Log:
Create jbossws-deploy.conf
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 19:51:05 UTC (rev 5922)
@@ -18,20 +18,12 @@
<!-- ================================================================== -->
<target name="deploy-structure-jboss42" depends="prepare-deploy">
-
- <!-- Create the deployment structure -->
<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="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
-
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss42}" excludes="**/jbossws.sar/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="${deploy.structure.jboss42}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
</target>
<!-- ================================================================== -->
@@ -102,19 +94,11 @@
<!-- ================================================================== -->
<target name="deploy-structure-jboss50" depends="prepare-deploy">
-
- <!-- Create the deployment structure -->
<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}"/>
</antcall>
-
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss50}" excludes="**/jbossws.sar/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="${deploy.structure.jboss50}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/>
</target>
<!-- ================================================================== -->
@@ -151,4 +135,19 @@
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Create jbossws-deploy.conf -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-create-deploy-conf">
+ <attribute name="deploystructure"/>
+ <sequential>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </sequential>
+ </macrodef>
+
</project>
17 years, 10 months
- 1
- 0
JBossWS SVN: r5921 - in stack/native/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 15:42:39 -0400 (Tue, 11 Mar 2008)
New Revision: 5921
Added:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-prepare-deploy.xml
Removed:
stack/native/trunk/ant-import/build-deploy42.xml
stack/native/trunk/ant-import/build-deploy50.xml
stack/native/trunk/src/main/distro/bin-dist-deploy.xml
Modified:
stack/native/trunk/ant-import/build-bin-dist.xml
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
stack/native/trunk/build.xml
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/bin-dist-build.xml
Log:
Reuse deployment scripts in bin-dist
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -17,39 +17,38 @@
<!-- Binary distribution -->
<!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
<property name="bindist.dir" value="${core.output.dir}/jbossws-native-dist"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.deploy.dir" value="${bindist.dir}/deploy"/>
<property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
<property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
<property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
<delete dir="${bindist.dir}"/>
<mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.deploy.dir}"/>
<mkdir dir="${bindist.docs.dir}"/>
<mkdir dir="${bindist.tests.dir}"/>
<mkdir dir="${bindist.tools.dir}"/>
<!-- root -->
- <copy tofile="${bindist.dir}/ant.properties.example" file="${core.distro.dir}/ant.properties.example">
+ <copy file="${core.distro.dir}/ant.properties.example" todir="${bindist.dir}">
<filterset>
<filtersfile file="${core.dir}/ant.properties"/>
</filterset>
</copy>
<copy tofile="${bindist.dir}/version.properties" file="${core.dir}/version.properties"/>
<copy tofile="${bindist.dir}/build.xml" file="${core.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${core.distro.dir}/bin-dist-deploy.xml"/>
<copy tofile="${bindist.build.dir}/build-project-gen.xml" file="${core.distro.dir}/bin-dist-project-gen.xml"/>
<!-- build -->
<copy todir="${bindist.build.dir}">
<fileset dir="${core.dir}/ant-import">
- <include name="jbossws.default.undeploy.files"/>
- <include name="macros-deploy-native.xml"/>
+ <include name="build-deploy.xml"/>
+ <include name="jbossws-deploy-macros.xml"/>
+ <include name="jbossws-default-deploy.conf"/>
</fileset>
<fileset dir="${core.distro.dir}">
<include name="user-project-build.xml"/>
@@ -58,17 +57,11 @@
</fileset>
</copy>
- <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${core.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
+ <!-- deploy -->
+ <copy todir="${bindist.deploy.dir}">
+ <fileset dir="${deploy.artifacts.dir}"/>
</copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
<!-- docs -->
<copy todir="${bindist.docs.dir}">
<fileset dir="${core.output.dir}">
@@ -91,48 +84,6 @@
</fileset>
</copy>
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jbossws-core-scripts.zip"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-native40.sar"/>
- <include name="jbossws-native42.sar"/>
- <include name="jbossws-native50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="getopt.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="juddi-service.sar"/>
- <include name="policy.jar"/>
- <include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
-
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
<fileset dir="${core.dir}/src/test-framework"/>
Copied: stack/native/trunk/ant-import/build-deploy.xml (from rev 5920, stack/native/trunk/ant-import/build-deploy50.xml)
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml (rev 0)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -0,0 +1,154 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss42" depends="prepare-deploy">
+
+ <!-- Create the deployment structure -->
+ <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="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss42}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="${deploy.structure.jboss42}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss421 -->
+ <!-- ================================================================== -->
+
+ <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"/>
+ <copy todir="${jboss421.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- Extras for jboss-4.2.1 -->
+ <copy todir="${jboss421.home}/lib" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss421.home}/client" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="undeploy-jboss421" depends="prepare" 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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <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">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss422" depends="prepare" 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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <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">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss423" depends="prepare" 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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-5.0.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
+
+ <!-- Create the deployment structure -->
+ <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}"/>
+ </antcall>
+
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss50}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="${deploy.structure.jboss50}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <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">
+ <fileset dir="${deploy.structure.jboss50}"/>
+ </copy>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="prepare" 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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <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">
+ <fileset dir="${deploy.structure.jboss50}"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="prepare" 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}"/>
+ </target>
+
+</project>
Deleted: stack/native/trunk/ant-import/build-deploy42.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -1,134 +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>
-
- <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
-
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss421 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss421" depends="undeploy-jboss421,prepare-deploy42" description="Deploy jbossws to jboss421">
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <copy todir="${jboss421.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- Extras for jboss-4.2.1 -->
- <copy todir="${jboss421.home}/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss421.home}/client" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss422" depends="undeploy-jboss422,prepare-deploy42" description="Deploy jbossws to jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <copy todir="${jboss422.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss423" depends="undeploy-jboss423,prepare-deploy42" description="Deploy jbossws to jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <target name="prepare-deploy42" depends="jars">
-
- <delete dir="${core.output.deploy.dir}-src"/>
- <delete dir="${core.output.deploy.dir}"/>
-
- <!-- Copy all artifacts to a flat deploy src -->
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
- <copy todir="${core.output.deploy.dir}-src/lib">
- <fileset dir="${thirdparty.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- <fileset dir="${core.output.lib.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="jbossws-context.war"/>
- </fileset>
- </copy>
- <copy todir="${core.output.deploy.dir}-src/resources">
- <fileset dir="${core.output.resources.dir}">
- <include name="standard-*-config.xml"/>
- <include name="jbossws-native42-beans.xml"/>
- </fileset>
- </copy>
-
- <!-- Create the deployment structure -->
- <antcall target="deploy-jbossws-native42" inheritall="false">
- <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
- <param name="resourcesdir" value="${core.output.resources.dir}/jbossws-jboss42.sar"/>
- <param name="thirdpartydir" value="${core.output.deploy.dir}-src"/>
- </antcall>
-
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
- </target>
-
-</project>
Deleted: stack/native/trunk/ant-import/build-deploy50.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -1,104 +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>
-
- <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
-
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss500" depends="undeploy-jboss500,prepare-deploy50" description="Deploy jbossws to jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <copy todir="${jboss500.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss501" depends="undeploy-jboss501,prepare-deploy50" description="Deploy jbossws to jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment JBoss-5.0.x -->
- <!-- ================================================================== -->
-
- <target name="prepare-deploy50" depends="jars">
-
- <delete dir="${core.output.deploy.dir}-src"/>
- <delete dir="${core.output.deploy.dir}"/>
-
- <!-- Copy all artifacts to a flat deploy src -->
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
- <copy todir="${core.output.deploy.dir}-src/lib">
- <fileset dir="${thirdparty.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- <fileset dir="${core.output.lib.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="jbossws-context.war"/>
- </fileset>
- </copy>
- <copy todir="${core.output.deploy.dir}-src/resources">
- <fileset dir="${core.output.resources.dir}">
- <include name="standard-*-config.xml"/>
- <include name="jbossws-native50-beans.xml"/>
- </fileset>
- </copy>
-
- <!-- Create the deployment structure -->
- <antcall target="deploy-jbossws-native50" inheritall="false">
- <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
- <param name="thirdpartydir" value="${core.output.deploy.dir}-src"/>
- </antcall>
-
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
- </target>
-
-</project>
Added: stack/native/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-prepare-deploy.xml (rev 0)
+++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -0,0 +1,53 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Source -->
+ <!-- ================================================================== -->
+
+ <target name="prepare-deploy" depends="jars">
+
+ <delete dir="${deploy.artifacts.dir}"/>
+
+ <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <unzip dest="${deploy.artifacts.dir}/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
+ <copy todir="${deploy.artifacts.dir}/lib">
+ <fileset dir="${thirdparty.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="jbossws-context.war"/>
+ </fileset>
+ </copy>
+ <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/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Property changes on: stack/native/trunk/ant-import/build-prepare-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -35,7 +35,7 @@
<echo message="*********************************************"/>
</target>
- <target name="release-to-repository" depends="prepare-deploy50,check-svn-externals,warn-svn-externals"
+ <target name="release-to-repository" depends="deploy-structure-jboss50,check-svn-externals,warn-svn-externals"
description="Release to jboss.local.repository">
<!-- jboss/jbossws-native -->
@@ -50,7 +50,7 @@
<include name="wstools.bat"/>
<include name="wstools.sh"/>
</fileset>
- <fileset dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
+ <fileset dir="${deploy.structure.jboss50}/server/${jboss.server.instance}/deploy/jbossws.sar">
<include name="jbossws-deploy.conf"/>
</fileset>
</copy>
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -259,12 +259,13 @@
<!-- ================================================================== -->
<macrodef name="macro-undeploy-jbossws">
+ <attribute name="defaultconf"/>
<attribute name="targetdir"/>
<sequential>
- <loadfile property="jbossws.undeploy.files" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
<delete>
- <fileset dir="@{targetdir}/../../../.." includes="${jbossws.undeploy.files}"/>
+ <fileset dir="@{targetdir}/../../../.." includes="${jbossws.deploy.conf}"/>
</delete>
</sequential>
</macrodef>
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/build.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -93,12 +93,13 @@
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-deploy42.xml"/>
- <import file="${basedir}/ant-import/build-deploy50.xml"/>
+ <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
-
+ <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
+
<property name="core.src.dir" value="${core.dir}/src/main"/>
<property name="core.etc.dir" value="${core.src.dir}/etc"/>
<property name="core.distro.dir" value="${core.src.dir}/distro"/>
@@ -113,6 +114,11 @@
<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"/>
+ <property name="jbossws.default.deploy.conf" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
+
<target name="init" depends="prepare,thirdparty">
</target>
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2008-03-11 19:42:39 UTC (rev 5921)
@@ -8,8 +8,9 @@
jboss422.home=(a)jboss422.home@
jboss423.home=(a)jboss423.home@
jboss500.home=(a)jboss500.home@
+jboss501.home=(a)jboss501.home@
-# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500|jboss501]
jbossws.integration.target=jboss422
# The JBoss settings
Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -18,15 +18,15 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="deploy.dir" value="${basedir}/output/deploy"/>
<property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${basedir}/output"/>
- <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/>
+ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
+ <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
+ <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
@@ -99,7 +99,7 @@
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-project-gen.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
@@ -127,13 +127,13 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${lib.dir}/jbossws-common.jar"/>
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
- <pathelement location="${lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${lib.dir}/jbossws-core.jar"/>
- <pathelement location="${lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-client.jar"/>
</path>
<path id="tests.extra.classpath">
@@ -168,9 +168,10 @@
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
- <!-- dummy jar targets -->
+ <!-- dummy targets -->
<target name="jars-jboss50" depends="prepare"/>
<target name="jars-jboss42" depends="prepare"/>
+ <target name="prepare-deploy" depends="prepare"/>
<!-- ================================================================== -->
<!-- Miscellaneous -->
Deleted: stack/native/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -1,84 +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: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss421 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss421 -->
- <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws/native to jboss421">
- <macro-deploy-native421 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421">
- <macro-undeploy-native421/>
- </target>
-
- <!-- Deploy jbossws/native to jboss422 -->
- <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422">
- <macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/native from jboss422">
- <macro-undeploy-native422/>
- </target>
-
- <!-- Deploy jbossws/native to jboss423 -->
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423">
- <macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/native from jboss423">
- <macro-undeploy-native423/>
- </target>
-
- <!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500">
- <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500">
- <macro-undeploy-native500/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss501 -->
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/native to jboss501">
- <macro-deploy-native501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
- <macro-undeploy-native501/>
- </target>
-
-</project>
17 years, 10 months
- 1
- 0
JBossWS SVN: r5920 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 11:32:31 -0400 (Tue, 11 Mar 2008)
New Revision: 5920
Modified:
stack/native/trunk/ant-import/build-deploy42.xml
stack/native/trunk/ant-import/build-deploy50.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Fix deploy-jboss42x
Modified: stack/native/trunk/ant-import/build-deploy42.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:44:08 UTC (rev 5919)
+++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 15:32:31 UTC (rev 5920)
@@ -119,7 +119,8 @@
<!-- Create the deployment structure -->
<antcall target="deploy-jbossws-native42" inheritall="false">
<param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
- <param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/>
+ <param name="resourcesdir" value="${core.output.resources.dir}/jbossws-jboss42.sar"/>
+ <param name="thirdpartydir" value="${core.output.deploy.dir}-src"/>
</antcall>
<!-- Create jbossws-deploy.conf -->
Modified: stack/native/trunk/ant-import/build-deploy50.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:44:08 UTC (rev 5919)
+++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 15:32:31 UTC (rev 5920)
@@ -90,7 +90,7 @@
<!-- Create the deployment structure -->
<antcall target="deploy-jbossws-native50" inheritall="false">
<param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
- <param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/>
+ <param name="thirdpartydir" value="${core.output.deploy.dir}-src"/>
</antcall>
<!-- Create jbossws-deploy.conf -->
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:44:08 UTC (rev 5919)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 15:32:31 UTC (rev 5920)
@@ -84,12 +84,12 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-bin">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.bin.patternset"/>
</fileset>
</copy>
@@ -101,12 +101,12 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-lib">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
</fileset>
</copy>
@@ -118,12 +118,12 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-endorsed">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.endorsed.patternset"/>
</fileset>
</copy>
@@ -135,12 +135,12 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-client">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
</fileset>
</copy>
@@ -152,12 +152,12 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-server-lib">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
</fileset>
</copy>
@@ -169,53 +169,56 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-native42-sar">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
+ <attribute name="resourcesdir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
<include name="**/jbossws-deploy.conf"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-context.war"/>
</fileset>
</unzip>
<copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native42-beans.xml"/>
</fileset>
</copy>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-native42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<include name="**/standard-jaxrpc-*-config.xml"/>
<include name="**/standard-jaxws-*-config.xml"/>
</fileset>
+ <fileset dir="@{resourcesdir}/META-INF"/>
</copy>
</sequential>
</macrodef>
<macrodef name="macro-deploy-jbossws-native50-sar">
- <attribute name="thirdpartylibs"/>
+ <attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
<include name="**/jbossws-deploy.conf"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-context.war"/>
</fileset>
</unzip>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
+ <fileset dir="@{thirdpartydir}">
<include name="**/standard-jaxrpc-*-config.xml"/>
<include name="**/standard-jaxws-*-config.xml"/>
<include name="**/jbossws-native50-beans.xml"/>
@@ -232,23 +235,23 @@
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
<target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
</target>
<target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartylibs="${thirdpartylibs}"/>
- <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" 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}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
<!-- ================================================================== -->
17 years, 10 months
- 1
- 0
JBossWS SVN: r5919 - stack/cxf/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:44:08 -0400 (Tue, 11 Mar 2008)
New Revision: 5919
Added:
stack/cxf/trunk/ant-import/jbossws-default-deploy.conf
Removed:
stack/cxf/trunk/ant-import/jbossws.default.undeploy.files
Modified:
stack/cxf/trunk/ant-import/build-deploy.xml
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
Log:
Use jbossws-deploy.conf
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2008-03-11 14:44:00 UTC (rev 5918)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-03-11 14:44:08 UTC (rev 5919)
@@ -16,7 +16,7 @@
<import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/>
<property name="deploy.dir" value="${int.cxf.dir}/output/deploy"/>
- <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files"/>
+ <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
Copied: stack/cxf/trunk/ant-import/jbossws-default-deploy.conf (from rev 5836, stack/cxf/trunk/ant-import/jbossws.default.undeploy.files)
===================================================================
--- stack/cxf/trunk/ant-import/jbossws-default-deploy.conf (rev 0)
+++ stack/cxf/trunk/ant-import/jbossws-default-deploy.conf 2008-03-11 14:44:08 UTC (rev 5919)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Deleted: stack/cxf/trunk/ant-import/jbossws.default.undeploy.files
===================================================================
--- stack/cxf/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:44:00 UTC (rev 5918)
+++ stack/cxf/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:44:08 UTC (rev 5919)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
\ No newline at end of file
Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-03-11 14:44:00 UTC (rev 5918)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-03-11 14:44:08 UTC (rev 5919)
@@ -86,17 +86,17 @@
<unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
<!-- Deploy the jars -->
- <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws-deploy.conf"/>
<copy todir="@{jbosshome}" overwrite="true">
<fileset refid="jbossws.deploy.files"/>
</copy>
<chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
- <!-- Write jbossws.deployed.files -->
+ <!-- Write jbossws-deploy.conf -->
<property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
- <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/>
- <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/>
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/>
+ <echo file="${deploy.dir}/jbossws-deploy.conf" message="${jbossws.deploy.files}"/>
+ <replace file="${deploy.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws-deploy.conf" overwrite="true"/>
</sequential>
</macrodef>
@@ -111,7 +111,7 @@
<delete dir="${deploy.dir}"/>
- <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/>
+ <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
<delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
17 years, 10 months
- 1
- 0
JBossWS SVN: r5918 - stack/metro/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:44:00 -0400 (Tue, 11 Mar 2008)
New Revision: 5918
Added:
stack/metro/trunk/ant-import/jbossws-default-deploy.conf
Removed:
stack/metro/trunk/ant-import/jbossws.default.undeploy.files
Modified:
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/ant-import/macros-deploy-metro.xml
Log:
Use jbossws-deploy.conf
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-03-11 14:36:18 UTC (rev 5917)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-03-11 14:44:00 UTC (rev 5918)
@@ -16,7 +16,7 @@
<import file="${int.metro.dir}/ant-import/macros-deploy-metro.xml"/>
<property name="deploy.dir" value="${int.metro.dir}/output/deploy"/>
- <property name="jbossws.default.undeploy.files" value="${int.metro.dir}/ant-import/jbossws.default.undeploy.files"/>
+ <property name="jbossws.default.undeploy.files" value="${int.metro.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
Copied: stack/metro/trunk/ant-import/jbossws-default-deploy.conf (from rev 5836, stack/metro/trunk/ant-import/jbossws.default.undeploy.files)
===================================================================
--- stack/metro/trunk/ant-import/jbossws-default-deploy.conf (rev 0)
+++ stack/metro/trunk/ant-import/jbossws-default-deploy.conf 2008-03-11 14:44:00 UTC (rev 5918)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Deleted: stack/metro/trunk/ant-import/jbossws.default.undeploy.files
===================================================================
--- stack/metro/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:36:18 UTC (rev 5917)
+++ stack/metro/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:44:00 UTC (rev 5918)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
\ No newline at end of file
Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-03-11 14:36:18 UTC (rev 5917)
+++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-03-11 14:44:00 UTC (rev 5918)
@@ -94,17 +94,17 @@
<unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
<!-- Deploy the jars -->
- <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws-deploy.conf"/>
<copy todir="@{jbosshome}" overwrite="true">
<fileset refid="jbossws.deploy.files"/>
</copy>
<chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
- <!-- Write jbossws.deployed.files -->
+ <!-- Write jbossws-deploy.conf -->
<property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
- <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/>
- <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/>
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/>
+ <echo file="${deploy.dir}/jbossws-deploy.conf" message="${jbossws.deploy.files}"/>
+ <replace file="${deploy.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws-deploy.conf" overwrite="true"/>
</sequential>
</macrodef>
@@ -119,7 +119,7 @@
<delete dir="${deploy.dir}"/>
- <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/>
+ <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
<property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
<delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
17 years, 10 months
- 1
- 0
JBossWS SVN: r5917 - in stack/native/trunk: src/main/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:36:18 -0400 (Tue, 11 Mar 2008)
New Revision: 5917
Added:
stack/native/trunk/ant-import/jbossws-default-deploy.conf
Removed:
stack/native/trunk/ant-import/jbossws.default.undeploy.files
Modified:
stack/native/trunk/ant-import/build-deploy42.xml
stack/native/trunk/ant-import/build-deploy50.xml
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
stack/native/trunk/src/main/etc/component-info.xml
Log:
Use jbossws-deploy.conf
Modified: stack/native/trunk/ant-import/build-deploy42.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -15,7 +15,7 @@
<import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
+ <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Deployment JBoss421 -->
@@ -24,7 +24,7 @@
<target name="deploy-jboss421" depends="undeploy-jboss421,prepare-deploy42" description="Deploy jbossws to jboss421">
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
<copy todir="${jboss421.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
@@ -53,7 +53,7 @@
<target name="deploy-jboss422" depends="undeploy-jboss422,prepare-deploy42" description="Deploy jbossws to jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<copy todir="${jboss422.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
@@ -70,7 +70,7 @@
<target name="deploy-jboss423" depends="undeploy-jboss423,prepare-deploy42" description="Deploy jbossws to jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
@@ -122,12 +122,12 @@
<param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/>
</antcall>
- <!-- Create jbossws.deployed.files -->
- <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/>
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
<property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws.deployed.files" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws.deployed.files" token=";" value=" "/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
</target>
</project>
Modified: stack/native/trunk/ant-import/build-deploy50.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -15,7 +15,7 @@
<import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
+ <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
@@ -24,7 +24,7 @@
<target name="deploy-jboss500" depends="undeploy-jboss500,prepare-deploy50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
@@ -41,7 +41,7 @@
<target name="deploy-jboss501" depends="undeploy-jboss501,prepare-deploy50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
@@ -93,12 +93,12 @@
<param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/>
</antcall>
- <!-- Create jbossws.deployed.files -->
- <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/>
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
<property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws.deployed.files" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws.deployed.files" token=";" value=" "/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
</target>
</project>
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -50,6 +50,9 @@
<include name="wstools.bat"/>
<include name="wstools.sh"/>
</fileset>
+ <fileset dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
+ <include name="jbossws-deploy.conf"/>
+ </fileset>
</copy>
<copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
@@ -74,9 +77,6 @@
<fileset dir="${basedir}/ant-import">
<include name="jbossws-deploy-macros.xml"/>
</fileset>
- <fileset dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
- <include name="jbossws.deployed.files"/>
- </fileset>
</copy>
<copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
Copied: stack/native/trunk/ant-import/jbossws-default-deploy.conf (from rev 5915, stack/native/trunk/ant-import/jbossws.default.undeploy.files)
===================================================================
--- stack/native/trunk/ant-import/jbossws-default-deploy.conf (rev 0)
+++ stack/native/trunk/ant-import/jbossws-default-deploy.conf 2008-03-11 14:36:18 UTC (rev 5917)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -176,6 +176,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
@@ -205,6 +206,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
@@ -256,7 +258,7 @@
<macrodef name="macro-undeploy-jbossws">
<attribute name="targetdir"/>
<sequential>
- <loadfile property="jbossws.undeploy.files" srcfile="@{targetdir}/jbossws.deployed.files" failonerror="false"/>
+ <loadfile property="jbossws.undeploy.files" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
<delete>
<fileset dir="@{targetdir}/../../../.." includes="${jbossws.undeploy.files}"/>
Deleted: stack/native/trunk/ant-import/jbossws.default.undeploy.files
===================================================================
--- stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:36:18 UTC (rev 5917)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Modified: stack/native/trunk/src/main/etc/component-info.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -17,8 +17,10 @@
<artifact id="standard-jaxrpc-endpoint-config.xml"/>
<artifact id="standard-jaxws-client-config.xml"/>
<artifact id="standard-jaxws-endpoint-config.xml"/>
+ <artifact id="jbossws-native42-beans.xml"/>
<artifact id="jbossws-native50-beans.xml"/>
<artifact id="jbossws-deploy-macros.xml"/>
+ <artifact id="jbossws-deploy.conf"/>
<artifact id="wsrunclient.bat"/>
<artifact id="wsrunclient.sh"/>
<artifact id="wstools.bat"/>
17 years, 10 months
- 1
- 0
JBossWS SVN: r5916 - in framework/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:21:23 -0400 (Tue, 11 Mar 2008)
New Revision: 5916
Modified:
framework/trunk/ant-import/build-release.xml
framework/trunk/build.xml
framework/trunk/src/main/etc/component-info.xml
Log:
Release bin scripts individually
Modified: framework/trunk/ant-import/build-release.xml
===================================================================
--- framework/trunk/ant-import/build-release.xml 2008-03-11 14:02:15 UTC (rev 5915)
+++ framework/trunk/ant-import/build-release.xml 2008-03-11 14:21:23 UTC (rev 5916)
@@ -12,32 +12,41 @@
<!-- $Id$ -->
<project>
-
+
<!-- Release to jboss.local.repository -->
- <target name="release" depends="jars"
- description="Release to jboss.local.repository">
-
+ <target name="release" depends="jars" description="Release to jboss.local.repository">
+
<!-- jboss/jbossws-framework -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/bin"/>
<mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib" overwrite="true">
<fileset dir="${framework.output.lib.dir}">
<include name="jbossws-framework.jar"/>
<include name="jbossws-framework-src.zip"/>
<include name="jbossws-framework-scripts.zip"/>
- </fileset>
+ </fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy todir="${jboss.repository.dir}/jbossws-framework/${repository.id}/bin" overwrite="true">
+ <fileset dir="${framework.output.etc.dir}">
+ <include name="wsconsume.bat"/>
+ <include name="wsconsume.sh"/>
+ <include name="wsprovide.bat"/>
+ <include name="wsprovide.sh"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true"
+ overwrite="true">
<filterset>
<filtersfile file="${framework.dir}/version.properties"/>
</filterset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Build binary distributions -->
<!-- ================================================================== -->
-
+
<target name="release-all" depends="all,release-to-portal" description="Release JBossWS">
<echo message="*********************************************"/>
<echo message="* Released: jbossws-${version.id}"/>
@@ -59,11 +68,11 @@
<echo message="*"/>
<echo message="*********************************************"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Build source distributions -->
<!-- ================================================================== -->
-
+
<!-- Build the src dist -->
<target name="build-src-dist" description="Build the source distribution">
<property name="build.src.dist" value="${build.dir}/output/src-dist"/>
@@ -77,17 +86,15 @@
<exclude name="mergeinfo.txt"/>
</fileset>
</copy>
- <zip destfile="${build.dir}/output/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
- includes="jbossws-src-${version.id}/**"/>
+ <zip destfile="${build.dir}/output/jbossws-src-${version.id}.zip" basedir="${build.src.dist}" includes="jbossws-src-${version.id}/**"/>
</target>
<!-- ================================================================== -->
<!-- Release to Portal -->
<!-- ================================================================== -->
-
+
<!-- Release to portal content -->
- <target name="release-to-portal" depends="check-portal-content, build-src-dist"
- description="Release to portal-content" if="jbossws.portal.content.available">
+ <target name="release-to-portal" depends="check-portal-content, build-src-dist" description="Release to portal-content" if="jbossws.portal.content.available">
<property name="portal.freezone" value="${jbossws.portal.content}/freezone"/>
<property name="portal.userguide" value="${portal.freezone}/user-guide"/>
@@ -104,15 +111,15 @@
</copy>
<!-- Copy Release Notes -->
- <copy todir="${build.dir}/output" filtering="yes">
- <fileset dir="${build.dir}/dist">
+ <copy todir="${build.dir}/output" filtering="yes">
+ <fileset dir="${build.dir}/dist">
<include name="Install.txt"/>
<include name="ReleaseNotes.txt"/>
</fileset>
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
- </copy>
+ </copy>
<copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${build.dir}/output/ReleaseNotes.txt" overwrite="true"/>
<copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${build.dir}/output/Install.txt" overwrite="true"/>
</target>
@@ -123,4 +130,4 @@
<echo message="*********************************************"/>
</target>
-</project>
+</project>
\ No newline at end of file
Modified: framework/trunk/build.xml
===================================================================
--- framework/trunk/build.xml 2008-03-11 14:02:15 UTC (rev 5915)
+++ framework/trunk/build.xml 2008-03-11 14:21:23 UTC (rev 5916)
@@ -108,12 +108,10 @@
<zip zipfile="${framework.output.lib.dir}/jbossws-framework-scripts.zip" >
<fileset dir="${framework.output.etc.dir}">
<include name="wsconsume.bat"/>
- <include name="wsprovide.bat"/>
- </fileset>
- <zipfileset dir="${framework.output.etc.dir}" filemode="755">
<include name="wsconsume.sh"/>
+ <include name="wsprovide.bat"/>
<include name="wsprovide.sh"/>
- </zipfileset>
+ </fileset>
</zip>
<!-- Build jbossws-spi-src.zip -->
Modified: framework/trunk/src/main/etc/component-info.xml
===================================================================
--- framework/trunk/src/main/etc/component-info.xml 2008-03-11 14:02:15 UTC (rev 5915)
+++ framework/trunk/src/main/etc/component-info.xml 2008-03-11 14:21:23 UTC (rev 5916)
@@ -1,13 +1,16 @@
<project name="jboss/jbossws-framework">
<component id="jboss/jbossws-framework"
- description="JBossWS SPI"
+ description="JBossWS Framework"
version="@repository.id@"
licenseType="lgpl">
<artifact id="jbossws-framework.jar"/>
<artifact id="jbossws-framework-src.zip"/>
- <artifact id="jbossws-framework-scripts.zip"/>
+ <artifact id="wsconsume.bat"/>
+ <artifact id="wsconsume.sh"/>
+ <artifact id="wsprovide.bat"/>
+ <artifact id="wsprovide.sh"/>
<import componentref="jboss/jbossws-common">
<compatible version="@jbossws-common@"/>
17 years, 10 months
- 1
- 0
JBossWS SVN: r5915 - in stack/native/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:02:15 -0400 (Tue, 11 Mar 2008)
New Revision: 5915
Added:
stack/native/trunk/ant-import/build-deploy42.xml
stack/native/trunk/ant-import/build-deploy50.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Removed:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/macros-deploy-native.xml
Modified:
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/ant-import/jbossws.default.undeploy.files
stack/native/trunk/build.xml
stack/native/trunk/src/main/etc/component-info.xml
Log:
Share deploy macros with AS build
Deleted: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 10:52:40 UTC (rev 5914)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -1,98 +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>
-
- <import file="${core.dir}/ant-import/macros-deploy-native.xml"/>
-
- <property name="deploy.dir" value="${core.dir}/output/deploy"/>
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss421 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss421 -->
- <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421">
- <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
- <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws from jboss421 -->
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
- <macro-undeploy-native421/>
- </target>
-
- <!-- Deploy jbossws to jboss422 -->
- <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
- <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws from jboss422 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-native422/>
- </target>
-
- <!-- Deploy jbossws to jboss423 -->
- <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
- <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws from jboss423 -->
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-native423/>
- </target>
-
- <!-- Deploy jbossws to jboss500 -->
- <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500">
- <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
- <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
- <macro-undeploy-native500/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss501 -->
- <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501">
- <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
- <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws from jboss501 -->
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
- <macro-undeploy-native501/>
- </target>
-
-</project>
Copied: stack/native/trunk/ant-import/build-deploy42.xml (from rev 5910, stack/native/trunk/ant-import/build-deploy.xml)
===================================================================
--- stack/native/trunk/ant-import/build-deploy42.xml (rev 0)
+++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -0,0 +1,133 @@
+<?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>
+
+ <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
+
+ <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss421 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss421" depends="undeploy-jboss421,prepare-deploy42" description="Deploy jbossws to jboss421">
+ <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+ <copy todir="${jboss421.home}" overwrite="true">
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ </copy>
+ <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- Extras for jboss-4.2.1 -->
+ <copy todir="${jboss421.home}/lib" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss421.home}/client" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
+ <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss422" depends="undeploy-jboss422,prepare-deploy42" description="Deploy jbossws to jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ </copy>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss423" depends="undeploy-jboss423,prepare-deploy42" description="Deploy jbossws to jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ </copy>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="prepare-deploy42" depends="jars">
+
+ <delete dir="${core.output.deploy.dir}-src"/>
+ <delete dir="${core.output.deploy.dir}"/>
+
+ <!-- Copy all artifacts to a flat deploy src -->
+ <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
+ <copy todir="${core.output.deploy.dir}-src/lib">
+ <fileset dir="${thirdparty.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="jbossws-context.war"/>
+ </fileset>
+ </copy>
+ <copy todir="${core.output.deploy.dir}-src/resources">
+ <fileset dir="${core.output.resources.dir}">
+ <include name="standard-*-config.xml"/>
+ <include name="jbossws-native42-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Create the deployment structure -->
+ <antcall target="deploy-jbossws-native42" inheritall="false">
+ <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
+ <param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/>
+ </antcall>
+
+ <!-- Create jbossws.deployed.files -->
+ <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws.deployed.files" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws.deployed.files" token=";" value=" "/>
+ </target>
+
+</project>
Added: stack/native/trunk/ant-import/build-deploy50.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy50.xml (rev 0)
+++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -0,0 +1,104 @@
+<?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>
+
+ <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
+
+ <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss500" depends="undeploy-jboss500,prepare-deploy50" description="Deploy jbossws to jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ </copy>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss501" depends="undeploy-jboss501,prepare-deploy50" description="Deploy jbossws to jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment JBoss-5.0.x -->
+ <!-- ================================================================== -->
+
+ <target name="prepare-deploy50" depends="jars">
+
+ <delete dir="${core.output.deploy.dir}-src"/>
+ <delete dir="${core.output.deploy.dir}"/>
+
+ <!-- Copy all artifacts to a flat deploy src -->
+ <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
+ <copy todir="${core.output.deploy.dir}-src/lib">
+ <fileset dir="${thirdparty.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="jbossws-context.war"/>
+ </fileset>
+ </copy>
+ <copy todir="${core.output.deploy.dir}-src/resources">
+ <fileset dir="${core.output.resources.dir}">
+ <include name="standard-*-config.xml"/>
+ <include name="jbossws-native50-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Create the deployment structure -->
+ <antcall target="deploy-jbossws-native50" inheritall="false">
+ <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
+ <param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/>
+ </antcall>
+
+ <!-- Create jbossws.deployed.files -->
+ <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws.deployed.files" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws.deployed.files" token=";" value=" "/>
+ </target>
+
+</project>
Property changes on: stack/native/trunk/ant-import/build-deploy50.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-11 10:52:40 UTC (rev 5914)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -35,7 +35,7 @@
<echo message="*********************************************"/>
</target>
- <target name="release-to-repository" depends="jars,check-svn-externals,warn-svn-externals"
+ <target name="release-to-repository" depends="prepare-deploy50,check-svn-externals,warn-svn-externals"
description="Release to jboss.local.repository">
<!-- jboss/jbossws-native -->
@@ -46,8 +46,8 @@
<copy todir="${jboss.repository.dir}/jbossws/${repository.id}/bin" overwrite="true">
<fileset dir="${core.output.etc.dir}">
<include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
<include name="wstools.bat"/>
- <include name="wsrunclient.sh"/>
<include name="wstools.sh"/>
</fileset>
</copy>
@@ -64,12 +64,19 @@
</fileset>
</copy>
<copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true">
- <fileset dir="${core.resources.dir}/standard-config">
+ <fileset dir="${core.output.resources.dir}">
<include name="standard-*-config.xml"/>
</fileset>
- <fileset dir="${core.resources.dir}">
- <include name="jbossws-native-config.xml"/>
+ <fileset dir="${core.output.resources.dir}">
+ <include name="jbossws-native42-beans.xml"/>
+ <include name="jbossws-native50-beans.xml"/>
</fileset>
+ <fileset dir="${basedir}/ant-import">
+ <include name="jbossws-deploy-macros.xml"/>
+ </fileset>
+ <fileset dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
+ <include name="jbossws.deployed.files"/>
+ </fileset>
</copy>
<copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
Added: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml (rev 0)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -0,0 +1,267 @@
+<?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>
+
+ <!--
+ These patterns should be common for all supported containers
+ Exceptions must be defined in the individual deploy macros.
+ -->
+ <patternset id="jbossws.bin.patternset">
+ <include name="**/wsconsume.bat"/>
+ <include name="**/wsconsume.sh"/>
+ <include name="**/wsprovide.bat"/>
+ <include name="**/wsprovide.sh"/>
+ <include name="**/wsrunclient.bat"/>
+ <include name="**/wsrunclient.sh"/>
+ <include name="**/wstools.bat"/>
+ <include name="**/wstools.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/jbossws-client.jar"/>
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ <include name="**/policy.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.patternset">
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.endorsed.patternset">
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.server.lib.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/jboss-jaxb-intros.jar"/>
+ <include name="**/jbossws-core.jar"/>
+ <include name="**/policy.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/xmlsec.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Bin -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-bin">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.bin.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-lib">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib Endorsed -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-endorsed">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Client -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-client">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.client.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Server Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-server-lib">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-native42-sar">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="**/jbossws-native42-beans.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="**/standard-jaxrpc-*-config.xml"/>
+ <include name="**/standard-jaxws-*-config.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-native50-sar">
+ <attribute name="thirdpartylibs"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="**/standard-jaxrpc-*-config.xml"/>
+ <include name="**/standard-jaxws-*-config.xml"/>
+ <include name="**/jbossws-native50-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartylibs="${thirdpartylibs}"/>
+ </target>
+
+ <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartylibs="${thirdpartylibs}"/>
+ <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartylibs="${thirdpartylibs}"/>
+ </target>
+
+ <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartylibs="${thirdpartylibs}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws">
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.undeploy.files" srcfile="@{targetdir}/jbossws.deployed.files" failonerror="false"/>
+ <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
+ <delete>
+ <fileset dir="@{targetdir}/../../../.." includes="${jbossws.undeploy.files}"/>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Property changes on: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/ant-import/jbossws.default.undeploy.files
===================================================================
--- stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 10:52:40 UTC (rev 5914)
+++ stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:02:15 UTC (rev 5915)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
\ No newline at end of file
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Deleted: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-03-11 10:52:40 UTC (rev 5914)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -1,380 +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: macros-deploy-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <!--
- These patterns should be common for all supported containers
- Exceptions must be defined in the individual deploy macros.
- -->
- <patternset id="client.patternset">
- <include name="jbossws-client.jar"/>
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </patternset>
-
- <patternset id="lib.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </patternset>
-
- <patternset id="lib.endorsed.patternset">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jaxb-api.jar"/>
- </patternset>
-
- <patternset id="server.lib.patternset">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deploy Endorsed -->
- <!-- ================================================================== -->
-
- <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
- <macrodef name="macro-deploy-endorsed">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <mkdir dir="${deploy.dir}/lib/endorsed"/>
- <copy todir="${deploy.dir}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.endorsed.patternset"/>
- </fileset>
- <fileset dir="@{stacklibs}">
- <patternset refid="lib.endorsed.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Framework -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>
-
- <!-- CLIENT JARS-->
- <copy todir="${deploy.dir}/client">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- SERVER LIB JARS-->
- <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="server.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws">
- <attribute name="jbosshome"/>
- <attribute name="sarname"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- Deploy the sars -->
- <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/@{sarname}"/>
- <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
-
- <!-- Deploy the jars -->
- <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/>
- <copy todir="@{jbosshome}" overwrite="true">
- <fileset refid="jbossws.deploy.files"/>
- </copy>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- Write jbossws.deployed.files -->
- <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
- <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/>
- <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/>
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Undeploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-undeploy-jbossws">
- <attribute name="jbosshome"/>
- <sequential>
-
- <delete dir="${deploy.dir}"/>
-
- <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/>
- <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
- <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <delete>
- <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/>
- </delete>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.1 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native421">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
-
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
-
- <!-- BIN SCRIPTS -->
- <mkdir dir="${deploy.dir}/bin"/>
- <unzip dest="${deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
-
- <!-- CLIENT JARS -->
- <mkdir dir="${deploy.dir}/client"/>
- <copy todir="${deploy.dir}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
-
- <!-- LIB JARS -->
- <mkdir dir="${deploy.dir}/lib"/>
- <copy todir="${deploy.dir}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER LIB JARS -->
- <mkdir dir="${deploy.dir}/server/${jboss.server.instance}/lib"/>
- <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- </copy>
-
- <macro-deploy-jbossws jbosshome="${jboss421.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
-
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native421">
- <sequential>
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss421.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native42x">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <mkdir dir="${deploy.dir}/bin"/>
- <unzip dest="${deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
-
- <!-- CLIENT JARS -->
- <mkdir dir="${deploy.dir}/client"/>
- <copy todir="${deploy.dir}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.2 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native422">
- <sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss422.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.3 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native423">
- <sequential>
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss423.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.x -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native50x">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <mkdir dir="${deploy.dir}/bin"/>
- <unzip dest="${deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
-
- <!-- CLIENT JARS -->
- <mkdir dir="${deploy.dir}/client"/>
- <copy todir="${deploy.dir}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- LIB JARS -->
- <mkdir dir="${deploy.dir}/lib"/>
- <copy todir="${deploy.dir}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="server.lib.patternset"/>
- </fileset>
- </copy>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.0 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native500">
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss500.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.1 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native501">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native501">
- <sequential>
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss501.home}"/>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-03-11 10:52:40 UTC (rev 5914)
+++ stack/native/trunk/build.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -93,7 +93,8 @@
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-deploy42.xml"/>
+ <import file="${basedir}/ant-import/build-deploy50.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
@@ -110,6 +111,7 @@
<property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
<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"/>
<target name="init" depends="prepare,thirdparty">
</target>
@@ -126,7 +128,7 @@
| documentation compiles.
-->
- <target name="compile" depends="init,compile-classes,compile-etc"
+ <target name="compile" depends="init,compile-classes,compile-etc,compile-resources"
description="Compile all source files."/>
<!-- Compile java sources -->
@@ -171,6 +173,41 @@
</copy>
</target>
+ <!-- Compile resource files -->
+ <target name="compile-resources" depends="init">
+
+ <!-- Concat jbossws-native50-beans.xml -->
+ <mkdir dir="${core.output.resources.dir}"/>
+ <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>
+
+ <!-- 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>
+
+ <copy todir="${core.output.resources.dir}">
+ <fileset dir="${core.resources.dir}/standard-config">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
@@ -178,14 +215,8 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files.">
- </target>
+ <target name="jars" depends="compile" description="Builds all jar files.">
- <!--
- | Build all jar files.
- -->
- <target name="jars-common" depends="compile">
-
<!-- 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">
@@ -332,89 +363,6 @@
</target>
- <target name="jars-jboss50" depends="jars-common">
-
- <!-- Concat jbossws-beans.xml -->
- <concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-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>
-
- <!-- Build jbossws-native50.sar -->
- <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.lib.dir}">
- <include name="jbossws-context.war"/>
- <include name="jbossws-core.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="policy.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="xmlsec.jar"/>
- <include name="jboss-jaxb-intros.jar"/>
- </fileset>
- <metainf dir="${core.dir}/src/main/resources/standard-config">
- <include name="standard-*-config.xml"/>
- </metainf>
- <metainf dir="${core.output.lib.dir}/jbossws-native50">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
-
- </target>
-
- <target name="jars-jboss42" depends="jars-common">
-
- <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
-
- <!-- Concat jboss-beans.xml -->
- <concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-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.dir}/resources/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-native42.sar -->
- <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.lib.dir}">
- <include name="jbossws-context.war"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-core.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="policy.jar"/>
- <include name="stax-api.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="xmlsec.jar"/>
- <include name="wstx.jar"/>
- <include name="jboss-jaxb-intros.jar"/>
- </fileset>
- <fileset dir="${core.output.lib.dir}/jbossws-native42">
- <include name="jbossws.beans/**"/>
- </fileset>
- <metainf dir="${core.output.dir}/resources/jbossws-jboss42.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- <metainf dir="${core.dir}/src/main/resources/standard-config">
- <include name="standard-*-config.xml"/>
- </metainf>
- </jar>
- </target>
-
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/etc/component-info.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 10:52:40 UTC (rev 5914)
+++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 14:02:15 UTC (rev 5915)
@@ -17,7 +17,8 @@
<artifact id="standard-jaxrpc-endpoint-config.xml"/>
<artifact id="standard-jaxws-client-config.xml"/>
<artifact id="standard-jaxws-endpoint-config.xml"/>
- <artifact id="jbossws-native-config.xml"/>
+ <artifact id="jbossws-native50-beans.xml"/>
+ <artifact id="jbossws-deploy-macros.xml"/>
<artifact id="wsrunclient.bat"/>
<artifact id="wsrunclient.sh"/>
<artifact id="wstools.bat"/>
17 years, 10 months
- 1
- 0