Author: gnodet
Date: Fri May 5 03:52:42 2006
New Revision: 400043
URL: http://svn.apache.org/viewcvs?rev=400043&view=rev
Log:
Create m2 pom for servicemix-web, move it to its own module and include the
source distribution in the release.
The only problem is that it is not included in the m1 build anymore :(
Added:
incubator/servicemix/trunk/servicemix-web/
- copied from r400008,
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/
incubator/servicemix/trunk/servicemix-web/pom.xml
incubator/servicemix/trunk/servicemix-web/src/main/assembly/
incubator/servicemix/trunk/servicemix-web/src/main/assembly/src.xml
Removed:
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/
Modified:
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/servicemix-assembly/pom.xml
incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
Modified: incubator/servicemix/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=400043&r1=400042&r2=400043&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Fri May 5 03:52:42 2006
@@ -347,6 +347,12 @@
<artifactId>servicemix-eip</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-web</artifactId>
+ <version>${pom.version}</version>
+ <type>war</type>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.dependencies</groupId>
Modified: incubator/servicemix/trunk/servicemix-assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/pom.xml?rev=400043&r1=400042&r2=400043&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/pom.xml Fri May 5 03:52:42
2006
@@ -83,6 +83,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>servicemix-components</artifactId>
</dependency>
<dependency>
@@ -132,7 +137,7 @@
<version>1.0</version>
<executions>
<execution>
- <id>unpack-javadoc</id>
+ <id>copy-components</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
@@ -194,6 +199,25 @@
<artifactId>servicemix-lwcontainer</artifactId>
<version>${pom.version}</version>
<classifier>installer</classifier>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-servicemix-web</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/servicemix-web</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-web</artifactId>
+ <version>${pom.version}</version>
+ <classifier>src</classifier>
<type>zip</type>
</artifactItem>
</artifactItems>
Modified:
incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml?rev=400043&r1=400042&r2=400043&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
(original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/assembly/bin.xml
Fri May 5 03:52:42 2006
@@ -40,6 +40,10 @@
<directory>target/components</directory>
<outputDirectory>components</outputDirectory>
</fileSet>
+ <fileSet>
+
<directory>target/servicemix-web/servicemix-web-${pom.version}</directory>
+ <outputDirectory>examples/servicemix-web</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Added: incubator/servicemix/trunk/servicemix-web/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-web/pom.xml?rev=400043&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-web/pom.xml (added)
+++ incubator/servicemix/trunk/servicemix-web/pom.xml Fri May 5 03:52:42 2006
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Rev: 399296 $ $Date: 2006-05-03 15:35:23 +0200 (Wed, 03 May 2006) $ -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>servicemix-web</artifactId>
+ <packaging>war</packaging>
+ <name>ServiceMix :: Web</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-components</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty6-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <webAppSourceDirectory>${basedir}/src/webapp</webAppSourceDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/servicemix/trunk/servicemix-web/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-web/src/main/assembly/src.xml?rev=400043&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-web/src/main/assembly/src.xml (added)
+++ incubator/servicemix/trunk/servicemix-web/src/main/assembly/src.xml Fri May
5 03:52:42 2006
@@ -0,0 +1,20 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
