Author: manaRH
Date: 2011-09-26 11:54:35 -0400 (Mon, 26 Sep 2011)
New Revision: 14204
Modified:
branches/community/Seam_2_3/build/settings.xml
branches/community/Seam_2_3/distribution/pom.xml
Log:
cleaned some comments
Modified: branches/community/Seam_2_3/build/settings.xml
===================================================================
--- branches/community/Seam_2_3/build/settings.xml 2011-09-26 15:54:19 UTC
(rev 14203)
+++ branches/community/Seam_2_3/build/settings.xml 2011-09-26 15:54:35 UTC
(rev 14204)
@@ -193,78 +193,7 @@
|
|-->
<profiles>
- <!-- profile
- | Specifies a set of introductions to the build process, to be activated
using one or more of the
- | mechanisms described above. For inheritance purposes, and to activate
profiles via <activatedProfiles/>
- | or the command line, profiles have to have an ID that is unique.
- |
- | An encouraged best practice for profile identification is to use a
consistent naming convention
- | for profiles, such as 'env-dev', 'env-test', 'env-production',
'user-jdcasey', 'user-brett', etc.
- | This will make it more intuitive to understand what the set of
introduced profiles is attempting
- | to accomplish, particularly when you only have a list of profile id's
for debug.
- |
- | This profile example uses the JDK version to trigger activation, and
provides a JDK-specific repo.
<profile>
- <id>jdk-1.4</id>
-
-
- <activation>
- <jdk>1.4</jdk>
- </activation>
-
-
- <repositories>
- <repository>
- <id>jdk14</id>
- <name>Repository for JDK 1.4 builds</name>
- <url>http://www.myhost.com/maven/jdk14</url>
- <layout>default</layout>
- <snapshotPolicy>always</snapshotPolicy>
- </repository>
- </repositories>
- </profile>
- -->
-
-
- <!--
- | Here is another profile, activated by the system property 'target-env'
with a value of 'dev',
- | which provides a specific path to the Tomcat instance. To use this,
your plugin configuration
- | might hypothetically look like:
- |
- | ...
- | <plugin>
- | <groupId>org.myco.myplugins</groupId>
- | <artifactId>myplugin</artifactId>
- |
- | <configuration>
- | <tomcatLocation>${tomcatPath}</tomcatLocation>
- | </configuration>
- | </plugin>
- | ...
- |
- | NOTE: If you just wanted to inject this configuration whenever someone
set 'target-env' to
- | anything, you could just leave off the <value/> inside the
activation-property.
- |
- <profile>
- <id>env-dev</id>
-
-
- <activation>
- <property>
- <name>target-env</name>
- <value>dev</value>
- </property>
- </activation>
-
-
- <properties>
- <tomcatPath>/path/to/tomcat/instance</tomcatPath>
- </properties>
- </profile>
- -->
-
-
- <profile>
<id>jboss-public-repository</id>
<repositories>
<repository>
@@ -300,7 +229,6 @@
</pluginRepositories>
</profile>
-
<profile>
<id>jboss-deprecated-repository</id>
<repositories>
@@ -324,18 +252,7 @@
</profiles>
-
- <!-- activeProfiles
- | List of profiles that are active for all builds.
- |
<activeProfiles>
- <activeProfile>alwaysActiveProfile</activeProfile>
- <activeProfile>anotherAlwaysActiveProfile</activeProfile>
- </activeProfiles>
- -->
-
-
- <activeProfiles>
<activeProfile>jboss-public-repository</activeProfile>
<activeProfile>jboss-deprecated-repository</activeProfile>
</activeProfiles>
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2011-09-26 15:54:19 UTC
(rev 14203)
+++ branches/community/Seam_2_3/distribution/pom.xml 2011-09-26 15:54:35 UTC
(rev 14204)
@@ -28,16 +28,60 @@
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
-
<appendAssemblyId>false</appendAssemblyId>
+
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <includeGroupIds>org.jboss.seam</includeGroupIds>
+
<excludeGroupIds>org.jboss.seam.embedded</excludeGroupIds>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>copy-sources</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <classifier>project</classifier>
+ <type>zip</type>
+
<excludes>META-INF/**,.settings/,**/.settings/,.gitignore,.project,.classpath,**/.project,**/.classpath</excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>examples</artifactId>
+ <classifier>project</classifier>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-integration-tests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-parent</artifactId>
+ <type>zip</type>
+ <version>${project.version}</version>
+ <classifier>project</classifier>
+ </dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -105,114 +149,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>seam-reference-guide</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-excel</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ioc</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jul</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-mail</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-pdf</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-remoting</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-resteasy</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-wicket</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-integration-tests</artifactId>
- <version>${project.version}</version>
- <classifier>project</classifier>
- <type>zip</type>
- </dependency>
-
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
@@ -313,6 +250,7 @@
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-embedded-bootstrap</artifactId>
@@ -320,14 +258,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>examples</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
<version>${version.jbossembedded}</version>
@@ -344,6 +274,12 @@
<artifactId>thirdparty-all</artifactId>
<version>${version.jbossembedded}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>functional-tests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
