openejb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r462714 - in /incubator/openejb/trunk/openejb3: ./ assembly/openejb-standalone/ assembly/openejb-standalone/src/main/assembly/ assembly/openejb-standalone/src/main/resources/ container/openejb-core/ container/openejb-loader/ server/openejb-...
Date Wed, 11 Oct 2006 06:48:34 GMT
Author: jlaskowski
Date: Tue Oct 10 23:48:33 2006
New Revision: 462714

URL: http://svn.apache.org/viewvc?view=rev&rev=462714
Log:
 - Introduce pom's XBean property to control what XBean version we're playing with
 - Fix a typo so OpenEJB boots up properly
 - Some preliminary work with maven-assembly-plugin so SNAPSHOTs are handled as regular versions
are (no SNAPSHOT->a numbered version conversion)

Modified:
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
    incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml
    incubator/openejb/trunk/openejb3/pom.xml
    incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Tue Oct 10 23:48:33
2006
@@ -57,6 +57,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>package</phase>

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
(original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/assembly/bin.xml
Tue Oct 10 23:48:33 2006
@@ -46,6 +46,7 @@
   </fileSets>
   <dependencySets>
     <dependencySet>
+      <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
       <outputDirectory>lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
(original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/openejb
Tue Oct 10 23:48:33 2006
@@ -102,7 +102,7 @@
 #============================================================
 _command_start()
 {
-   java -jar $OPENEJB_CORE_JARr start $@
+   java -jar $OPENEJB_CORE_JAR start $@
 }
 #============================================================
 _command_stop()

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Oct 10 23:48:33 2006
@@ -85,7 +85,7 @@
               <!--<addClasspath>true</addClasspath>-->
             </manifest>
             <manifestEntries>
-              <Class-Path>openejb-loader-${pom.version}.jar xbean-finder-2.6.jar</Class-Path>
+              <Class-Path>openejb-loader-${pom.version}.jar xbean-finder-${removePropertyFromCorePomXbeanVersion}.jar</Class-Path>
             </manifestEntries>
           </archive>
         </configuration>
@@ -93,7 +93,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>2.7-SNAPSHOT</version>
+        <version>${xbeanVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -252,10 +252,20 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
-      <version>2.7-SNAPSHOT</version>
+      <version>${xbeanVersion}</version>
     </dependency>
-    <!-- FIXME: Why should it be specified here? -->
-    <!-- TODO: Bump up the version to rc4 -->
+    <!-- 
+     FIXME: Why should it be specified here? Shouldn't xbean download what's necessary?
+    -->
+    <!-- 
+     TODO: Bump up the version to the latest 2.0 release once XBean accepts it
+           Impossible now as XBean reports NoClassDefFoundError due to the class re-packaging
+           Caused by: java.lang.NoClassDefFoundError: org/springframework/beans/factory/support/ComponentDefinition
+   	               at java.lang.Class.forName0(Native Method)
+                   at java.lang.Class.forName(Class.java:164)
+   	               at org.apache.xbean.spring.context.v2.XBeanV2Helper.createNamespaceHandler(XBeanV2Helper.java:45)
+   	               ... 33 more
+    -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>

Modified: incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml Tue Oct 10 23:48:33
2006
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>2.7-SNAPSHOT</version>
+        <version>${xbeanVersion}</version>
         <executions>
           <execution>
             <goals>

Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Tue Oct 10 23:48:33 2006
@@ -93,6 +93,23 @@
     <url>http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3</url>
   </scm>
 
+  <properties>
+    <!--
+       - Used in openejb-core pom.xml 
+      -->
+    <xbeanVersion>2.7-SNAPSHOT</xbeanVersion>
+    <!--
+       - Remove the property once it's been figured out how to instruct maven-assembly-plugin
+       - to copy SNAPSHOTs as SNAPSHOTs not 20061004.144417-3.
+       - One SNAPSHOT library is used to generate MANIFEST.MF with Class-Path pointing to
the library
+       - It references the above property - xbeanVersion - that holds SNAPSHOT which is not
available
+       - in lib directory of a assembly as maven-assembly-plugin changes its name to numbers.
+       -
+       - Used in maven-jar-plugin in openejb-core pom.xml and below to declare xbean-finder
dependency
+      -->
+    <removePropertyFromCorePomXbeanVersion>2.6</removePropertyFromCorePomXbeanVersion>
+  </properties>
+
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -198,12 +215,12 @@
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-reflect</artifactId>
-        <version>2.6</version>
+        <version>${xbeanVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-finder</artifactId>
-        <version>2.6</version>
+        <version>${removePropertyFromCorePomXbeanVersion}</version>
       </dependency>
       <dependency>
         <groupId>castor</groupId>

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml?view=diff&rev=462714&r1=462713&r2=462714
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml Tue Oct 10 23:48:33 2006
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>2.7-SNAPSHOT</version>
+        <version>${xbeanVersion}</version>
         <executions>
           <execution>
             <goals>



Mime
View raw message