Author: alessio.soldano(a)jboss.com
Date: 2010-05-05 14:27:39 -0400 (Wed, 05 May 2010)
New Revision: 12169
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-tp-installer.xml
Log:
[JBPAPP-3267] Re-enabling libraries previously commented in assembly-deploy-artifacts.xml
to get a correct installation throught 'ant deploy-jboss510' and adding
corresponding excludes to assembly-tp-installer.xml for preventing the uncommented libs to
go into tp installer.
Testsuite passing.
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 2010-05-05
17:01:02 UTC (rev 12168)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-05
18:27:39 UTC (rev 12169)
@@ -39,16 +39,16 @@
<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>org.objectweb.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>
-->
- <!-- <include>wsdl4j:wsdl4j:jar</include> -->
+ <include>sun-fi:FastInfoset:jar</include>
+ <include>org.apache:xmlsec:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -93,10 +93,9 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <!-- Do not include juddi-service as it has not changed
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
- <include>juddi:juddi:jar</include> -->
+ <include>juddi:juddi:jar</include>
</includes>
</dependencySet>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2010-05-05
17:01:02 UTC (rev 12168)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2010-05-05
18:27:39 UTC (rev 12169)
@@ -57,6 +57,18 @@
<exclude>**/mail.jar</exclude>
<exclude>**/stax-api.jar</exclude>
<exclude>**/wstx.jar</exclude>
+ <exclude>**/lib/jbossws-spi.jar</exclude>
+ <exclude>**/lib/jbossws-common.jar</exclude>
+ <exclude>**/lib/jbossws-framework.jar</exclude>
+ <exclude>**/lib/xml-resolver.jar</exclude>
+ <exclude>**/lib/asm.jar</exclude>
+ <exclude>**/lib/commons-collections.jar</exclude>
+ <exclude>**/lib/FastInfoset.jar</exclude>
+ <exclude>**/lib/xmlsec.jar</exclude>
+ <exclude>**/lib/wsdl4j.jar</exclude>
+ <exclude>**/lib/juddi-service.sar</exclude>
+ <exclude>**/lib/scout.jar</exclude>
+ <exclude>**/lib/juddi.jar</exclude>
</excludes>
</fileSet>
</fileSets>