[jboss-cvs] JBossAS SVN: r69038 - in trunk: embedded and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2008-01-16 12:42:46 -0500 (Wed, 16 Jan 2008)
New Revision: 69038

Modified:
   trunk/embedded/pom.xml
   trunk/pom.xml
   trunk/security/pom.xml
Log:
[JBBUILD-442] Applying slightly modified patch from Pether Sorling.

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2008-01-16 16:38:03 UTC (rev 69037)
+++ trunk/embedded/pom.xml	2008-01-16 17:42:46 UTC (rev 69038)
@@ -20,12 +20,21 @@
 				<directory>src/resources</directory>
 			</resource>
 		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 	<dependencies>
 		<!-- Compile (global dependencies) -->
 		<dependency>
 			<groupId>org.jboss.security</groupId>
-			<artifactId>jboss-security-spi</artifactId>
+   			<artifactId>jboss-security-spi</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss</groupId>
@@ -36,8 +45,8 @@
 			<artifactId>hibernate-annotations</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>hibernate-entitymanager</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>hibernate</groupId>
@@ -84,12 +93,10 @@
 			<groupId>org.jboss.jbossas</groupId>
 			<artifactId>jboss-as-ejb3</artifactId>
 		</dependency>
-		<!--
 		<dependency>
 			<groupId>org.jboss.jbossas</groupId>
 			<artifactId>jboss-as-tomcat</artifactId>
 		</dependency>
-		-->
 		<dependency>
 			<groupId>org.jboss.jbossas</groupId>
 			<artifactId>jboss-as-system-jmx</artifactId>
@@ -105,7 +112,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<scope>test</scope>
+			<scope>compile</scope>			
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossas</groupId>
@@ -156,9 +163,9 @@
 			<artifactId>jboss-jca-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jbosssx-client</artifactId>
-		</dependency>
+			<groupId>org.jboss.security</groupId>
+			<artifactId>jbosssx-client</artifactId>			
+		</dependency>		
 		<dependency>
 			<groupId>org.jboss.microcontainer</groupId>
 			<artifactId>jboss-container</artifactId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-01-16 16:38:03 UTC (rev 69037)
+++ trunk/pom.xml	2008-01-16 17:42:46 UTC (rev 69038)
@@ -49,8 +49,11 @@
 		<module>webservices</module>
 		<module>hibernate-int</module>
 		<module>console</module>
-		<module>build</module>
-		<!-- <module>embedded</module> -->
+		<module>build</module>		
+		<module>embedded</module>
+		<!-- <module>spring-int</module>
+		<module>jmx-remoting</module>
+		<module>testsuite</module> -->
 	</modules>
 	
   <properties>
@@ -291,6 +294,16 @@
 				<version>${version.org.jboss.security}</version>
 			</dependency>
 			<dependency>
+				<groupId>org.jboss.security</groupId>
+				<artifactId>jboss-security-spi</artifactId>
+				<version>${version.org.jboss.security}</version>
+			</dependency>			
+			<dependency>
+				<groupId>org.jboss.security</groupId>
+				<artifactId>identity-impl</artifactId>
+				<version>${version.org.jboss.security}</version>
+			</dependency>			
+			<dependency>
 				<groupId>jboss</groupId>
 				<artifactId>jboss-serialization</artifactId>
 				<version>1.0.3.GA</version>
@@ -674,6 +687,11 @@
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
+				<groupId>org.jboss.jbossas</groupId>
+				<artifactId>jboss-as-tomcat</artifactId>
+				<version>${project.version}</version>
+			</dependency>			
+			<dependency>
 				<groupId>org.jboss.microcontainer</groupId>
 				<artifactId>jboss-aop-mc-int</artifactId>
 				<version>${version.org.jboss.microcontainer}</version>

Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml	2008-01-16 16:38:03 UTC (rev 69037)
+++ trunk/security/pom.xml	2008-01-16 17:42:46 UTC (rev 69038)
@@ -32,6 +32,10 @@
 			<artifactId>identity-impl</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.jboss.security</groupId>
+			<artifactId>identity-impl</artifactId>
+		</dependency>			
+		<dependency>
 			<groupId>org.jboss</groupId>
 			<artifactId>jboss-common-core</artifactId>
 		</dependency>