Seam SVN: r12854 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-05-27 03:11:55 -0400 (Thu, 27 May 2010)
New Revision: 12854
Added:
tags/JBPAPP_5_0_1/
Removed:
tags/JBPAPP_5_0_1-CR2/
Log:
Copied: tags/JBPAPP_5_0_1 (from rev 12853, tags/JBPAPP_5_0_1-CR2)
13 years, 11 months
Seam SVN: r12853 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-05-27 03:10:40 -0400 (Thu, 27 May 2010)
New Revision: 12853
Added:
tags/JBPAPP_4_3_CP08/
Removed:
tags/JBPAPP_4_3_CP08_CR2/
Log:
promoted CR2 to GA
Copied: tags/JBPAPP_4_3_CP08 (from rev 12852, tags/JBPAPP_4_3_CP08_CR2)
13 years, 11 months
Seam SVN: r12852 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-05-27 03:09:21 -0400 (Thu, 27 May 2010)
New Revision: 12852
Removed:
tags/JBPAPP_4_3_CP08/
Log:
13 years, 11 months
Seam SVN: r12851 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-05-27 03:06:09 -0400 (Thu, 27 May 2010)
New Revision: 12851
Added:
tags/JBPAPP_4_3_CP07_FP/
Removed:
tags/JBPAPP_4_3_CP07_FP_CR2a/
Log:
moved CR2a to final tag
Copied: tags/JBPAPP_4_3_CP07_FP (from rev 12850, tags/JBPAPP_4_3_CP07_FP_CR2a)
13 years, 11 months
Seam SVN: r12850 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-05-27 03:03:57 -0400 (Thu, 27 May 2010)
New Revision: 12850
Removed:
tags/JBPAPP_4_3_CP07_FP_CR1a/
tags/JBPAPP_4_3_CP07_FP_CR2/
Log:
deleted old CRs
13 years, 11 months
Seam SVN: r12849 - in modules/xml/trunk/impl: src/main/java/org/jboss/seam/xml/bootstrap and 1 other directory.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-05-26 19:35:51 -0400 (Wed, 26 May 2010)
New Revision: 12849
Modified:
modules/xml/trunk/impl/pom.xml
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
Log:
updated interface config
Modified: modules/xml/trunk/impl/pom.xml
===================================================================
--- modules/xml/trunk/impl/pom.xml 2010-05-26 23:07:32 UTC (rev 12848)
+++ modules/xml/trunk/impl/pom.xml 2010-05-26 23:35:51 UTC (rev 12849)
@@ -6,6 +6,7 @@
<artifactId>seam-xml-config-parent</artifactId>
<groupId>org.jboss.seam.xml</groupId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.xml</groupId>
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-05-26 23:07:32 UTC (rev 12848)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-05-26 23:35:51 UTC (rev 12849)
@@ -215,6 +215,7 @@
}
boolean found = false;
AnnotatedTypeBuilder builder = AnnotatedTypeBuilder.newInstance(event.getAnnotatedType());
+ builder.mergeAnnotations(event.getAnnotatedType(), true);
for (XmlResult r : results)
{
for (BeanResult<?> i : r.getInterfaces())
@@ -223,6 +224,7 @@
{
found = true;
builder.mergeAnnotations(i.getBuilder().create(), true);
+ log.info("Overriding " + event.getAnnotatedType().getJavaClass() +" annotations based on interface " + i.getType().getName());
}
}
}
13 years, 11 months
Seam SVN: r12848 - modules/xml/trunk/docs.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 19:07:32 -0400 (Wed, 26 May 2010)
New Revision: 12848
Modified:
modules/xml/trunk/docs/pom.xml
Log:
don't attach docs, or do the weird copy hack for Gavin
Modified: modules/xml/trunk/docs/pom.xml
===================================================================
--- modules/xml/trunk/docs/pom.xml 2010-05-26 23:06:34 UTC (rev 12847)
+++ modules/xml/trunk/docs/pom.xml 2010-05-26 23:07:32 UTC (rev 12848)
@@ -47,43 +47,6 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <copy file="${basedir}/target/docbook/publish/en-US/pdf/${pdf.name}" todir="${basedir}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-zip</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.outputDirectory}/${project.artifactId}-${project.version}.war</file>
- <type>war</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
13 years, 11 months
Seam SVN: r12847 - in modules/xml/trunk: src and 2 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 19:06:34 -0400 (Wed, 26 May 2010)
New Revision: 12847
Added:
modules/xml/trunk/src/
modules/xml/trunk/src/main/
modules/xml/trunk/src/main/assembly/
modules/xml/trunk/src/main/assembly/assembly.xml
Removed:
modules/xml/trunk/assembly.xml
Modified:
modules/xml/trunk/pom.xml
Log:
standard location for assembly.xml
Deleted: modules/xml/trunk/assembly.xml
===================================================================
--- modules/xml/trunk/assembly.xml 2010-05-26 23:04:22 UTC (rev 12846)
+++ modules/xml/trunk/assembly.xml 2010-05-26 23:06:34 UTC (rev 12847)
@@ -1,80 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>impl/target/site/apidocs</directory>
- <outputDirectory>seam-xml/doc/api</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>examples</directory>
- <outputDirectory>seam-xml/examples</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>princess-rescue/pom.xml</include>
- <include>princess-rescue/src/**</include>
- <include>princess-rescue/readme.txt</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>.</directory>
- <outputDirectory>seam-xml</outputDirectory>
- <includes>
- <include>readme.txt</include>
- <include>lgpl.txt</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>impl/src/main/java</directory>
- <outputDirectory>seam-xml/source</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>seam-xml/lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.weld:weld-extensions:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.seam.xml:seam-xml-config:jar</include>
- </includes>
- <binaries>
- <outputDirectory>seam-xml/lib</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>org.jboss.seam.xml:seam-xml-config-reference-guide</include>
- </includes>
- <binaries>
- <outputDirectory>seam-xml/doc/reference</outputDirectory>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
-
- </moduleSets>
-</assembly>
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-05-26 23:04:22 UTC (rev 12846)
+++ modules/xml/trunk/pom.xml 2010-05-26 23:06:34 UTC (rev 12847)
@@ -23,12 +23,11 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptors>
- <descriptor>assembly.xml</descriptor>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
- <finalName>seam-xml-config-${pom.version}</finalName>
+ <finalName>seam-xml-config-${pom.version}</finalName>
</configuration>
</plugin>
</plugins>
Copied: modules/xml/trunk/src/main/assembly/assembly.xml (from rev 12831, modules/xml/trunk/assembly.xml)
===================================================================
--- modules/xml/trunk/src/main/assembly/assembly.xml (rev 0)
+++ modules/xml/trunk/src/main/assembly/assembly.xml 2010-05-26 23:06:34 UTC (rev 12847)
@@ -0,0 +1,80 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>impl/target/site/apidocs</directory>
+ <outputDirectory>seam-xml/doc/api</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>examples</directory>
+ <outputDirectory>seam-xml/examples</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>princess-rescue/pom.xml</include>
+ <include>princess-rescue/src/**</include>
+ <include>princess-rescue/readme.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>seam-xml</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>impl/src/main/java</directory>
+ <outputDirectory>seam-xml/source</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>seam-xml/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.weld:weld-extensions:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.xml:seam-xml-config:jar</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-xml/lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam.xml:seam-xml-config-reference-guide</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-xml/doc/reference</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+
+ </moduleSets>
+</assembly>
13 years, 11 months
Seam SVN: r12846 - modules/xml/trunk/impl.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 19:04:22 -0400 (Wed, 26 May 2010)
New Revision: 12846
Modified:
modules/xml/trunk/impl/pom.xml
Log:
java 1.5 is the default for all of seam, maven-eclipse-plugin is not recommended
Modified: modules/xml/trunk/impl/pom.xml
===================================================================
--- modules/xml/trunk/impl/pom.xml 2010-05-26 23:02:58 UTC (rev 12845)
+++ modules/xml/trunk/impl/pom.xml 2010-05-26 23:04:22 UTC (rev 12846)
@@ -78,24 +78,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <workspace>${basedir}</workspace>
-
- <downloadJavadocs>true</downloadJavadocs>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
13 years, 11 months
Seam SVN: r12845 - modules/servlet/trunk.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-26 19:02:58 -0400 (Wed, 26 May 2010)
New Revision: 12845
Modified:
modules/servlet/trunk/pom.xml
Log:
java 1.5 is the default for all of seam
Modified: modules/servlet/trunk/pom.xml
===================================================================
--- modules/servlet/trunk/pom.xml 2010-05-26 23:02:07 UTC (rev 12844)
+++ modules/servlet/trunk/pom.xml 2010-05-26 23:02:58 UTC (rev 12845)
@@ -107,20 +107,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<developers>
<developer>
<name>Nicklas Karlsson</name>
13 years, 11 months