Author: ptahchiev
Date: Wed Sep 17 04:24:34 2008
New Revision: 696248
URL: http://svn.apache.org/viewvc?rev=696248&view=rev
Log:
Changes made on the ejb samples.
Added:
jakarta/cactus/trunk/samples/ejb/src/main/app/main.xml (with props)
Modified:
jakarta/cactus/trunk/samples/ejb/pom.xml
jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml
Modified: jakarta/cactus/trunk/samples/ejb/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/pom.xml?rev=696248&r1=696247&r2=696248&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/pom.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/pom.xml Wed Sep 17 04:24:34 2008
@@ -27,7 +27,7 @@
<artifactId>cactus.samples.ejb</artifactId>
<name>Cactus Ejb Samples - Parent Project</name>
<description>Cactus Ejb Samples - the parent project</description>
- <packaging>ear</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.cactus</groupId>
@@ -127,12 +127,33 @@
</dependencies>
<build>
<plugins>
- <plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>create-cactus-archive</id>
+
<phase>pre-integration-test</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/app/main.xml</descriptor>
+ </descriptors>
+ <archiverConfig>
+ <appxml>src/main/app/application.xml</appxml>
+ </archiverConfig>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.maven2</artifactId>
<version>1.8.1-SNAPSHOT</version>
<configuration>
-
<srcFile>${project.build.directory}/${pom.artifactId}-${pom.version}.ear</srcFile>
+
<srcFile>target/cactus.samples.ejb-1.8.1-SNAPSHOT-bin.ear</srcFile>
<destFile>${project.build.directory}/${pom.artifactId}-cactified.ear</destFile>
<!--mergeWebXml>src/main/webapp/WEB-INF/cactus-web.xml</mergeWebXml-->
<libDependencies>
@@ -203,7 +224,7 @@
<configuration>
<deployables>
<deployable>
-
<location>target/cactus.samples.ejb-cactified.ear</location>
+
<location>${project.build.directory}/${pom.artifactId}-cactified.ear</location>
<type>war</type>
<properties>
<context>/test</context>
@@ -246,12 +267,7 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- </configuration>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml?rev=696248&r1=696247&r2=696248&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml Wed Sep 17
04:24:34 2008
@@ -12,7 +12,7 @@
<display-name>cactus-sample-ejb</display-name>
<description>Cactus EJB Sample</description>
<module>
- <ejb>samples-ejb-1.8.1-SNAPSHOT.jar</ejb>
+ <ejb>cactus.samples.ejb-1.8.1-SNAPSHOT.jar</ejb>
</module>
</application>
Added: jakarta/cactus/trunk/samples/ejb/src/main/app/main.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/src/main/app/main.xml?rev=696248&view=auto
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/src/main/app/main.xml (added)
+++ jakarta/cactus/trunk/samples/ejb/src/main/app/main.xml Wed Sep 17 04:24:34
2008
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>ear</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>cactus.samples.ejb-1.8.1-SNAPSHOT.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: jakarta/cactus/trunk/samples/ejb/src/main/app/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
