geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r897243 - in /geronimo/sandbox/jbohn/daytrader-bp-new: assemblies/web/daytrader-eba-jdbc/ assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/ assemblies/web/daytrader-eba-jpa/ assemblies/web/daytrader-eba-jpa/src/main/resources/M...
Date Fri, 08 Jan 2010 16:09:26 GMT
Author: jbohn
Date: Fri Jan  8 16:08:47 2010
New Revision: 897243

URL: http://svn.apache.org/viewvc?rev=897243&view=rev
Log:
build wab primarily as a bundle rather than a war and some other changes to make the modules
more consistent

Added:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/
      - copied from r896971, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/webapp/
Removed:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/webapp/
Modified:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml Fri
Jan  8 16:08:47 2010
@@ -61,7 +61,6 @@
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
-            <type>war</type>
         </dependency>
     </dependencies>
 
@@ -108,7 +107,6 @@
                             <artifactItem>
                                 <groupId>org.apache.geronimo.daytrader.modules</groupId>
                                 <artifactId>daytrader-web</artifactId>
-                                <type>war</type>
                                 <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>
                           </artifactItems>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF
Fri Jan  8 16:08:47 2010
@@ -7,5 +7,6 @@
  org.apache.geronimo.daytrader.modules.daytrader-entities;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-core;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-persist-jdbc;version=1.0.0,
- daytrader-web;version=1.0.0
+ org.apache.geronimo.daytrader.modules.daytrader-web;version=1.0.0
+
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml Fri Jan
 8 16:08:47 2010
@@ -66,7 +66,6 @@
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
-            <type>war</type>
         </dependency>
     </dependencies>
 
@@ -118,7 +117,6 @@
                             <artifactItem>
                                 <groupId>org.apache.geronimo.daytrader.modules</groupId>
                                 <artifactId>daytrader-web</artifactId>
-                                <type>war</type>
                                 <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>
                           </artifactItems>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF
Fri Jan  8 16:08:47 2010
@@ -8,5 +8,6 @@
  org.apache.geronimo.daytrader.modules.daytrader-core;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-persist-jdbc;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-persist-jpa;version=1.0.0,
- daytrader-web;version=1.0.0
+ org.apache.geronimo.daytrader.modules.daytrader-web;version=1.0.0
+
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml Fri Jan  8 16:08:47
2010
@@ -57,6 +57,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
                             org.apache.geronimo.samples.daytrader.beans;version=1.0.0
                         </Export-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml Fri Jan  8 16:08:47
2010
@@ -70,6 +70,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
                             org.apache.geronimo.samples.daytrader.core.spi;version=1.0.0
                         </Export-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml Fri Jan  8
16:08:47 2010
@@ -125,6 +125,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
                             org.apache.geronimo.samples.daytrader.beans;version=1.0.0
                         </Export-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml Fri Jan
 8 16:08:47 2010
@@ -75,6 +75,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
                             <!--org.apache.geronimo.samples.daytrader.persist.jdbc;version=1.0.0-->
                         </Export-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml Fri Jan
 8 16:08:47 2010
@@ -75,6 +75,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
                             <!--org.apache.geronimo.samples.daytrader.persist.jpa;version=1.0.0-->
                         </Export-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
Fri Jan  8 16:08:47 2010
@@ -63,6 +63,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>
                             org.apache.geronimo.samples.daytrader.spi;version=1.0.0
                         </Export-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-util/pom.xml Fri Jan  8 16:08:47
2010
@@ -61,21 +61,12 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <supportedProjectTypes>
-                      <supportedProjectType>jar</supportedProjectType>
-                      <supportedProjectType>bundle</supportedProjectType>
-                    </supportedProjectTypes>
                     <instructions>
-                        <!--<Bundle-ClassPath>.,lib</Bundle-ClassPath>-->
-                        <!--<Embed-Directory>lib</Embed-Directory>-->
-                        <!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
-                        <!--<Embed-Transitive>true</Embed-Transitive>-->
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
                         <Export-Package>org.apache.geronimo.samples.daytrader.util;version=1.0.0</Export-Package>
                         <Import-Package>
                             org.apache.geronimo.samples.daytrader.util;version=1.0,
-                            <!--org.apache.avalon.framework.logger;resolution:=optional,-->
-                            <!--org.apache.log;resolution:=optional,-->
-                            <!--org.apache.log4j;resolution:=optional,-->
                             org.apache.commons.logging,
                             javax.naming
                         </Import-Package>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml?rev=897243&r1=897242&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml Fri Jan  8 16:08:47
2010
@@ -27,7 +27,7 @@
     
     <groupId>org.apache.geronimo.daytrader.modules</groupId>
     <artifactId>daytrader-web</artifactId>    
-    <packaging>war</packaging>
+    <packaging>bundle</packaging>
     <name>DayTrader :: Modules - Web </name>
     <description>A version of Daytrader for basic Web containers</description>
     
@@ -97,60 +97,16 @@
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- test depends -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <resources>
-                        <resource implementation="org.apache.maven.model.Resource">
-                            <filtering>false</filtering>
-                            <directory>
-                                ${basedir}/src/main/webapp/WEB-INF
-                            </directory>
-                            <includes>
-                                <include>web.xml</include>
-                                <include>geronimo-web.xml</include>
-                            </includes>
-                        </resource>
-                    </resources>
-
-                    <archive>
-                      <!-- add the generated manifest to the war -->
-                      <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-
-                </configuration>
-            </plugin>
-
-            <plugin>
               <groupId>org.apache.felix</groupId>
               <artifactId>maven-bundle-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>bundle-manifest</id>
-                  <phase>process-classes</phase>
-                  <goals>
-                    <goal>manifest</goal>
-                  </goals>
-                </execution>
-              </executions>
               <configuration>
-                <supportedProjectTypes>
-                  <supportedProjectType>war</supportedProjectType>
-                </supportedProjectTypes>
                 <instructions>
-                  <Bundle-ClassPath>WEB-INF/classes</Bundle-ClassPath>
-                  <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                  <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                   <Bundle-Version>${pom.version}</Bundle-Version>
                   <Web-ContextPath>/daytrader</Web-ContextPath>
                   <Web-JSPExtractLocation>/</Web-JSPExtractLocation>
@@ -158,10 +114,13 @@
                       org.apache.geronimo.samples.daytrader.beans;version=1.0,
                       org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
                       org.apache.geronimo.samples.daytrader.spi;version=1.0,
-                      org.apache.geronimo.samples.daytrader.util;version=1.0
+                      org.apache.geronimo.samples.daytrader.util;version=1.0,
+                      javax.naming, 
+                      javax.servlet, 
+                      javax.servlet.http, 
+                      javax.sql
                   </Import-Package>
                 </instructions>
-                <unpackBundle>true</unpackBundle>
               </configuration>
             </plugin>
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml?rev=897243&r1=896971&r2=897243&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/WEB-INF/geronimo-web.xml
Fri Jan  8 16:08:47 2010
@@ -23,10 +23,9 @@
         
         <sys:environment>
             <sys:moduleId>
-                <sys:groupId>org.apache.geronimo.daytrader.assemblies.web</sys:groupId>
-                <sys:artifactId>daytrader-war</sys:artifactId>
+                <sys:groupId>org.apache.geronimo.daytrader.modules</sys:groupId>
+                <sys:artifactId>daytrader-web</sys:artifactId>
                 <sys:version>1.0.0</sys:version>
-                <sys:type>war</sys:type>
             </sys:moduleId>
         
             <sys:dependencies>



Mime
View raw message