Author: dblevins
Date: Tue Jun 26 15:35:48 2007
New Revision: 550976
URL: http://svn.apache.org/viewvc?view=rev&rev=550976
Log:
Patch OPENEJB-590: mvn -Dassemble does not create bin directory in the assembly
of module openejb-standalone
>From Karan Malhi. Thanks Karan!
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/README.txt
openejb/trunk/openejb3/assembly/openejb-standalone/try.sh
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=550976&r1=550975&r2=550976
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Tue Jun 26
15:35:48 2007
@@ -37,7 +37,7 @@
<filtering>true</filtering>
</resource>
</resources>
- <plugins>
+ <plugins>
<!-- Why we need an empty directory
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -56,20 +56,20 @@
</configuration>
</execution>
</executions>
- </plugin>
- -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>filter-resources</id>
- <phase>package</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
+ </plugin>
+ -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>filter-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -96,6 +96,25 @@
</archive>
<finalName>openejb-${pom.version}</finalName>
</configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>cleanup-target</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <delete dir='${basedir}/target/classes' />
+ <delete dir='${basedir}/target/archive-tmp' />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml?view=diff&rev=550976&r1=550975&r2=550976
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
Tue Jun 26 15:35:48 2007
@@ -34,7 +34,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>target/classes</directory>
<outputDirectory>bin/</outputDirectory>
<includes>
<include>*.bat</include>
@@ -44,7 +44,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>src/main/resources/</directory>
+ <directory>target/classes</directory>
<outputDirectory>bin/</outputDirectory>
<includes>
<include>openejb</include>
@@ -53,21 +53,21 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>target/classes</directory>
<includes>
<include>*.conf</include>
</includes>
<outputDirectory>conf/</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>target/classes</directory>
<includes>
<include>README*</include>
</includes>
<outputDirectory>logs/</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>target/classes</directory>
<includes>
<include>README*</include>
</includes>
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/README.txt
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/README.txt?view=diff&rev=550976&r1=550975&r2=550976
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/README.txt
(original)
+++
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/README.txt
Tue Jun 26 15:35:48 2007
@@ -1,7 +1,7 @@
===============================================
OpenEJB -- EJB Container System and EJB Server
-OpenEJB v1.0-beta1 http://www.openejb.org/
+OpenEJB ${pom.version} http://openejb.apache.org/
-----------------------------------------------
___________________
Installation
@@ -66,8 +66,6 @@
===================
Any problems with this release can be reported to our user
- mailing list.
-
- Send email to [EMAIL PROTECTED] or follow this link
- for other subscription and list information:
- http://www.openejb.org/Mailing+Lists#user
+ mailing list at [EMAIL PROTECTED]
+ Follow this link for other subscription and list information:
+ http://openejb.apache.org/mailing-lists.html
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/try.sh
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/try.sh?view=diff&rev=550976&r1=550975&r2=550976
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/try.sh (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/try.sh Tue Jun 26
15:35:48 2007
@@ -17,12 +17,12 @@
#
cd "$(dirname "$0")"
-JAR=$PWD/../../itests/openejb-itests-app/target/openejb-itests-app-3.0-incubating-SNAPSHOT.ear
+JAR=$PWD/../../itests/openejb-itests-app/target/openejb-itests-app-3.0.0-SNAPSHOT.ear
cd target/
-tar xzvf openejb-3.0-incubating-SNAPSHOT-bin.tar.gz
-cd openejb-3.0-incubating-SNAPSHOT
+tar xzvf openejb-3.0.0-SNAPSHOT-bin.tar.gz
+cd openejb-3.0.0-SNAPSHOT
cp $JAR beans/
./bin/openejb start
