[weld-commits] Weld SVN: r6021 - in extensions/trunk: src and 10 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Tue Mar 9 17:25:36 EST 2010


Author: pete.muir at jboss.org
Date: 2010-03-09 17:25:35 -0500 (Tue, 09 Mar 2010)
New Revision: 6021

Added:
   extensions/trunk/pom.xml
   extensions/trunk/src/
   extensions/trunk/src/main/
   extensions/trunk/src/main/java/
   extensions/trunk/src/main/java/org/
   extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbeans/
   extensions/trunk/src/main/resources/
   extensions/trunk/src/main/resources/META-INF/
   extensions/trunk/src/main/resources/META-INF/services/
   extensions/trunk/src/test/
   extensions/trunk/src/test/java/
   extensions/trunk/src/test/java/org/
   extensions/trunk/src/test/java/org/jboss/weld/extensions/
   extensions/trunk/src/test/resources/
   extensions/trunk/src/test/resources/META-INF/
   extensions/trunk/src/test/resources/META-INF/beans.xml
   extensions/trunk/src/test/resources/jndi.properties
   extensions/trunk/src/test/resources/log4j.xml
   extensions/trunk/src/test/resources/org/
Removed:
   extensions/trunk/bom/
   extensions/trunk/core/
   extensions/trunk/genericbeans/
   extensions/trunk/parent/
   extensions/trunk/pom.xml
Log:
convert to single level project

Deleted: extensions/trunk/pom.xml
===================================================================
--- extensions/trunk/pom.xml	2010-03-09 18:46:45 UTC (rev 6020)
+++ extensions/trunk/pom.xml	2010-03-09 22:25:35 UTC (rev 6021)
@@ -1,55 +0,0 @@
-<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">
-   <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.weld</groupId>
-   <artifactId>weld-extensions-build-aggregator</artifactId>
-   <packaging>pom</packaging>
-   <version>1.0.1-SNAPSHOT</version>
-
-   <parent>
-      <groupId>org.jboss.weld</groupId>
-      <artifactId>weld-parent</artifactId>
-      <version>9</version>
-   </parent>
-
-   <name>Weld Extensions Build Aggregator</name>
-   
-   <modules>
-      <module>bom</module>
-      <module>parent</module>
-      <module>core</module>
-      <module>genericbeans</module>
-   </modules>
-   
-   <!-- Minimal metadata -->
-   <description>The build aggregator for Weld Extensions, which takes care of calling the modules which make up Weld Extensions</description>
-
-   <!-- SCM and distribution management -->
-   <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trunk</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/trunk</developerConnection>
-      <url>http://fisheye.jboss.org/browse/weld/extensions/trunk</url>
-   </scm>
-
-   <!-- Minimal build configuration -->
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-release-plugin</artifactId>
-            <version>2.0-beta-9</version>
-            <configuration>
-               <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.4</version>
-            <configuration>
-               <skip>true</skip>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-
-</project>

