[jboss-cvs] JBossAS SVN: r68533 - in projects/security/security-jboss-sx/trunk: acl and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 21 18:37:01 EST 2007
Author: pgier
Date: 2007-12-21 18:37:01 -0500 (Fri, 21 Dec 2007)
New Revision: 68533
Added:
projects/security/security-jboss-sx/trunk/assembly/pom.xml
projects/security/security-jboss-sx/trunk/assembly/src/
projects/security/security-jboss-sx/trunk/assembly/src/assembly/
projects/security/security-jboss-sx/trunk/assembly/src/assembly/bin.xml
projects/security/security-jboss-sx/trunk/assembly/src/assembly/sources.xml
Removed:
projects/security/security-jboss-sx/trunk/assembly/bin.xml
projects/security/security-jboss-sx/trunk/assembly/sources.xml
Modified:
projects/security/security-jboss-sx/trunk/acl/pom.xml
projects/security/security-jboss-sx/trunk/identity/pom.xml
projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml
projects/security/security-jboss-sx/trunk/jbosssx/pom.xml
projects/security/security-jboss-sx/trunk/pom.xml
Log:
Moving assembly into separate module. Moving dependencies into dependencyManagement in the parent/aggregate.
Modified: projects/security/security-jboss-sx/trunk/acl/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/acl/pom.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/acl/pom.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -93,19 +93,16 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.1.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.2.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>2.0.2.GA</version>
<scope>runtime</scope>
</dependency>
<!--
@@ -119,19 +116,16 @@
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
</dependencies>
Deleted: projects/security/security-jboss-sx/trunk/assembly/bin.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/bin.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/assembly/bin.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -1,16 +0,0 @@
-<assembly>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/identity/target/classes</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/jbosssx/target/classes</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
Added: projects/security/security-jboss-sx/trunk/assembly/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/pom.xml (rev 0)
+++ projects/security/security-jboss-sx/trunk/assembly/pom.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-assembly</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Security Implementation for the JBAS - Assembly</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Security is a cross cutting project that handles security for the JEMS projects</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Security Implementation for the JBAS</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Security Implementation for the JBAS</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/sources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: projects/security/security-jboss-sx/trunk/assembly/sources.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/sources.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/assembly/sources.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -1,17 +0,0 @@
-<assembly>
- <id>sources</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/identity/src/main</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/jbosssx/src/main</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
Copied: projects/security/security-jboss-sx/trunk/assembly/src/assembly/bin.xml (from rev 68532, projects/security/security-jboss-sx/trunk/assembly/bin.xml)
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/src/assembly/bin.xml (rev 0)
+++ projects/security/security-jboss-sx/trunk/assembly/src/assembly/bin.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -0,0 +1,16 @@
+<assembly>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../identity/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jbosssx/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Copied: projects/security/security-jboss-sx/trunk/assembly/src/assembly/sources.xml (from rev 68532, projects/security/security-jboss-sx/trunk/assembly/sources.xml)
===================================================================
--- projects/security/security-jboss-sx/trunk/assembly/src/assembly/sources.xml (rev 0)
+++ projects/security/security-jboss-sx/trunk/assembly/src/assembly/sources.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -0,0 +1,17 @@
+<assembly>
+ <id>sources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../identity/src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jbosssx/src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: projects/security/security-jboss-sx/trunk/identity/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/identity/pom.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/identity/pom.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -87,21 +87,22 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.1.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.2.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>2.0.2.GA</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>identity-spi</artifactId>
+ </dependency>
<!--
<dependency>
<groupId>org.jboss.security</groupId>
@@ -113,19 +114,16 @@
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: projects/security/security-jboss-sx/trunk/jbosssx/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/pom.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/jbosssx/pom.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -114,19 +114,16 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
- <version>1.1.0.20070913080910</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
- <version>1.0.1.20070913080910</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jaspi-api</artifactId>
- <version>1.0-BETA1</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -178,12 +175,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi-bare</artifactId>
+ </dependency>
+ <dependency>
<groupId>sun-opends</groupId>
<artifactId>opends-core</artifactId>
<version>1.0.0-BUILD04</version>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -91,28 +91,5 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml 2007-12-21 22:46:02 UTC (rev 68532)
+++ projects/security/security-jboss-sx/trunk/pom.xml 2007-12-21 23:37:01 UTC (rev 68533)
@@ -9,7 +9,7 @@
<artifactId>jbosssx</artifactId>
<version>2.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Security Implementation for the JBAS - Aggregator</name>
+ <name>JBoss Security Implementation for the JBAS - Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>JBoss Security is a cross cutting project that handles security for the JEMS projects</description>
<licenses>
@@ -46,12 +46,15 @@
</releases>
</repository>
</repositories>
+
<modules>
<module>identity</module>
<module>jbosssx</module>
<module>jbosssx-client</module>
<module>acl</module>
+ <module>assembly</module>
</modules>
+
<profiles>
<!-- mvn install -Psecurity-manager -->
<profile>
@@ -88,19 +91,6 @@
<build>
<plugins>
- <!-- define that we wish to create src jars -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -117,41 +107,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>JBoss Security Implementation for the JBAS</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
- <Implementation-Title>JBoss Security Implementation for the JBAS</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
- <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
- <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
- </manifestEntries>
- </archive>
- <descriptors>
- <descriptor>assembly/bin.xml</descriptor>
- <descriptor>assembly/sources.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </plugin>
- <plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.6</version>
<executions>
<execution>
<id>jboss-deploy</id>
@@ -168,6 +126,8 @@
</plugin>
</plugins>
</build>
+
+ <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
@@ -188,27 +148,45 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ <version>1.1.0.${org.jboss.javaee.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <version>1.0.1.${org.jboss.javaee.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ <version>1.0.0.${org.jboss.javaee.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>acl-spi</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>${org.jboss.security.spi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>authorization-spi</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>${org.jboss.security.spi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>identity-spi</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>${org.jboss.security.spi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi-bare</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>${org.jboss.security.spi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -223,11 +201,18 @@
<version>3.8.1</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.4.GA</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ </dependencyManagement>
+
<distributionManagement>
<repository>
- <!-- Copy the distribution jar file to a local checkout of the maven rep
-ositry
+ <!-- Copy the distribution jar file to a local checkout of the maven repositry
- This variable can be set in $MAVEN_HOME/conf/settings.xml -->
<id>repository.jboss.org</id>
<url>file://${maven.repository.root}</url>
@@ -239,4 +224,10 @@
<url>dav:https://snapshots.jboss.org/maven2/</url>
</snapshotRepository>
</distributionManagement>
+
+ <properties>
+ <org.jboss.javaee.version>Beta3Update1</org.jboss.javaee.version>
+ <org.jboss.security.spi.version>2.0.2-SNAPSHOT</org.jboss.security.spi.version>
+ </properties>
+
</project>
More information about the jboss-cvs-commits
mailing list