[gatein-commits] gatein SVN: r8137 - in components/sso/trunk: agent and 4 other directories.

[do-not-reply at jboss.org]

Author: mposolda
Date: 2011-11-24 09:39:01 -0500 (Thu, 24 Nov 2011)
New Revision: 8137

Modified:
   components/sso/trunk/agent/pom.xml
   components/sso/trunk/packaging/pom.xml
   components/sso/trunk/packaging/src/main/assembly/src.xml
   components/sso/trunk/packaging/src/main/resources/README
   components/sso/trunk/pom.xml
   components/sso/trunk/spnego/pom.xml
Log:
GTNPORTAL-2294 packaging improvement for SPNEGO

Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml	2011-11-24 13:58:33 UTC (rev 8136)
+++ components/sso/trunk/agent/pom.xml	2011-11-24 14:39:01 UTC (rev 8137)
@@ -62,17 +62,15 @@
 			<groupId>org.josso</groupId>
 			<artifactId>josso-protocol-client</artifactId>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.jboss.security</groupId>
-			<artifactId>jboss-negotiation-spnego</artifactId>				
-		</dependency>
+      <dependency>
+         <groupId>org.jboss.security</groupId>
+         <artifactId>jboss-negotiation-spnego</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.security</groupId>
+         <artifactId>jacc</artifactId>
+      </dependency>
 
-                        <dependency>
-                                <groupId>javax.security</groupId>
-                                <artifactId>jacc</artifactId>
-                        </dependency>
-
 	</dependencies>
 
 	<build>

Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml	2011-11-24 13:58:33 UTC (rev 8136)
+++ components/sso/trunk/packaging/pom.xml	2011-11-24 14:39:01 UTC (rev 8137)
@@ -23,7 +23,7 @@
                 </dependency>
                 <dependency>
                         <groupId>org.jboss.security</groupId>
-                        <artifactId>jboss-negotiation-spnego</artifactId>
+                        <artifactId>jboss-negotiation</artifactId>
                 </dependency>
          </dependencies>
 

Modified: components/sso/trunk/packaging/src/main/assembly/src.xml
===================================================================
--- components/sso/trunk/packaging/src/main/assembly/src.xml	2011-11-24 13:58:33 UTC (rev 8136)
+++ components/sso/trunk/packaging/src/main/assembly/src.xml	2011-11-24 14:39:01 UTC (rev 8137)
@@ -45,7 +45,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
-        <include>org.jboss.security:jboss-negotiation-spnego</include>
+        <include>org.jboss.security:jboss-negotiation</include>
       </includes>
     </dependencySet>
 

Modified: components/sso/trunk/packaging/src/main/resources/README
===================================================================
--- components/sso/trunk/packaging/src/main/resources/README	2011-11-24 13:58:33 UTC (rev 8136)
+++ components/sso/trunk/packaging/src/main/resources/README	2011-11-24 14:39:01 UTC (rev 8137)
@@ -6,6 +6,7 @@
  - OpenSSO
  - JOSSO
  - CAS
+ - SPNEGO
  
 Please refer to the GateIn Portal documentation for usage of the embedded files.
 

Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml	2011-11-24 13:58:33 UTC (rev 8136)
+++ components/sso/trunk/pom.xml	2011-11-24 14:39:01 UTC (rev 8137)
@@ -204,17 +204,21 @@
 			</dependency>
 			
 			<!-- SPNEGO support using JBoss Negotiation -->
-			<dependency>
-				<groupId>org.jboss.security</groupId>
-				<artifactId>jboss-negotiation-spnego</artifactId>
-				<version>${version.jboss.negotiation}</version>
-			</dependency>
-
-                        <dependency>
-                                <groupId>javax.security</groupId>
-                                <artifactId>jacc</artifactId>
-                                <version>1.0</version>
-                        </dependency>
+         <dependency>
+            <groupId>org.jboss.security</groupId>
+            <artifactId>jboss-negotiation-spnego</artifactId>
+            <version>${version.jboss.negotiation}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.security</groupId>
+            <artifactId>jboss-negotiation</artifactId>
+            <version>${version.jboss.negotiation}</version>
+         </dependency>
+         <dependency>
+            <groupId>javax.security</groupId>
+            <artifactId>jacc</artifactId>
+            <version>1.0</version>
+         </dependency>
 		</dependencies>
 	</dependencyManagement>
 

Modified: components/sso/trunk/spnego/pom.xml
===================================================================
--- components/sso/trunk/spnego/pom.xml	2011-11-24 13:58:33 UTC (rev 8136)
+++ components/sso/trunk/spnego/pom.xml	2011-11-24 14:39:01 UTC (rev 8137)
@@ -23,7 +23,7 @@
 		</dependency>			
 		<dependency>
 			<groupId>org.jboss.security</groupId>
-			<artifactId>jboss-negotiation-spnego</artifactId>				
+			<artifactId>jboss-negotiation-spnego</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.gatein.sso</groupId>