Author: [email protected]
Date: Tue Apr 26 13:27:19 2011
New Revision: 1037
Log:
AMDATU-117 restoring build-release profile
Removed:
trunk/amdatu-release/src/main/assembly/src-release.xml
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/amdatu-release/src/main/assembly/bin-release.xml
trunk/amdatu-release/src/main/assembly/dev-server.xml
trunk/amdatu-release/src/main/assembly/war-component.xml
trunk/amdatu-release/src/main/assembly/war-release.xml
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Apr 26 13:27:19 2011
@@ -323,7 +323,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
-
<webApp>${project.build.directory}/${project.build.finalName}-war.war</webApp>
+
<webApp>${project.build.directory}/${project.build.finalName}.war</webApp>
<webAppConfig>
<contextPath>/amdatu</contextPath>
</webAppConfig>
@@ -345,8 +345,7 @@
</build>
<profiles>
<profile>
- <!-- Profile used for sdk development/testing -->
- <id>build-devserver</id>
+ <id>build-dev</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
@@ -374,7 +373,6 @@
</build>
</profile>
<profile>
- <!-- Profile used for war release -->
<id>build-war</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -402,5 +400,35 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>build-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-release.xml</descriptor>
+ <descriptor>src/main/assembly/war-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml Tue Apr 26
13:27:19 2011
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0
view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";>
-
- <!--
- Shared component definition for
- -->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
@@ -23,7 +19,6 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
</dependencySets>
-
<fileSets>
<fileSet>
<directory>src/main/resources/bin</directory>
Modified: trunk/amdatu-release/src/main/assembly/bin-release.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-release.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-release.xml Tue Apr 26
13:27:19 2011
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module
prefixes -->
-
<componentDescriptors>
<componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor>
</componentDescriptors>
-
</assembly>
\ No newline at end of file
Modified: trunk/amdatu-release/src/main/assembly/dev-server.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/dev-server.xml (original)
+++ trunk/amdatu-release/src/main/assembly/dev-server.xml Tue Apr 26
13:27:19 2011
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>dev</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
-
<componentDescriptors>
<componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor>
</componentDescriptors>
Modified: trunk/amdatu-release/src/main/assembly/war-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/war-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/war-component.xml Tue Apr 26
13:27:19 2011
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0
view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";>
-
- <!--
- Shared component definition for
- -->
<dependencySets>
<dependencySet>
<outputDirectory>WEB-INF/amdatu/bundles</outputDirectory>
@@ -23,7 +19,6 @@
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
-
<dependencySet>
<outputDirectory>WEB-INF/lib</outputDirectory>
<includes>
@@ -36,7 +31,6 @@
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
</dependencySets>
-
<fileSets>
<fileSet>
<directory>src/main/webapp</directory>
@@ -49,5 +43,4 @@
<filtered>true</filtered>
</fileSet>
</fileSets>
-
</component>
\ No newline at end of file
Modified: trunk/amdatu-release/src/main/assembly/war-release.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/war-release.xml (original)
+++ trunk/amdatu-release/src/main/assembly/war-release.xml Tue Apr 26
13:27:19 2011
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>war</id>
<formats>
<format>war</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module
prefixes -->
-
<componentDescriptors>
<componentDescriptor>src/main/assembly/war-component.xml</componentDescriptor>
</componentDescriptors>
-
</assembly>
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
