Weld SVN: r3990 - build/tags.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:02:58 -0400 (Mon, 12 Oct 2009)
New Revision: 3990
Added:
build/tags/weld-parent-2/
Log:
[maven-scm] copy for tag weld-parent-2
Copied: build/tags/weld-parent-2 (from rev 3989, build/trunk/parent)
15 years, 1 month
Weld SVN: r3989 - build/trunk/parent.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:02:36 -0400 (Mon, 12 Oct 2009)
New Revision: 3989
Modified:
build/trunk/parent/pom.xml
Log:
[maven-release-plugin] prepare release weld-parent-2
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2009-10-12 21:27:01 UTC (rev 3988)
+++ build/trunk/parent/pom.xml 2009-10-12 23:02:36 UTC (rev 3989)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
<packaging>pom</packaging>
- <version>2-SNAPSHOT</version>
+ <version>2</version>
<name>Weld Parent</name>
@@ -45,7 +45,7 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
+
<repositories>
<repository>
<id>oss.sonatype.org/jboss-snapshots</id>
@@ -60,7 +60,7 @@
</snapshots>
</repository>
</repositories>
-
+
<properties>
<!-- Force encoding to UTF-8 (bug on OS X) -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -125,6 +125,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3</version>
</plugin>
@@ -355,9 +360,9 @@
<!-- SCM and Distribution Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/build/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/build/trunk/parent</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld/build/trunk/parent</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/build/tags/weld-parent-2</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/build/tags/weld-parent-2</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/build/tags/weld-parent-2</url>
</scm>
<distributionManagement>
15 years, 1 month
Weld SVN: r3988 - in core/trunk: bom and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:27:01 -0400 (Mon, 12 Oct 2009)
New Revision: 3988
Modified:
core/trunk/bom/pom.xml
core/trunk/pom.xml
Log:
use parent, update to parent-2
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-10-12 21:25:00 UTC (rev 3987)
+++ core/trunk/bom/pom.xml 2009-10-12 21:27:01 UTC (rev 3988)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2-SNAPSHOT</version>
</parent>
<name>Weld Core BOM</name>
@@ -159,7 +159,7 @@
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/bom</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld/core</url>
+ <url>http://fisheye.jboss.org/browse/Weld/core/bom</url>
</scm>
</project>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-10-12 21:25:00 UTC (rev 3987)
+++ core/trunk/pom.xml 2009-10-12 21:27:01 UTC (rev 3988)
@@ -5,6 +5,12 @@
<artifactId>weld-core-build-aggregator</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ </parent>
<name>Weld Build Aggregator</name>
@@ -18,20 +24,6 @@
<url>http://fisheye.jboss.org/browse/Weld</url>
</scm>
- <!-- Needed despite skipping the deployment of this -->
- <distributionManagement>
- <repository>
- <id>oss.sonatype.org/jboss-staging</id>
- <name>Sonatype Nexus Maven Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>Sonatype Nexus Snapshot Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
<profiles>
<profile>
<id>default</id>
@@ -68,18 +60,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
<configuration>
- <goals>deploy</goals>
- <arguments>-Prelease</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
<tagBase>https://svn.jboss.org/repos/weld/core/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>
15 years, 1 month
Weld SVN: r3987 - in api/trunk: bom and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:25:00 -0400 (Mon, 12 Oct 2009)
New Revision: 3987
Modified:
api/trunk/bom/pom.xml
api/trunk/pom.xml
Log:
switch to parent-2
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-12 21:15:00 UTC (rev 3986)
+++ api/trunk/bom/pom.xml 2009-10-12 21:25:00 UTC (rev 3987)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<name>Weld and CDI APIs BOM</name>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-12 21:15:00 UTC (rev 3986)
+++ api/trunk/pom.xml 2009-10-12 21:25:00 UTC (rev 3987)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<name>Weld and CDI APIs Build Aggregator</name>
15 years, 1 month
Weld SVN: r3986 - api/trunk/parent.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:15:00 -0400 (Mon, 12 Oct 2009)
New Revision: 3986
Modified:
api/trunk/parent/pom.xml
Log:
cleanup
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-10-12 21:14:18 UTC (rev 3985)
+++ api/trunk/parent/pom.xml 2009-10-12 21:15:00 UTC (rev 3986)
@@ -84,19 +84,4 @@
</dependencies>
</dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
15 years, 1 month
Weld SVN: r3985 - api/trunk/parent.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:14:18 -0400 (Mon, 12 Oct 2009)
New Revision: 3985
Modified:
api/trunk/parent/pom.xml
Log:
cleanup
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-10-12 21:11:42 UTC (rev 3984)
+++ api/trunk/parent/pom.xml 2009-10-12 21:14:18 UTC (rev 3985)
@@ -69,11 +69,6 @@
<name>Nicklas Karlsson</name>
</developer>
</developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
<!-- Configure non-API dependencies (e.g. testing)-->
<dependencyManagement>
15 years, 1 month
Weld SVN: r3984 - api/trunk/bom.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:11:42 -0400 (Mon, 12 Oct 2009)
New Revision: 3984
Modified:
api/trunk/bom/pom.xml
Log:
use released parent
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-12 21:10:00 UTC (rev 3983)
+++ api/trunk/bom/pom.xml 2009-10-12 21:11:42 UTC (rev 3984)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<name>Weld and CDI APIs BOM</name>
15 years, 1 month
Weld SVN: r3983 - api/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:10:00 -0400 (Mon, 12 Oct 2009)
New Revision: 3983
Modified:
api/trunk/pom.xml
Log:
use weld-parent
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-12 21:09:39 UTC (rev 3982)
+++ api/trunk/pom.xml 2009-10-12 21:10:00 UTC (rev 3983)
@@ -6,8 +6,14 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<name>Weld and CDI APIs Build Aggregator</name>
-
+
<!-- Minimal project metadata, for more see parent/pom.xml -->
<description>The build aggregator for Weld and the CDI APIs, which takes care of calling the modules which make up Weld and CDI APIs</description>
@@ -17,20 +23,6 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk</developerConnection>
<url>http://fisheye.jboss.org/browse/Weld</url>
</scm>
-
- <!-- Needed despite skipping deployment! -->
- <distributionManagement>
- <repository>
- <id>oss.sonatype.org/jboss-staging</id>
- <name>Sonatype Nexus Maven Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>Sonatype Nexus Snapshot Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- </snapshotRepository>
- </distributionManagement>
<modules>
<module>bom</module>
@@ -46,23 +38,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
<configuration>
- <goals>deploy</goals>
- <arguments>-Prelease</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
<tagBase>https://svn.jboss.org/repos/weld/api/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>
15 years, 1 month
Weld SVN: r3982 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 17:09:39 -0400 (Mon, 12 Oct 2009)
New Revision: 3982
Added:
api/trunk/cdi/src/main/java/javax/enterprise/inject/BeanTypes.java
Log:
add BeanTypes
Added: api/trunk/cdi/src/main/java/javax/enterprise/inject/BeanTypes.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/BeanTypes.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/BeanTypes.java 2009-10-12 21:09:39 UTC (rev 3982)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.enterprise.inject;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Allows the bean types of a bean to be explicitly specified by the user,
+ * instead of using the transitive closure of the type hierarchy
+ *
+ * @author Pete Muir
+ */
+
+@Target( { FIELD, METHOD, TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface BeanTypes
+{
+
+ Class<?>[] value() default {};
+
+}
Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/inject/BeanTypes.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
15 years, 1 month
Weld SVN: r3981 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 16:12:33 -0400 (Mon, 12 Oct 2009)
New Revision: 3981
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java
Log:
CDITCK-6
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-10-12 20:12:05 UTC (rev 3980)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-10-12 20:12:33 UTC (rev 3981)
@@ -21,7 +21,6 @@
protected boolean isCloudDestroyed(WebClient client) throws Exception
{
- client.setThrowExceptionOnFailingStatusCode(false);
Page page = client.getPage(getConversationStatusPath("cloudDestroyed"));
return page.getWebResponse().getStatusCode() == 200;
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-10-12 20:12:05 UTC (rev 3980)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-10-12 20:12:33 UTC (rev 3981)
@@ -78,8 +78,6 @@
{
WebClient client = new WebClient();
-
-
HtmlPage storm = client.getPage(getPath("/storm.jsf"));
HtmlSubmitInput beginConversationButton = getFirstMatchingElement(storm, HtmlSubmitInput.class, "beginConversationButton");
storm = beginConversationButton.click();
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-10-12 20:12:05 UTC (rev 3980)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-10-12 20:12:33 UTC (rev 3981)
@@ -38,7 +38,7 @@
}
else
{
- resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ resp.setStatus(208);
}
}
else if ("invalidateSession".equals(method))
15 years, 1 month