Author: [email protected] Date: Tue Mar 15 17:43:00 2011 New Revision: 889
Log: AMDATU-258 removed warsupport classes / integrated war assembly into release / versions alligned Removed: trunk/amdatu-release/src/main/java/ Modified: trunk/amdatu-release/pom.xml trunk/amdatu-release/src/main/assembly/war-component.xml trunk/pom.xml Modified: trunk/amdatu-release/pom.xml ============================================================================== --- trunk/amdatu-release/pom.xml (original) +++ trunk/amdatu-release/pom.xml Tue Mar 15 17:43:00 2011 @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.amdatu</groupId> @@ -389,19 +390,20 @@ </dependency> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.http.proxy</artifactId> - <version>2.2.0</version> + <artifactId>org.apache.felix.framework</artifactId> + <version>${org.apache.felix.main.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.http.bridge</artifactId> - <version>2.2.0</version> + <artifactId>org.apache.felix.http.proxy</artifactId> + <version>${org.apache.felix.http.version}</version> + <scope>compile</scope> </dependency> - <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${org.apache.felix.main.version}</version> + <artifactId>org.apache.felix.http.bridge</artifactId> + <version>${org.apache.felix.http.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.ops4j.pax.swissbox</groupId> @@ -463,8 +465,59 @@ <version>${pax.useradmin.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.amdatu.libraries</groupId> + <artifactId>warsupport</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.3.1.v20110307</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <!-- Handy plugin to test the webapp. Just run the command 'mvn jetty:run', open a browser + and navigate to localhost:8080/amdatu --> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <webApp>${project.build.directory}/${project.build.finalName}-war.war</webApp> + <webAppConfig> + <contextPath>/amdatu</contextPath> + </webAppConfig> + <connectors> + <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <port>${server.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + <systemProperties> + <systemProperty> + <name>amdatu.dir</name> + <value>${project.build.directory}/amdatu-war</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> <profiles> <profile> <!-- Profile active only for release builds --> @@ -476,27 +529,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <delete dir="${snapshot.repository.directory}" /> - <echo>Deleting directory ${snapshot.repository.directory}</echo> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <executions> <execution> <id>create-release</id> @@ -508,6 +541,7 @@ <descriptors> <descriptor>src/main/assembly/bin-release.xml</descriptor> <descriptor>src/main/assembly/src-release.xml</descriptor> + <descriptor>src/main/assembly/war-release.xml</descriptor> </descriptors> </configuration> </execution> @@ -517,8 +551,8 @@ </build> </profile> <profile> - <!-- Profile active only for release builds --> - <id>build-devserver</id> + <!-- Profile used for war development/testing --> + <id>build-war</id> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -527,7 +561,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <executions> <execution> <id>create-release</id> @@ -537,7 +570,7 @@ </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/dev-server.xml</descriptor> + <descriptor>src/main/assembly/war-release.xml</descriptor> </descriptors> </configuration> </execution> @@ -547,69 +580,14 @@ </build> </profile> <profile> - <!-- Profile active only for release builds --> - <id>build-war</id> + <!-- Profile used for sdk development/testing --> + <id>build-devserver</id> <activation> <activeByDefault>false</activeByDefault> </activation> <build> <plugins> <plugin> - <!-- Handy plugin to test the webapp. Just run the command 'mvn jetty:run', open a browser - and navigate to localhost:8080/amdatu --> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.26</version> - <configuration> - <webApp>target/org.amdatu.amdatu-release-0.2.0-SNAPSHOT-war.war</webApp> - <contextPath>/amdatu</contextPath> - <systemProperties> - <systemProperty> - <name>amdatu.dir</name> - <value>${project.build.directory}/amdatu-war</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <goals> - <goal>testCompile</goal> - </goals> - <configuration> - <source>1.6</source> - <target>1.6</target> - <debug>true</debug> - <optimize>false</optimize> - </configuration> - </execution> - <execution> - <id>default-compile</id> - <phase>compile</phase> - <goals> - <goal>compile</goal> - </goals> - <configuration> - <source>1.6</source> - <target>1.6</target> - <debug>true</debug> - <optimize>false</optimize> - </configuration> - </execution> - </executions> - <configuration> - <source>1.6</source> - <target>1.6</target> - <debug>true</debug> - <optimize>false</optimize> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-5</version> @@ -622,7 +600,7 @@ </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/war-release.xml</descriptor> + <descriptor>src/main/assembly/dev-server.xml</descriptor> </descriptors> </configuration> </execution> 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 Mar 15 17:43:00 2011 @@ -87,6 +87,7 @@ <include>org.osgi:*</include> <include>org.apache.felix:org.apache.felix.framework</include> <include>org.apache.felix:org.apache.felix.http.proxy</include> + <include>org.amdatu.libraries:warsupport</include> </includes> <unpack>false</unpack> <useTransitiveDependencies>false</useTransitiveDependencies> Modified: trunk/pom.xml ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml Tue Mar 15 17:43:00 2011 @@ -91,7 +91,7 @@ <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version> <org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version> <org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version> - <org.apache.felix.http.version>2.0.4</org.apache.felix.http.version> + <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version> <pax.swissbox.version>1.3.0</pax.swissbox.version> <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version> <org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
