incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r919182 - in /incubator/aries/trunk/samples/ariestrader-sample/assemblies: ariestrader-all-eba/ ariestrader-all-eba/src/main/eba/ ariestrader-all-eba/src/main/eba/META-INF/ ariestrader-all-eba/src/main/resources/META-INF/ ariestrader-jdbc-e...
Date Thu, 04 Mar 2010 21:02:50 GMT
Author: jbohn
Date: Thu Mar  4 21:02:49 2010
New Revision: 919182

URL: http://svn.apache.org/viewvc?rev=919182&view=rev
Log:
ARIES-215 update eba generation of AriesTrader to use the eba-maven-plugin

Added:
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/eba/
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/eba/META-INF/
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/eba/META-INF/APPLICATION.MF
      - copied unchanged from r919141, incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/src/main/eba/
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/src/main/eba/META-INF/
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/src/main/eba/META-INF/APPLICATION.MF
      - copied unchanged from r919141, incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/src/main/resources/META-INF/APPLICATION.MF
Removed:
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/src/main/resources/META-INF/APPLICATION.MF
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/src/main/resources/META-INF/APPLICATION.MF
Modified:
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml
    incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini

Modified: incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml?rev=919182&r1=919181&r2=919182&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
(original)
+++ incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-all-eba/pom.xml
Thu Mar  4 21:02:49 2010
@@ -27,7 +27,7 @@
     
     <groupId>org.apache.aries.ariestrader.assemblies</groupId>
     <artifactId>ariestrader-all-eba</artifactId>    
-    <packaging>pom</packaging>
+    <packaging>eba</packaging>
     <name>AriesTrader :: Assemblies - EBA - ALL</name>
     <description>An EBA version of AriesTrader ALL</description>
 
@@ -72,131 +72,13 @@
 
     <build>
         <plugins>
-            <!-- Copy dependencies for eba into a common location - eba-jars -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-util</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-core</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-api</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-web</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-beans</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-persist-jdbc</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-entities</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-persist-jpa-am</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-persist-jpa-cm</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Use the maven-assembly-plugin to create the eba content as a jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-eba-as-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${pom.basedir}/src/main/assembly/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Use the maven-antrun-plugin to copy the jar as an eba - NOTE: we can't
move the file because maven still expects to install the artifact -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-jar-to-eba</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${project.build.directory}/${project.build.finalName}.jar"
tofile="${project.build.directory}/${project.build.finalName}.eba"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Use the build-helper-maven-plugin to push the eba to the maven repo 
-->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}.eba</file>
-                                    <type>eba</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>eba-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <includeJar>false</includeJar>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml?rev=919182&r1=919181&r2=919182&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml
(original)
+++ incubator/aries/trunk/samples/ariestrader-sample/assemblies/ariestrader-jdbc-eba/pom.xml
Thu Mar  4 21:02:49 2010
@@ -27,7 +27,7 @@
     
     <groupId>org.apache.aries.ariestrader.assemblies</groupId>
     <artifactId>ariestrader-jdbc-eba</artifactId>    
-    <packaging>pom</packaging>
+    <packaging>eba</packaging>
     <name>AriesTrader :: Assemblies - EBA - JDBC</name>
     <description>An EBA version of AriesTrader JDBC</description>
         
@@ -60,116 +60,13 @@
 
     <build>
         <plugins>
-            <!-- Copy dependencies for eba into a common location - eba-jars -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-util</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-core</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-api</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-beans</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-persist-jdbc</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.aries.ariestrader.modules</groupId>
-                                    <artifactId>ariestrader-web</artifactId>
-                                    <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Use the maven-assembly-plugin to create the eba content as a jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-eba-as-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${pom.basedir}/src/main/assembly/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Use the maven-antrun-plugin to copy the jar as an eba - NOTE: we can't
move the file because maven still expects to install the artifact -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-jar-to-eba</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${project.build.directory}/${project.build.finalName}.jar"
tofile="${project.build.directory}/${project.build.finalName}.eba"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Use the build-helper-maven-plugin to push the eba to the maven repo 
-->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}.eba</file>
-                                    <type>eba</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>eba-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <includeJar>false</includeJar>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=919182&r1=919181&r2=919182&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
(original)
+++ incubator/aries/trunk/samples/ariestrader-sample/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
Thu Mar  4 21:02:49 2010
@@ -15,11 +15,11 @@
 pax-web-jetty-bundle-0.7.2.jar@start,\
 pax-web-extender-war-0.7.2.jar@start,\
 pax-web-jsp-0.7.2.jar@start,\
+org.apache.felix.fileinstall-2.0.8.jar@start,\
 org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
-org.apache.felix.fileinstall-2.0.8.jar@start,\
 org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
 org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
@@ -28,8 +28,6 @@
 org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
 org.apache.aries.util-${ariesUtilVersion}.jar@start,\
 org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
 org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
 ariestrader-derby-ds-${version}.jar@start



Mime
View raw message