Index: pom.xml
===================================================================
--- pom.xml	(revision 97311)
+++ pom.xml	(working copy)
@@ -22,161 +22,197 @@
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-aspects</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-aspects</artifactId>
       <classifier>jboss-aspect-library</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-cluster</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
       <classifier>jboss-common-jdbc-wrapper</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
       <classifier>jboss-jca</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
       <classifier>jboss-jca-deployer</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
       <classifier>jboss-local-jdbc</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-console</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-deployment</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-deployment</artifactId>
       <classifier>jboss-jsr88</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-ejb3</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-ejb3</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-hibernate-int</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-iiop</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-jbossas-jmx-remoting</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-jbossas-remoting</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-jmx-remoting</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-main</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-management</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-management</artifactId>
       <classifier>ejb-management</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-management</artifactId>
       <classifier>jsr77</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-management</artifactId>
       <classifier>jsr77-client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-profileservice</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-security</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-server</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-server</artifactId>
       <classifier>jboss</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-server</artifactId>
       <classifier>jmx-adaptor-plugin</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-system</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-system-jmx</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-tomcat</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-tomcat</artifactId>
       <classifier>jboss-web-service</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-tomcat</artifactId>
       <classifier>jboss-web-deployer</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-varia</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-varia</artifactId>
       <classifier>jboss-srp</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-webservices</artifactId>
+      <optional>true</optional>
     </dependency>
     <!-- End module dependencies -->
 
@@ -184,372 +220,461 @@
     <dependency>
       <groupId>apache-avalon-logkit</groupId>
       <artifactId>logkit</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>apache-bsf</groupId>
       <artifactId>bsf</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>apache-scout</groupId>
       <artifactId>scout</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>apache-xalan</groupId>
       <artifactId>serializer</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>apache-xalan</groupId>
       <artifactId>xalan</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>apache-xerces</groupId>
       <artifactId>resolver</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-rt</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-tools</artifactId>
+      <optional>true</optional>
     </dependency>    
     <dependency>
       <groupId>jacorb</groupId>
       <artifactId>jacorb</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jacorb</groupId>
       <artifactId>resources</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.enterprise</groupId>
       <artifactId>cdi-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jaxbintros</groupId>
       <artifactId>jboss-jaxb-intros</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossjts</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossjts-integration</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossjts-jacorb</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossts-common</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossts-tools</artifactId>
       <type>sar</type>
       <scope>runtime</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossxts</artifactId>
       <type>sar</type>
       <scope>runtime</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>resources</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.messaging</groupId>
       <artifactId>jboss-messaging</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.messaging</groupId>
       <artifactId>jboss-messaging-client</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.messaging</groupId>
       <artifactId>resources</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss.web</groupId>
       <artifactId>el-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>juddi</groupId>
       <artifactId>juddi</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-lgpl</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop-deployers</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-impl-as</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-impl-base</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-impl-mc</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-spi</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-spi-as</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-spi-mc</artifactId>
+      <optional>true</optional>
     </dependency>    
     <dependency>
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-pojo</artifactId>
+      <optional>true</optional>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-common</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-clustered</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-impl</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-spi</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-security</artifactId>
       <classifier>client</classifier>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.interceptor</groupId>
       <artifactId>jboss-interceptor-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-javaee</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.jaxr</groupId>
       <artifactId>juddi-service</artifactId>
       <type>sar</type>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-jdk</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-logmanager</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-log4j</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-spi</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>logging-service-metadata</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logmanager</groupId>
       <artifactId>jboss-logmanager</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.logmanager</groupId>
       <artifactId>jboss-logmanager-log4j</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.seam.integration</groupId>
       <artifactId>jboss-seam-int-jbossas</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation</artifactId>              
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.slf4j</groupId>
       <artifactId>slf4j-jboss-logging</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.slf4j</groupId>
       <artifactId>slf4j-jboss-logmanager</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.threads</groupId>
       <artifactId>jboss-threads</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.threads</groupId>
       <artifactId>jboss-threads-metadata</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld.integration</groupId>
       <artifactId>weld-jboss-int-deployer-assembly</artifactId>
       <type>zip</type>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.snowdrop</groupId>
       <artifactId>snowdrop</artifactId>
       <type>zip</type>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld</groupId>
       <artifactId>weld-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-client</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-management</artifactId>
       <type>war</type>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-core</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-jaxrpc</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-jaxws</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-jaxws-ext</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-resources</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-saaj</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.xnio</groupId>
       <artifactId>xnio-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.xnio</groupId>
       <artifactId>xnio-nio</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jboss.xnio</groupId>
       <artifactId>xnio-metadata</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>osgi_R4_core</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>snmptrapappender</groupId>
       <artifactId>snmpTrapAppender</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>sun-fi</groupId>
       <artifactId>FastInfoset</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>sun-fi</groupId>
       <artifactId>FastInfosetUtilities</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>sun-jaxb</groupId>
       <artifactId>jaxb-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>sun-jaxws</groupId>
       <artifactId>stax-ex</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.stream.buffer</groupId>
       <artifactId>streambuffer</artifactId>
+      <optional>true</optional>
     </dependency>    
     <dependency>
       <groupId>wscommons-policy</groupId>
       <artifactId>policy</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>wutka-dtdparser</groupId>
       <artifactId>dtdparser</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
+      <optional>true</optional>
     </dependency>
     
     <!-- End dist dependencies -->