From 9e8ced88f2e93b59cd98a2f27aeefe957c410899 Mon Sep 17 00:00:00 2001
From: Shane Bryzak <sbryzak@gmail.com>
Date: Mon, 21 Mar 2011 08:53:29 +1000
Subject: [PATCH] update distribution dependencies

---
 dist/pom.xml | 52 +++++++++++++++++++++++++++++++---------------------
 pom.xml      | 13 +++++++++++++
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index b048712..05bff88 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -59,13 +59,6 @@
          <version>1.1</version>
       </dependency>      
       
-      <!-- Remove once remoting uses ales' new conversation module -->
-      <dependency>
-         <groupId>org.jboss.weld</groupId>
-         <artifactId>weld-core</artifactId>
-         <version>1.1.0.CR3</version>         
-      </dependency>      
-
       <dependency>
          <!-- JBoss Java EE 6.0 spec bom uses wrong groupId
          <groupId>javax.faces</groupId>
@@ -98,7 +91,12 @@
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
-      </dependency>      
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+      </dependency>
    
       <!-- Seam Modules -->
       
@@ -122,6 +120,12 @@
          <version>${seam.catch.version}</version>
          <type>zip</type>
          <optional>true</optional>
+         <exclusions>
+            <exclusion>
+               <groupId>jstl</groupId>
+               <artifactId>jstl</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>      
 
       <!-- Seam Config -->
@@ -145,6 +149,12 @@
          <version>${seam.config.version}</version>
          <type>zip</type>
          <optional>true</optional>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.weld.servlet</groupId>
+               <artifactId>weld-servlet</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       
       <!-- Seam Persistence -->
@@ -239,7 +249,7 @@
 
       <dependency>
          <groupId>org.jboss.seam.remoting</groupId>
-         <artifactId>seam-remoting-helloworld-example</artifactId>
+         <artifactId>seam-remoting-example-helloworld</artifactId>
          <version>${seam.remoting.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -247,7 +257,7 @@
 
       <dependency>
          <groupId>org.jboss.seam.remoting</groupId>
-         <artifactId>seam-remoting-model-example</artifactId>
+         <artifactId>seam-remoting-example-model</artifactId>
          <version>${seam.remoting.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -255,7 +265,7 @@
       
       <dependency>
          <groupId>org.jboss.seam.remoting</groupId>
-         <artifactId>seam-remoting-validation-example</artifactId>
+         <artifactId>seam-remoting-example-validation</artifactId>
          <version>${seam.remoting.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -274,26 +284,26 @@
          <classifier>sources</classifier>
          <version>${seam.rest.version}</version>
       </dependency>      
-      
+
       <dependency>
          <groupId>org.jboss.seam.rest</groupId>
-         <artifactId>seam-tasks-example</artifactId>
+         <artifactId>seam-rest-example-client</artifactId>
          <version>${seam.rest.version}</version>
          <type>zip</type>
          <optional>true</optional>
-      </dependency>     
+      </dependency>
       
       <dependency>
          <groupId>org.jboss.seam.rest</groupId>
-         <artifactId>seam-tasks-statistics-example</artifactId>
+         <artifactId>seam-rest-example-tasks</artifactId>
          <version>${seam.rest.version}</version>
          <type>zip</type>
          <optional>true</optional>
-      </dependency>  
+      </dependency>     
       
       <dependency>
          <groupId>org.jboss.seam.rest</groupId>
-         <artifactId>seam-jaxrs-exceptions-example</artifactId>
+         <artifactId>seam-rest-example-exceptions</artifactId>
          <version>${seam.rest.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -327,7 +337,7 @@
       
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
-         <artifactId>seam-security-simple-example</artifactId>
+         <artifactId>seam-security-example-simple</artifactId>
          <version>${seam.security.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -335,7 +345,7 @@
       
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
-         <artifactId>seam-security-idmconsole-example</artifactId>
+         <artifactId>seam-security-example-idmconsole</artifactId>
          <version>${seam.security.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -343,7 +353,7 @@
       
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
-         <artifactId>openid-rp</artifactId>
+         <artifactId>seam-security-example-openid-rp</artifactId>
          <version>${seam.security.version}</version>
          <type>zip</type>
          <optional>true</optional>
@@ -393,7 +403,7 @@
 
       <dependency>
          <groupId>org.jboss.seam.validation</groupId>
-         <artifactId>seam-validation-example</artifactId>
+         <artifactId>seam-validation-example-helloworld</artifactId>
          <version>${seam.validation.version}</version>
          <type>zip</type>
          <optional>true</optional>
diff --git a/pom.xml b/pom.xml
index 8d10d6d..f13ac4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
       <hibernate.core.version>3.6.0.Final</hibernate.core.version>
       <hibernate.search.version>3.3.0.Final</hibernate.search.version>
       <drools.version>5.1.1</drools.version>
+      <jboss.logmanager.version>1.2.0.CR4</jboss.logmanager.version>
       <jbpm.version>4.2</jbpm.version>
       <picketlink.idm.version>1.5.0.Alpha02</picketlink.idm.version>
       <joda.time.version>1.6</joda.time.version>
@@ -197,6 +198,12 @@
             <version>${picketlink.idm.version}</version>
          </dependency>
 
+         <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>jboss-logmanager</artifactId>
+            <version>${jboss.logmanager.version}</version>
+         </dependency>
+
          <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -462,6 +469,12 @@
             <scope>provided</scope>
          </dependency>
 
+         <dependency>
+            <groupId>org.jboss.seam.validation</groupId>
+            <artifactId>seam-validation</artifactId>
+            <version>${seam.validation.version}</version>
+         </dependency>
+
          <dependency>
             <groupId>org.jboss.seam.validation</groupId>
             <artifactId>seam-validation-api</artifactId>