Seam SVN: r14185 - branches/community/Seam_2_3/jboss-seam-parent.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-09-12 18:49:29 -0400 (Mon, 12 Sep 2011)
New Revision: 14185
Modified:
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
don't use string version in variable - release plugin doesn't like that
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 22:34:16 UTC (rev 14184)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 22:49:29 UTC (rev 14185)
@@ -46,7 +46,7 @@
<version.testng>5.10</version.testng>
<version.resteasy>2.0-beta-2</version.resteasy>
<version.spring>2.5.6.SEC02</version.spring>
- <version.seam>${project.version}</version.seam>
+<!-- <version.seam>${project.version}</version.seam> -->
<version.jbossembedded>beta3.SP10</version.jbossembedded>
<version.emma>2.0.5312</version.emma>
@@ -56,7 +56,7 @@
<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
- <dist.dir>${project.build.directory}/jboss-seam-${version.seam}</dist.dir>
+ <dist.dir>${project.build.directory}/jboss-seam-${project.version}</dist.dir>
</properties>
<dependencyManagement>
@@ -67,63 +67,63 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>distribution</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-reference-guide</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<!-- All Seam modules -->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-gen</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-mail</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-pdf</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-remoting</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-resteasy</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -135,37 +135,37 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-jul</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-flex</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-rss</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-wicket</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -1438,7 +1438,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>functional-tests</artifactId>
- <version>${version.seam}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -1587,7 +1587,7 @@
<!-- <keywords>true</keywords> -->
<!-- <author>true</author> -->
<!-- <stylesheetfile>jdstyle.css</stylesheetfile> -->
-<!-- <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> Used by javadoc:javadoc goal -->
+<!-- <doctitle>JBoss Seam ${project.name} API ${project.version}</doctitle> Used by javadoc:javadoc goal -->
<!-- <detectOfflineLinks>false</detectOfflineLinks> -->
<!-- </configuration> -->
<!-- </plugin> -->
@@ -1646,8 +1646,8 @@
<configuration>
<archive>
<manifestEntries>
- <Implementation-Version>${version.seam}</Implementation-Version>
- <Specification-Version>${version.seam}</Specification-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
<Implementation-Title>${project.name}</Implementation-Title>
@@ -1736,8 +1736,8 @@
<configuration>
<archive>
<manifestEntries>
- <Implementation-Version>${version.seam}</Implementation-Version>
- <Specification-Version>${version.seam}</Specification-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
<Implementation-Title>${project.name}</Implementation-Title>
@@ -1762,8 +1762,8 @@
<ejbVersion>3.0</ejbVersion>
<archive>
<manifestEntries>
- <Implementation-Version>${version.seam}</Implementation-Version>
- <Specification-Version>${version.seam}</Specification-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<Specification-Title>${project.name}</Specification-Title>
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
<Implementation-Title>${project.name}</Implementation-Title>
14 years, 7 months
Seam SVN: r14184 - branches/community/Seam_2_3/jboss-seam-parent.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-09-12 18:34:16 -0400 (Mon, 12 Sep 2011)
New Revision: 14184
Modified:
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
don't use string version in variable - release plugin doesn't like that
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 20:39:41 UTC (rev 14183)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 22:34:16 UTC (rev 14184)
@@ -46,7 +46,7 @@
<version.testng>5.10</version.testng>
<version.resteasy>2.0-beta-2</version.resteasy>
<version.spring>2.5.6.SEC02</version.spring>
- <version.seam>2.3.0-SNAPSHOT</version.seam>
+ <version.seam>${project.version}</version.seam>
<version.jbossembedded>beta3.SP10</version.jbossembedded>
<version.emma>2.0.5312</version.emma>
14 years, 7 months
Seam SVN: r14182 - in branches/community/Seam_2_3: distribution/src/main/assembly and 6 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-09-12 14:59:54 -0400 (Mon, 12 Sep 2011)
New Revision: 14182
Modified:
branches/community/Seam_2_3/distribution/pom.xml
branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
branches/community/Seam_2_3/examples/pom.xml
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/seam-integration-tests/pom.xml
branches/community/Seam_2_3/seam-reference-guide/pom.xml
Log:
some customizations for release
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/distribution/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -19,7 +19,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>distribution</id>
+ <id>bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -5,7 +5,8 @@
<id>distribution</id>
<formats>
- <format>dir</format>
+ <format>zip</format>
+ <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
@@ -44,6 +45,7 @@
</includes>
<unpack>true</unpack>
<unpackOptions>
+
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
@@ -61,7 +63,7 @@
<excludes>
<exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
</excludes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<!-- Add necessary dependencies -->
@@ -69,11 +71,14 @@
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <scope>compile</scope>
<excludes>
<exclude>org.jboss.seam:jboss-seam-gen:*:*</exclude>
<exclude>org.jboss.seam:seam-reference-guide:*:*</exclude>
<exclude>*:sources</exclude>
<exclude>*:javadoc</exclude>
+ <exclude>*:project</exclude>
<exclude>org.hibernate:hibernate-tools:jar</exclude>
<exclude>freemarker:freemarker:jar</exclude>
<exclude>org.eclipse.core:runtime:jar</exclude>
@@ -87,7 +92,6 @@
<exclude>org.jboss.seam:functional-tests:*:*</exclude>
</excludes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <!-- <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> -->
</dependencySet>
<!-- Seam gen -->
Modified: branches/community/Seam_2_3/examples/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/examples/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -6,6 +6,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-parent</artifactId>
<version>2.3.0-SNAPSHOT</version>
+ <relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam</groupId>
@@ -60,6 +61,7 @@
</modules>
<build>
+ <finalName>examples</finalName>
<pluginManagement>
<plugins>
<plugin>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -33,19 +33,30 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/5.0/docs/api</link>
+ </links>
+ <keywords>true</keywords>
+ <author>true</author>
+ <stylesheetfile>jdstyle.css</stylesheetfile>
+ <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> <!-- Used by javadoc:javadoc goal -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -59,7 +59,6 @@
<dist.dir>${project.build.directory}/jboss-seam-${version.seam}</dist.dir>
</properties>
-
<dependencyManagement>
<!-- Used to specify which version of a dependency to use - this means
that versions are only specified here, not in sub project poms. All dependencies
@@ -1574,41 +1573,28 @@
<build>
<defaultGoal>package</defaultGoal>
-
+ <finalName>${artifactId}</finalName>
<pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/5.0/docs/api</link>
- </links>
- <keywords>true</keywords>
- <author>true</author>
- <stylesheetfile>jdstyle.css</stylesheetfile>
- <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> <!-- Used by javadoc:javadoc goal -->
- </configuration>
- </plugin>
+<!-- <plugin> -->
+<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+<!-- <version>2.7</version> -->
+<!-- <configuration> -->
+<!-- <links> -->
+<!-- <link>http://java.sun.com/j2se/5.0/docs/api</link> -->
+<!-- </links> -->
+<!-- <keywords>true</keywords> -->
+<!-- <author>true</author> -->
+<!-- <stylesheetfile>jdstyle.css</stylesheetfile> -->
+<!-- <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> Used by javadoc:javadoc goal -->
+<!-- <detectOfflineLinks>false</detectOfflineLinks> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>distribution</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>single</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <descriptors> -->
-<!-- <descriptor>src/main/assembly/distribution.xml</descriptor> -->
-<!-- </descriptors> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
</plugin>
<!-- Building -->
@@ -1657,14 +1643,28 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${version.seam}</Implementation-Version>
+ <Specification-Version>${version.seam}</Specification-Version>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ <manifestSections>
+ <manifestSection>
+ <name>Build-Information</name>
+ <manifestEntries>
+ <Java-Version>${java.version}</Java-Version>
+ <Java-Vendor>${java.vendor}</Java-Vendor>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
</plugin>
<plugin>
@@ -1679,7 +1679,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
+ <version>2.1.1</version>
<inherited>true</inherited>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -1783,6 +1783,22 @@
</configuration>
</plugin></plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -1831,7 +1847,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>distribution</id>
+ <id>project-distribution</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -12,7 +12,7 @@
<name>Seam UI</name>
<build>
- <finalName>jboss-seam-ui</finalName>
+<!-- <finalName>jboss-seam-ui</finalName> -->
<plugins>
<plugin>
<groupId>org.richfaces.cdk</groupId>
@@ -41,29 +41,29 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/5.0/docs/api</link>
+ </links>
+ <keywords>true</keywords>
+ <author>true</author>
+ <stylesheetfile>jdstyle.css</stylesheetfile>
+ <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> <!-- Used by javadoc:javadoc goal -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -17,6 +17,7 @@
</properties>
<build>
+ <finalName>${artifactId}</finalName>
<testResources>
<testResource>
<directory>src/test/resources</directory>
Modified: branches/community/Seam_2_3/seam-reference-guide/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-reference-guide/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/seam-reference-guide/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -5,6 +5,7 @@
<artifactId>jboss-seam-parent</artifactId>
<groupId>org.jboss.seam</groupId>
<version>2.3.0-SNAPSHOT</version>
+ <relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-reference-guide</artifactId>
14 years, 7 months
Seam SVN: r14181 - branches/community/Seam_2_3/jboss-seam-parent.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-09-12 14:59:32 -0400 (Mon, 12 Sep 2011)
New Revision: 14181
Modified:
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
switched examples modules only to distribution
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
@@ -1807,7 +1807,7 @@
<module>../jboss-embedded-bootstrap</module>
<module>../seam-integration-tests</module>
<module>../functional-tests</module>
- <module>../examples</module>
+<!-- <module>../examples</module> -->
</modules>
<profiles>
@@ -1822,7 +1822,7 @@
<id>distribution</id>
<modules>
<module>../distribution</module>
-<!-- <module>../examples</module> -->
+ <module>../examples</module>
<module>../seam-reference-guide</module>
</modules>
<build>
14 years, 7 months
Seam SVN: r14180 - in branches/community/Seam_2_3: examples/blog/blog-ejb and 35 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-09-12 14:59:23 -0400 (Mon, 12 Sep 2011)
New Revision: 14180
Modified:
branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml
branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml
branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml
branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml
branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml
branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml
branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml
branches/community/Seam_2_3/examples/itext/itext-web/pom.xml
branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml
branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml
branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml
branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml
branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml
branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml
branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml
branches/community/Seam_2_3/examples/pom.xml
branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml
branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml
branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml
branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml
branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml
branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml
branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml
branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml
branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml
branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml
branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml
branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml
branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml
branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml
branches/community/Seam_2_3/examples/wicket/wicket-ejb/pom.xml
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
cleanned duplicate plugins and dependencies
Modified: branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -12,16 +12,7 @@
<artifactId>blog-ejb</artifactId>
<packaging>ejb</packaging>
<name>Blog EJB Module</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -12,16 +12,7 @@
<artifactId>booking-ejb</artifactId>
<packaging>ejb</packaging>
<name>Booking EJB Module</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Contact List EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -16,10 +16,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -16,10 +16,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -384,10 +380,10 @@
<id>tomcat</id>
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
@@ -395,17 +391,11 @@
<goal>add-source</goal>
</goals>
<configuration>
- <sources>
- <source>src/jboss5/java</source>
- </sources>
+ <sources>
+ <source>src/jboss5/java</source>
+ </sources>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
<execution>
<id>add-tomcat-resource</id>
<phase>generate-resources</phase>
Modified: branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Guice EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Icefaces EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -84,10 +84,6 @@
<artifactId>jsf-facelets</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Itext EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/itext/itext-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/itext/itext-web/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/itext/itext-web/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -71,10 +71,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<exclusions>
Modified: branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -62,10 +62,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
@@ -180,11 +176,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<scope>provided</scope>
Modified: branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>JEE 5 Booking EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Remoting EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -14,15 +14,6 @@
<packaging>ejb</packaging>
<name>Mail EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -16,10 +16,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -16,10 +16,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Nested Booking EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -16,10 +16,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -49,7 +49,6 @@
<groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId>
<type>pom</type>
- <scope>import</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -11,17 +11,8 @@
<groupId>org.jboss.seam.examples</groupId>
<artifactId>openid-ejb</artifactId>
<packaging>ejb</packaging>
- <name>Openid EJB Module</name>
+ <name>Openid EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -63,18 +63,6 @@
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2.SP1</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
<configuration>
Modified: branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Quartz EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Registration EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Chatroom EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -16,10 +16,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>1.2</version> <!-- version 1.2 allows us to specify gwt version by gwt-user dependency -->
Modified: branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -12,16 +12,7 @@
<artifactId>helloworld-ejb</artifactId>
<packaging>ejb</packaging>
<name>Helloworld EJB Module</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -11,17 +11,8 @@
<groupId>org.jboss.seam.examples.remoting</groupId>
<artifactId>progressbar-ejb</artifactId>
<packaging>ejb</packaging>
- <name>Progressbar EJB Module</name>
+ <name>Progressbar EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Restbay EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -11,17 +11,8 @@
<groupId>org.jboss.seam.examples</groupId>
<artifactId>seambay-ejb</artifactId>
<packaging>ejb</packaging>
- <name>Seambay EJB Module</name>
+ <name>Seambay EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Seamdiscs EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Seampay EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>SeamSpace EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Tasks EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -15,11 +15,8 @@
<build>
<plugins>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>UI EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples/wicket/wicket-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/wicket/wicket-ejb/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/examples/wicket/wicket-ejb/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -13,15 +13,6 @@
<packaging>ejb</packaging>
<name>Wicket Booking EJB Module</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:57:21 UTC (rev 14179)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:23 UTC (rev 14180)
@@ -1572,105 +1572,7 @@
</distributionManagement>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>enforce</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>seam-build-req</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <inherited>true</inherited>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.5.0</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.0.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Packaging -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${version.seam}</Implementation-Version>
- <Specification-Version>${version.seam}</Specification-Version>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- <manifestSections>
- <manifestSection>
- <name>Build-Information</name>
- <manifestEntries>
- <Java-Version>${java.version}</Java-Version>
- <Java-Vendor>${java.vendor}</Java-Vendor>
- <Build-Time>${maven.build.timestamp}</Build-Time>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
- </configuration>
- </plugin>
- <!-- just for jboss-seam core as it is EJB type not jar -->
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- <archive>
- <manifestEntries>
- <Implementation-Version>${version.seam}</Implementation-Version>
- <Specification-Version>${version.seam}</Specification-Version>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- <manifestSections>
- <manifestSection>
- <name>Build-Information</name>
- <manifestEntries>
- <Java-Version>${java.version}</Java-Version>
- <Java-Vendor>${java.vendor}</Java-Vendor>
- <Build-Time>${maven.build.timestamp}</Build-Time>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
-
- </plugins>
-
<defaultGoal>package</defaultGoal>
<pluginManagement>
@@ -1716,18 +1618,13 @@
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version><!-- this uses maven-archiver which generate META-INF/maven/* http://jira.codehaus.org/browse/MSHARED-185 -->
- </plugin>
-
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.3.2</version>
<configuration>
<source>${java.compiler.version}</source>
<target>${java.compiler.version}</target>
@@ -1759,14 +1656,15 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.2</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -1795,13 +1693,6 @@
</plugin>
<plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
@@ -1811,7 +1702,86 @@
<artifactId>maven-site-plugin</artifactId>
<version>2.2</version>
</plugin>
- </plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>seam-build-req</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <inherited>true</inherited>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.5.0</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.0.0,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Packaging -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${version.seam}</Implementation-Version>
+ <Specification-Version>${version.seam}</Specification-Version>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ <manifestSections>
+ <manifestSection>
+ <name>Build-Information</name>
+ <manifestEntries>
+ <Java-Version>${java.version}</Java-Version>
+ <Java-Vendor>${java.vendor}</Java-Vendor>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin><!-- just for jboss-seam core as it is EJB type not jar --><plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${version.seam}</Implementation-Version>
+ <Specification-Version>${version.seam}</Specification-Version>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ <manifestSections>
+ <manifestSection>
+ <name>Build-Information</name>
+ <manifestEntries>
+ <Java-Version>${java.version}</Java-Version>
+ <Java-Vendor>${java.vendor}</Java-Vendor>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin></plugins>
</pluginManagement>
</build>
@@ -1837,7 +1807,7 @@
<module>../jboss-embedded-bootstrap</module>
<module>../seam-integration-tests</module>
<module>../functional-tests</module>
-<!-- <module>../examples</module>-->
+ <module>../examples</module>
</modules>
<profiles>
@@ -1852,7 +1822,7 @@
<id>distribution</id>
<modules>
<module>../distribution</module>
- <module>../examples</module>
+<!-- <module>../examples</module> -->
<module>../seam-reference-guide</module>
</modules>
<build>
14 years, 7 months
Seam SVN: r14179 - branches/community/Seam_2_3/jboss-seam-excel/src/main/java/org/jboss/seam/excel/ui.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2011-09-12 14:57:21 -0400 (Mon, 12 Sep 2011)
New Revision: 14179
Modified:
branches/community/Seam_2_3/jboss-seam-excel/src/main/java/org/jboss/seam/excel/ui/UIWorkbook.java
Log:
JBSEAM-4664 fixed NPE
Modified: branches/community/Seam_2_3/jboss-seam-excel/src/main/java/org/jboss/seam/excel/ui/UIWorkbook.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-excel/src/main/java/org/jboss/seam/excel/ui/UIWorkbook.java 2011-09-09 09:03:23 UTC (rev 14178)
+++ branches/community/Seam_2_3/jboss-seam-excel/src/main/java/org/jboss/seam/excel/ui/UIWorkbook.java 2011-09-12 18:57:21 UTC (rev 14179)
@@ -303,7 +303,6 @@
this.useTemporaryFileDuringWrite = useTemporaryFileDuringWrite;
}
- @SuppressWarnings("unchecked")
@Override
public void encodeBegin(javax.faces.context.FacesContext facesContext) throws IOException
{
@@ -331,10 +330,10 @@
DocumentData documentData = new ByteArrayDocumentData(baseName, type, bytes);
documentData.setFilename(getFilename());
- String dispositionValue = getDisposition().toString();
+ Boolean dispositionValue = getDisposition();
if (dispositionValue != null)
{
- documentData.setDisposition(dispositionValue);
+ documentData.setDisposition(dispositionValue.toString());
}
if (getExportKey() != null)
14 years, 7 months
[seam/security] 76ae07: completed implementation of openid/idm attribute m...
by noreply@github.com
Branch: refs/heads/develop
Home: https://github.com/seam/security
Commit: 76ae0775d44b7d675ca3a0a54cb4c7d825bd2b25
https://github.com/seam/security/commit/76ae0775d44b7d675ca3a0a54cb4c7d82...
Author: Shane Bryzak <sbryzak(a)gmail.com>
Date: 2011-09-06 (Tue, 06 Sep 2011)
Changed paths:
M external/src/main/java/org/jboss/seam/security/external/openid/OpenIdAuthenticator.java
M external/src/main/java/org/jboss/seam/security/external/openid/providers/GoogleOpenIdProvider.java
M impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java
Log Message:
-----------
completed implementation of openid/idm attribute mapping
Commit: 47c308c77ee91b6ef765f4e6d180c96f5bfe717e
https://github.com/seam/security/commit/47c308c77ee91b6ef765f4e6d180c96f5...
Author: Shane Bryzak <sbryzak(a)gmail.com>
Date: 2011-09-12 (Mon, 12 Sep 2011)
Changed paths:
M examples/idmconsole/pom.xml
M impl/src/main/java/org/jboss/seam/security/extension/SecurityExtension.java
M impl/src/main/java/org/jboss/seam/security/management/picketlink/IdentitySessionProducer.java
M impl/src/main/java/org/jboss/seam/security/management/picketlink/JpaIdentityStore.java
Log Message:
-----------
allow for control of IdentitySession creation outside of scope
Commit: 133926328fc9d2e6cb99ca7b26eeeb4c39c67dda
https://github.com/seam/security/commit/133926328fc9d2e6cb99ca7b26eeeb4c3...
Author: Shane Bryzak <sbryzak(a)gmail.com>
Date: 2011-09-12 (Mon, 12 Sep 2011)
Changed paths:
A api/src/main/java/org/jboss/seam/security/events/SessionInvalidatedEvent.java
A api/src/main/java/org/jboss/seam/security/session/Session.java
M api/src/main/java/org/jboss/seam/security/session/SessionManager.java
A api/src/main/java/org/jboss/seam/security/session/SessionStore.java
M impl/pom.xml
A impl/src/main/java/org/jboss/seam/security/session/SessionImpl.java
A impl/src/main/java/org/jboss/seam/security/session/SessionManagerImpl.java
A impl/src/main/java/org/jboss/seam/security/session/SessionStoreImpl.java
Log Message:
-----------
Merge branch 'develop' of github.com:seam/security into develop
Compare: https://github.com/seam/security/compare/ef72700...1339263
14 years, 7 months