[jboss-cvs] JBossAS SVN: r61323 - in projects/javaee/trunk: build/assembly and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 14 04:20:36 EDT 2007
Author: wolfc
Date: 2007-03-14 04:20:35 -0400 (Wed, 14 Mar 2007)
New Revision: 61323
Added:
projects/javaee/trunk/build/assembly/sources.xml
Removed:
projects/javaee/trunk/build/assembly/src.xml
Modified:
projects/javaee/trunk/build/assembly/bin.xml
projects/javaee/trunk/build/pom.xml
projects/javaee/trunk/ejb-api/.classpath
projects/javaee/trunk/ejb-api/.project
projects/javaee/trunk/ejb-api/pom.xml
projects/javaee/trunk/transaction-api/pom.xml
Log:
Assembly artifacts fixed
Modified: projects/javaee/trunk/build/assembly/bin.xml
===================================================================
--- projects/javaee/trunk/build/assembly/bin.xml 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/build/assembly/bin.xml 2007-03-14 08:20:35 UTC (rev 61323)
@@ -1,18 +1,16 @@
<assembly>
- <id>bin</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>jboss:ejb-api</include>
- <include>jboss:transaction-api</include>
- </includes>
- <binaries>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
+ <fileSets>
+ <fileSet>
+ <directory>../ejb-api/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../transaction-api/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
Copied: projects/javaee/trunk/build/assembly/sources.xml (from rev 61322, projects/javaee/trunk/build/assembly/src.xml)
===================================================================
--- projects/javaee/trunk/build/assembly/sources.xml (rev 0)
+++ projects/javaee/trunk/build/assembly/sources.xml 2007-03-14 08:20:35 UTC (rev 61323)
@@ -0,0 +1,17 @@
+<assembly>
+ <id>sources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../ejb-api/src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../transaction-api/src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: projects/javaee/trunk/build/assembly/src.xml
===================================================================
--- projects/javaee/trunk/build/assembly/src.xml 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/build/assembly/src.xml 2007-03-14 08:20:35 UTC (rev 61323)
@@ -1,17 +0,0 @@
-<assembly>
- <id>src</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>jboss:ejb-api</include>
- <include>jboss:transaction-api</include>
- </includes>
- <sources>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
\ No newline at end of file
Modified: projects/javaee/trunk/build/pom.xml
===================================================================
--- projects/javaee/trunk/build/pom.xml 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/build/pom.xml 2007-03-14 08:20:35 UTC (rev 61323)
@@ -21,10 +21,10 @@
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>javaee</artifactId>
+ <artifactId>jboss-javaee</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss JavaEE 5.0 Build</name>
+ <name>JBoss JavaEE Build</name>
<url>http://www.jboss.com</url>
<description>
The JBoss JavaEE API classes
@@ -35,18 +35,18 @@
<finalName>${artifactId}</finalName>
<resources>
<resource>
- <directory>src</directory>
+ <directory>src/etc</directory>
<includes>
- <include>etc/**</include>
+ <include>**/*</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<testResources>
<testResource>
- <directory>src</directory>
+ <directory>src/resources</directory>
<includes>
- <include>resources/**</include>
+ <include>**/*</include>
</includes>
<filtering>true</filtering>
</testResource>
@@ -54,12 +54,21 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<descriptors>
<descriptor>assembly/bin.xml</descriptor>
- <descriptor>assembly/src.xml</descriptor>
+ <descriptor>assembly/sources.xml</descriptor>
</descriptors>
</configuration>
+ <inherited>false</inherited>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -86,8 +95,8 @@
</repository>
</repositories>
<modules>
+ <module>../transaction-api</module>
<module>../ejb-api</module>
- <module>../transaction-api</module>
</modules>
<reporting>
<plugins>
Modified: projects/javaee/trunk/ejb-api/.classpath
===================================================================
--- projects/javaee/trunk/ejb-api/.classpath 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/ejb-api/.classpath 2007-03-14 08:20:35 UTC (rev 61323)
@@ -3,7 +3,7 @@
<classpathentry excluding="**/*.java" including="etc/**" kind="src" path="src"/>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/transaction-api/1.0.1-SNAPSHOT/transaction-api-1.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar" sourcepath="/M2_REPO"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-transaction-api/1.0.1-SNAPSHOT/jboss-transaction-api-1.0.1-SNAPSHOT.jar" sourcepath="/M2_REPO/jboss/jboss-transaction-api/1.0.1-SNAPSHOT/jboss-transaction-api-1.0.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: projects/javaee/trunk/ejb-api/.project
===================================================================
--- projects/javaee/trunk/ejb-api/.project 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/ejb-api/.project 2007-03-14 08:20:35 UTC (rev 61323)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-ejb-api</name>
- <comment>The Java EJB 3.0 API classes</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>ejb-api</name>
+ <comment>The Java EJB 3.0 API classes</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: projects/javaee/trunk/ejb-api/pom.xml
===================================================================
--- projects/javaee/trunk/ejb-api/pom.xml 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/ejb-api/pom.xml 2007-03-14 08:20:35 UTC (rev 61323)
@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>jboss</groupId>
- <artifactId>javaee</artifactId>
+ <artifactId>jboss-javaee</artifactId>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>jboss</groupId>
- <artifactId>ejb-api</artifactId>
+ <artifactId>jboss-ejb-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss EJB 3.0 API</name>
@@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>jboss</groupId>
- <artifactId>transaction-api</artifactId>
+ <artifactId>jboss-transaction-api</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/javaee/trunk/transaction-api/pom.xml
===================================================================
--- projects/javaee/trunk/transaction-api/pom.xml 2007-03-14 07:35:28 UTC (rev 61322)
+++ projects/javaee/trunk/transaction-api/pom.xml 2007-03-14 08:20:35 UTC (rev 61323)
@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>jboss</groupId>
- <artifactId>javaee</artifactId>
+ <artifactId>jboss-javaee</artifactId>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>jboss</groupId>
- <artifactId>transaction-api</artifactId>
+ <artifactId>jboss-transaction-api</artifactId>
<version>1.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Transaction 1.0.1 API</name>
More information about the jboss-cvs-commits
mailing list