[infinispan-commits] Infinispan SVN: r1599 - in trunk: demos/ec2 and 2 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Mar 11 18:35:05 EST 2010
Author: galder.zamarreno at jboss.com
Date: 2010-03-11 18:35:04 -0500 (Thu, 11 Mar 2010)
New Revision: 1599
Modified:
trunk/demos/ec2/pom.xml
trunk/parent/pom.xml
trunk/pom.xml
trunk/src/main/resources/assemblies/all.xml
Log:
Sort out ec2-demo issue with jar generation and assembly.
Disabled snapshots for scala at parent pom.xml.
Disabled hotrod module to make sure it's not released for first 4.1 alpha.
Modified: trunk/demos/ec2/pom.xml
===================================================================
--- trunk/demos/ec2/pom.xml 2010-03-11 11:56:06 UTC (rev 1598)
+++ trunk/demos/ec2/pom.xml 2010-03-11 23:35:04 UTC (rev 1599)
@@ -1,52 +1,51 @@
+<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>
-<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.infinispan</groupId>
- <artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>infinispan-ec2-demo</artifactId>
- <name>Infinispan EC2 Demo</name>
- <description>Infinispan - EC2 Demo</description>
+ <parent>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-parent</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>infinispan-ec2-demo</artifactId>
+ <name>Infinispan EC2 Demo</name>
+ <description>Infinispan - EC2 Demo</description>
<packaging>war</packaging>
- <repositories>
- <repository>
- <id>codehaus.m2.snapshots</id>
- <url>http://snapshots.repository.codehaus.org</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.martiansoftware</groupId>
- <artifactId>jsap</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.milyn</groupId>
- <artifactId>milyn-smooks-javabean</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.milyn</groupId>
- <artifactId>milyn-smooks-csv</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
+ <repositories>
+ <repository>
+ <id>codehaus.m2.snapshots</id>
+ <url>http://snapshots.repository.codehaus.org</url>
+ </repository>
+ </repositories>
+ <dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.martiansoftware</groupId>
+ <artifactId>jsap</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.milyn</groupId>
+ <artifactId>milyn-smooks-javabean</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.milyn</groupId>
+ <artifactId>milyn-smooks-csv</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -57,5 +56,31 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <mainClass>org.infinispan.ec2demo.InfinispanFluDemo</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2010-03-11 11:56:06 UTC (rev 1598)
+++ trunk/parent/pom.xml 2010-03-11 23:35:04 UTC (rev 1599)
@@ -329,6 +329,10 @@
<id>scala-tools.org</id>
<name>Scala-tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
</repository>
</repositories>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-11 11:56:06 UTC (rev 1598)
+++ trunk/pom.xml 2010-03-11 23:35:04 UTC (rev 1599)
@@ -32,7 +32,7 @@
<module>server/rest</module>
<module>server/core</module>
<module>server/memcached</module>
- <module>server/hotrod</module>
+ <!-- module>server/hotrod</module -->
<module>jopr-plugin</module>
<module>demos/gui</module>
<module>demos/ec2</module>
Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml 2010-03-11 11:56:06 UTC (rev 1598)
+++ trunk/src/main/resources/assemblies/all.xml 2010-03-11 23:35:04 UTC (rev 1599)
@@ -226,7 +226,7 @@
<exclude>org.rhq.helpers:rhq-pluginAnnotations</exclude>
<exclude>org.infinispan:infinispan-core</exclude>
<exclude>org.infinispan:infinispan-server-rest</exclude>
- <exclude>org.infinispan:infinispan-ec2-demo</exclude>
+ <!--<exclude>org.infinispan:infinispan-ec2-demo</exclude> -->
</excludes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
@@ -237,7 +237,7 @@
</binaries>
</moduleSet>
- <!-- REST server and ec2-demo module which are webapps -->
+ <!-- REST server and ec2-demo webapps and ec2-demo application -->
<moduleSet>
<includeSubModules>false</includeSubModules>
<includes>
@@ -245,6 +245,23 @@
<include>org.infinispan:infinispan-ec2-demo</include>
</includes>
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*tests.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+
<binaries>
<outputDirectory>modules/${module.basedir.name}</outputDirectory>
<outputFileNameMapping>
@@ -313,31 +330,6 @@
</moduleSet>
- <!-- REST server and ec2-demo module which are webapps -->
- <moduleSet>
- <includeSubModules>false</includeSubModules>
- <includes>
- <include>org.infinispan:infinispan-server-rest</include>
- <include>org.infinispan:infinispan-ec2-demo</include>
- </includes>
-
- <binaries>
- <outputDirectory>modules/${module.basedir.name}</outputDirectory>
- <outputFileNameMapping>
- ${module.artifactId}.${module.extension}
- </outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>NONEXISTENT_DEPENDENCY*</include>
- </includes>
- <outputDirectory>modules/${module.basedir.name}</outputDirectory>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
-
</moduleSets>
<fileSets>
More information about the infinispan-commits
mailing list