Author: fnasser(a)redhat.com
Date: 2009-12-07 16:16:42 -0500 (Mon, 07 Dec 2009)
New Revision: 11198
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Do not overwrite JARs that are already there and prevent MD5 differences between client
and common/lib
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-04
17:23:37 UTC (rev 11197)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-07
21:16:42 UTC (rev 11198)
@@ -26,22 +26,28 @@
</patternset>
<patternset id="jbossws.client.patternset">
- <include name="**/asm.jar"/>
<include name="**/cxf-*.jar"/>
- <include name="**/commons-collections.jar"/>
<include name="**/commons-lang.jar"/>
- <include name="**/jbossws-common.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/jdom.jar"/>
+ <!-- <include name="**/jdom.jar"/> -->
<include name="**/neethi.jar"/>
<include name="**/spring-beans.jar"/>
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
- <include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/velocity.jar"/>
+ <!-- <include name="**/asm.jar"/> -->
+ <include name="${installserver}/../../common/lib/asm.jar"/>
+ <!-- <include name="**/commons-collections.jar"/> -->
+ <include
name="${installserver}/../../common/lib/commons-collections.jar"/>
+ <!-- Do not replace these until they are really different
+ from the ones shipped with the JBoss ative EAP AS
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ -->
+ <!-- Already in the AS endorsed dir -->
+ <!-- <include name="**/xml-resolver.jar"/> -->
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -53,20 +59,23 @@
</patternset>
<patternset id="jbossws.server.lib.patternset">
+ <include name="**/nothing-to-deploy"/>
+ <!-- Do not replace these until they are really different
+ from the ones shipped with the JBoss ative EAP AS
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-spi.jar"/>
+ -->
</patternset>
<patternset id="jbossws.service.lib.patternset">
<include name="**/cxf-*.jar"/>
- <!-- <include name="**/geronimo-javamail*.jar"/> -->
<include name="**/geronimo-ws-metadata*.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
- <include name="**/jdom.jar"/>
+ <!-- <include name="**/jdom.jar"/> -->
<include name="**/neethi.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
@@ -74,8 +83,6 @@
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
<include name="**/wss4j.jar"/>
- <include name="**/xml-resolver.jar"/>
- <include name="**/asm.jar"/>
<include name="**/XmlSchema.jar"/>
<!-- <include name="**/FastInfoset.jar"/> -->
<include name="${installserver}/../../client/FastInfoset.jar"/>
@@ -83,6 +90,11 @@
<include name="${installserver}/../../client/xmlsec.jar"/>
<!-- <include name="**/wsdl4j.jar"/> -->
<include name="${installserver}/../../client/wsdl4j.jar"/>
+ <!-- Already in the AS common/lib -->
+ <!-- <include name="**/asm.jar"/> -->
+ <!-- <include name="**/geronimo-javamail*.jar"/> -->
+ <!-- Already in the AS endorsed dir -->
+ <!-- <include name="**/xml-resolver.jar"/> -->
</patternset>
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-04
17:23:37 UTC (rev 11197)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-07
21:16:42 UTC (rev 11198)
@@ -23,14 +23,14 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.cxf:cxf-*</include>
- <include>javax.mail:mail*</include>
+ <!-- <include>javax.mail:mail*</include> -->
<include>org.apache.geronimo.specs:geronimo-ws-metadata*</include>
<include>javax.xml.bind:jaxb-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
<include>javax.xml:jaxrpc-api:jar</include>
- <include>org.jboss.ws:jbossws-common:jar</include>
- <include>org.jboss.ws:jbossws-spi:jar</include>
+ <!-- <include>org.jboss.ws:jbossws-spi:jar</include> -->
+ <!-- <include>org.jboss.ws:jbossws-common:jar</include>
-->
<include>junit:junit:jar</include>
<include>org.apache.neethi:neethi:jar</include>
<include>javax.xml.soap:saaj-api:jar</include>
@@ -38,12 +38,12 @@
<include>org.springframework:spring-beans:jar</include>
<include>org.springframework:spring-context:jar</include>
<include>org.springframework:spring-core:jar</include>
- <include>xml-resolver:xml-resolver:jar</include>
+ <!-- <include>xml-resolver:xml-resolver:jar</include>
-->
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
- <include>asm:asm:jar</include>
+ <!-- <include>asm:asm:jar</include> -->
<include>apache-velocity:velocity:jar</include>
- <include>commons-collections:commons-collections:jar</include>
+ <!--
<include>commons-collections:commons-collections:jar</include> -->
<include>commons-lang:commons-lang:jar</include>
<!--
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include> -->
<!-- <include>org.apache.santuario:xmlsec:jar</include>
-->
Show replies by date