Copied: extensions/trunk/pom.xml (from rev 6020, extensions/trunk/bom/pom.xml)
===================================================================
--- extensions/trunk/pom.xml	                        (rev 0)
+++ extensions/trunk/pom.xml	2010-03-09 22:25:35 UTC (rev 6021)
@@ -0,0 +1,206 @@
+<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">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-extensions-bom</artifactId>
+   <packaging>pom</packaging>
+   <version>1.0.1-SNAPSHOT</version>
+
+   <parent>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-parent</artifactId>
+      <version>8</version>
+   </parent>
+
+   <name>Weld Extensions BOM</name>
+   <url>http://www.seamframework.org/Weld</url>
+
+   <description>Portable extensions for CDI</description>
+
+   <issueManagement>
+      <system>JIRA</system>
+      <url>https://jira.jboss.org/jira/browse/WELDX/component/12312756</url>
+   </issueManagement>
+
+   <licenses>
+      <license>
+         <name>Apache License, Version 2.0</name>
+         <distribution>repo</distribution>
+         <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+      </license>
+   </licenses>
+
+
+   <developers>
+
+      <developer>
+         <name>Pete Muir</name>
+         <email>pete.muir at jboss.org</email>
+         <organization>Red Hat Inc.</organization>
+         <url>http://in.relation.to/Bloggers/Pete</url>
+      </developer>
+
+      <developer>
+         <name>Stuart Douglas</name>
+      </developer>
+
+   </developers>
+
+   <inceptionYear>2008</inceptionYear>
+
+   <organization>
+      <name>Seam Framework</name>
+      <url>http://seamframework.org</url>
+   </organization>
+
+   <ciManagement>
+      <system>Hudson</system>
+      <url />
+   </ciManagement>
+
+   <properties>
+      <weld.api.version>1.0-SP1</weld.api.version>
+      <weld.core.version>1.0.1-Final</weld.core.version>
+      <slf4j.version>1.5.10</slf4j.version>
+      <testng.version>5.10</testng.version>
+      <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
+   </properties>
+
+   <!-- Dependency management, including extra repositories if needed -->
+   <repositories>
+      <repository>
+         <id>oss.sonatype.org/jboss-snapshots</id>
+         <name>JBoss (Nexus) Snapshots Repository</name>
+         <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+         <releases>
+            <enabled>false</enabled>
+         </releases>
+         <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+         </snapshots>
+      </repository>
+   </repositories>
+
+   <!-- Import the BOMs -->
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-api-bom</artifactId>
+            <version>${weld.api.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-core-bom</artifactId>
+            <version>${weld.core.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <classifier>jdk15</classifier>
+            <version>${testng.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-extensions</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.test-harness</groupId>
+            <artifactId>jboss-test-harness</artifactId>
+            <version>${jboss.test.harness.version}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.test-harness</groupId>
+            <artifactId>jboss-test-harness-jboss-as-50</artifactId>
+            <version>${jboss.test.harness.version}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.test-harness</groupId>
+            <artifactId>jboss-test-harness-jboss-as-52</artifactId>
+            <version>${jboss.test.harness.version}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.test-harness</groupId>
+            <artifactId>jboss-test-harness-jboss-embedded</artifactId>
+            <version>${jboss.test.harness.version}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.test-harness</groupId>
+            <artifactId>jboss-test-harness-tomcat</artifactId>
+            <version>${jboss.test.harness.version}</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+
+   <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+      <classifier>jdk15</classifier>
+      <exclusions>
+         <exclusion>
+            <artifactId>junit</artifactId>
+            <groupId>junit</groupId>
+         </exclusion>
+      </exclusions>
+   </dependency>
+
+   <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <scope>provided</scope>
+   </dependency>
+
+   <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+   </dependency>
+
+   <dependency>
+      <groupId>org.jboss.test-harness</groupId>
+      <artifactId>jboss-test-harness</artifactId>
+      <scope>test</scope>
+   </dependency>
+
+   <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-core</artifactId>
+      <scope>test</scope>
+   </dependency>
+
+   <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-core-test</artifactId>
+      <scope>test</scope>
+   </dependency>
+
+   <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-se</artifactId>
+      <scope>test</scope>
+   </dependency>
+
+   <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-api</artifactId>
+      <scope>test</scope>
+   </dependency>
+
+   <scm>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trunk/bom</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/trunk/bom</developerConnection>
+      <url>http://fisheye.jboss.org/browse/weld/extensions/trunk/bom</url>
+   </scm>
+
+
+</project>

Copied: extensions/trunk/src/main/java/org (from rev 6019, extensions/trunk/core/src/main/java/org)

Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbeans (from rev 6020, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/genericbeans)

Copied: extensions/trunk/src/main/resources/META-INF (from rev 6019, extensions/trunk/core/src/main/resources/META-INF)

Copied: extensions/trunk/src/main/resources/META-INF/services (from rev 6020, extensions/trunk/core/src/main/resources/META-INF/services)

Copied: extensions/trunk/src/test/java/org (from rev 6019, extensions/trunk/core/src/test/java/org)

Copied: extensions/trunk/src/test/java/org/jboss/weld/extensions (from rev 6020, extensions/trunk/core/src/test/java/org/jboss/weld/extensions)

Copied: extensions/trunk/src/test/resources/META-INF (from rev 6019, extensions/trunk/core/src/test/resources/META-INF)

Copied: extensions/trunk/src/test/resources/META-INF/beans.xml (from rev 6020, extensions/trunk/core/src/test/resources/META-INF/beans.xml)
===================================================================
--- extensions/trunk/src/test/resources/META-INF/beans.xml	                        (rev 0)
+++ extensions/trunk/src/test/resources/META-INF/beans.xml	2010-03-09 22:25:35 UTC (rev 6021)
@@ -0,0 +1,5 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>

Copied: extensions/trunk/src/test/resources/jndi.properties (from rev 6019, extensions/trunk/core/src/test/resources/jndi.properties)
===================================================================
--- extensions/trunk/src/test/resources/jndi.properties	                        (rev 0)
+++ extensions/trunk/src/test/resources/jndi.properties	2010-03-09 22:25:35 UTC (rev 6021)
@@ -0,0 +1,4 @@
+#jboss JNDI properties
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

Copied: extensions/trunk/src/test/resources/log4j.xml (from rev 6019, extensions/trunk/core/src/test/resources/log4j.xml)
===================================================================
--- extensions/trunk/src/test/resources/log4j.xml	                        (rev 0)
+++ extensions/trunk/src/test/resources/log4j.xml	2010-03-09 22:25:35 UTC (rev 6021)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+    <appender name="CONSOLE" class="org.jboss.weld.test.log.TestAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/>
+        </layout>
+    </appender>
+
+    <category name="org.jboss.webbeans.test">
+        <priority value="INFO"/>
+    </category>
+
+    <root>
+        <priority value="INFO"/>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+</log4j:configuration>

Copied: extensions/trunk/src/test/resources/org (from rev 6019, extensions/trunk/core/src/test/resources/org)



More information about the weld-commits mailing list