[jboss-cvs] JBossAS SVN: r87616 - in projects/security/security-negotiation/branches/SECURITY-411: assembly and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 21 06:04:18 EDT 2009
Author: darran.lofthouse at jboss.com
Date: 2009-04-21 06:04:18 -0400 (Tue, 21 Apr 2009)
New Revision: 87616
Added:
projects/security/security-negotiation/branches/SECURITY-411/assembly/
projects/security/security-negotiation/branches/SECURITY-411/assembly/.project
projects/security/security-negotiation/branches/SECURITY-411/assembly/pom.xml
projects/security/security-negotiation/branches/SECURITY-411/assembly/src/
projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/
projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/bin.xml
projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/sources.xml
Modified:
projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/.project
projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/pom.xml
projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/.classpath
projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/pom.xml
projects/security/security-negotiation/branches/SECURITY-411/parent/pom.xml
projects/security/security-negotiation/branches/SECURITY-411/pom.xml
Log:
Modify build to use an assembly
Property changes on: projects/security/security-negotiation/branches/SECURITY-411/assembly
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/security/security-negotiation/branches/SECURITY-411/assembly/.project
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/assembly/.project (rev 0)
+++ projects/security/security-negotiation/branches/SECURITY-411/assembly/.project 2009-04-21 10:04:18 UTC (rev 87616)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>assembly</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: projects/security/security-negotiation/branches/SECURITY-411/assembly/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/assembly/pom.xml (rev 0)
+++ projects/security/security-negotiation/branches/SECURITY-411/assembly/pom.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -0,0 +1,63 @@
+<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>jboss-negotiation-project</artifactId>
+ <version>2.0.3.GA</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-negotiation</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Negotiation - 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 Negotiation 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>
\ No newline at end of file
Property changes on: projects/security/security-negotiation/branches/SECURITY-411/assembly/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/bin.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/bin.xml (rev 0)
+++ projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/bin.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -0,0 +1,24 @@
+<assembly>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../jboss-negotiation-common/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-negotiation-extras/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-negotiation-ntlm/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-negotiation-spnego/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/bin.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/sources.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/sources.xml (rev 0)
+++ projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/sources.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -0,0 +1,25 @@
+<assembly>
+ <id>sources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../jboss-negotiation-common/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-negotiation-extras/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-negotiation-ntlm/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-negotiation-spnego/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: projects/security/security-negotiation/branches/SECURITY-411/assembly/src/assembly/sources.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/.project
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/.project 2009-04-21 09:35:21 UTC (rev 87615)
+++ projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/.project 2009-04-21 10:04:18 UTC (rev 87616)
@@ -1,5 +1,5 @@
<projectDescription>
- <name>jboss-negotiation</name>
+ <name>jboss-negotiation-extras</name>
<comment>JBoss Negotiation Library</comment>
<projects>
<project>jboss-negotiation-common</project>
Modified: projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/pom.xml 2009-04-21 09:35:21 UTC (rev 87615)
+++ projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-extras/pom.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -6,43 +6,14 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-negotiation</artifactId>
+ <artifactId>jboss-negotiation-extras</artifactId>
<packaging>jar</packaging>
<name>JBoss Negotiation</name>
<url>http://www.jboss.org</url>
<description>JBoss Negotiation Library</description>
<build>
- <plugins>
-
- <!--
+ <plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- <goal>attach</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.jboss.security:jboss-negotiation-common</include>
- <include>org.jboss.security:jboss-negotiation-ntlm</include>
- <include>org.jboss.security:jboss-negotiation-spnego</include>
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
-
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<printSummary>true</printSummary>
Modified: projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/.classpath
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/.classpath 2009-04-21 09:35:21 UTC (rev 87615)
+++ projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/.classpath 2009-04-21 10:04:18 UTC (rev 87616)
@@ -1,17 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.2.2.GA/jboss-common-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
- <classpathentry kind="src" path="/jboss-negotiation"/>
- <classpathentry kind="src" path="/jboss-negotiation-common"/>
- <classpathentry kind="var" path="M2_REPO/jboss/web/jbossweb/2.1.0.GA/jbossweb-2.1.0.GA.jar"/>
- <classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/jboss-negotiation-spnego"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.2.GA/jboss-jmx-4.2.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.2.2.GA/jboss-common-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
+ <classpathentry kind="src" path="/jboss-negotiation-common"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/web/jbossweb/2.1.0.GA/jbossweb-2.1.0.GA.jar"/>
+ <classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/jboss-negotiation-spnego"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.2.GA/jboss-jmx-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-negotiation-extras"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/pom.xml 2009-04-21 09:35:21 UTC (rev 87615)
+++ projects/security/security-negotiation/branches/SECURITY-411/jboss-negotiation-toolkit/pom.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -33,7 +33,7 @@
<!-- Local Dependencies -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-negotiation</artifactId>
+ <artifactId>jboss-negotiation-extras</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: projects/security/security-negotiation/branches/SECURITY-411/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/parent/pom.xml 2009-04-21 09:35:21 UTC (rev 87615)
+++ projects/security/security-negotiation/branches/SECURITY-411/parent/pom.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -98,7 +98,7 @@
<!-- Local Dependencies -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-negotiation</artifactId>
+ <artifactId>jboss-negotiation-extras</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: projects/security/security-negotiation/branches/SECURITY-411/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/SECURITY-411/pom.xml 2009-04-21 09:35:21 UTC (rev 87615)
+++ projects/security/security-negotiation/branches/SECURITY-411/pom.xml 2009-04-21 10:04:18 UTC (rev 87616)
@@ -15,11 +15,12 @@
<description>JBoss Security is a cross cutting project that handles security for the JEMS projects</description>
<modules>
<module>parent</module>
- <module>jboss-negotiation</module>
<module>jboss-negotiation-common</module>
+ <module>jboss-negotiation-extras</module>
<module>jboss-negotiation-ntlm</module>
<module>jboss-negotiation-spnego</module>
<module>jboss-negotiation-toolkit</module>
+ <module>assembly</module>
</modules>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</connection>
More information about the jboss-cvs-commits
mailing list