[openejb-scm] [2598] trunk/openejb3: Fix some build issues around M2 configuration

Tue, 11 Apr 2006 06:51:06 -0700

Title: [2598] trunk/openejb3: Fix some build issues around M2 configuration
Revision
2598
Author
jlaskowski
Date
2006-04-11 09:55:31 -0400 (Tue, 11 Apr 2006)

Log Message

Fix some build issues around M2 configuration
 - Add legacy M1 repo on iBiblio
 - module dependencies

OPENEJB-135: Castor 1.0 upgrade

Modified Paths

Property Changed

  • trunk/openejb3/container/openejb-core/
  • trunk/openejb3/container/openejb-loader/
  • trunk/openejb3/container/openejb-persistence/
  • trunk/openejb3/openejb-itests/
  • trunk/openejb3/server/openejb-client/

Diff

Property changes: trunk/openejb3/container/openejb-core

Name: svn:ignore
   - *.ipr
*.iml
*.iws
*~
.project
.classpath
target
   + *.ipr
*.iml
*.iws
*~
.project
.settings
.classpath
target

Modified: trunk/openejb3/container/openejb-core/pom.xml (2597 => 2598)

--- trunk/openejb3/container/openejb-core/pom.xml	2006-04-09 03:10:50 UTC (rev 2597)
+++ trunk/openejb3/container/openejb-core/pom.xml	2006-04-11 13:55:31 UTC (rev 2598)
@@ -117,6 +117,10 @@
     </dependency>
     <dependency>
       <groupId>geronimo</groupId>
+      <artifactId>geronimo-kernel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
       <artifactId>geronimo-timer</artifactId>
       <version>1.2-SNAPSHOT</version>
     </dependency>
@@ -167,5 +171,9 @@
       <version>3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigUtils.java (2597 => 2598)

--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigUtils.java	2006-04-09 03:10:50 UTC (rev 2597)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ConfigUtils.java	2006-04-11 13:55:31 UTC (rev 2598)
@@ -50,7 +50,7 @@
         } catch (IOException e) {
             throw new OpenEJBException(messages.format("conf.1040", confFile, e.getLocalizedMessage()));
         } catch (MarshalException e) {
-            if (e.getException() instanceof IOException) {
+            if (e.getCause() instanceof IOException) {
                 throw new OpenEJBException(messages.format("conf.1040", confFile, e.getLocalizedMessage()));
             } else {
                 throw new OpenEJBException(messages.format("conf.1050", confFile, e.getLocalizedMessage()));

Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/EjbJarUtils.java (2597 => 2598)

--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/EjbJarUtils.java	2006-04-09 03:10:50 UTC (rev 2597)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/EjbJarUtils.java	2006-04-11 13:55:31 UTC (rev 2598)
@@ -89,7 +89,7 @@
         } catch (IOException e) {
             throw new OpenEJBException(messages.format("conf.3040", xmlFile, e.getLocalizedMessage()));
         } catch (MarshalException e) {
-            if (e.getException() instanceof IOException) {
+            if (e.getCause() instanceof IOException) {
                 throw new OpenEJBException(messages.format("conf.3040", xmlFile, e.getLocalizedMessage()));
             } else {
                 throw new OpenEJBException(messages.format("conf.3050", xmlFile, e.getLocalizedMessage()));
@@ -292,7 +292,7 @@
         } catch (IOException e) {
             throw new OpenEJBException(messages.format("conf.2040", xmlFile, e.getLocalizedMessage()));
         } catch (MarshalException e) {
-            if (e.getException() instanceof IOException) {
+            if (e.getCause() instanceof IOException) {
                 throw new OpenEJBException(messages.format("conf.2040", xmlFile, e.getLocalizedMessage()));
             } else {
                 throw new OpenEJBException(messages.format("conf.2050", xmlFile, e.getLocalizedMessage()));

Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ServiceUtils.java (2597 => 2598)

--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ServiceUtils.java	2006-04-09 03:10:50 UTC (rev 2597)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/ServiceUtils.java	2006-04-11 13:55:31 UTC (rev 2598)
@@ -92,7 +92,7 @@
         } catch (IOException e) {
             throw new OpenEJBException(messages.format("conf.4040", xmlFile, e.getLocalizedMessage()));
         } catch (MarshalException e) {
-            if (e.getException() instanceof IOException) {
+            if (e.getCause() instanceof IOException) {
                 throw new OpenEJBException(messages.format("conf.4040", xmlFile, e.getLocalizedMessage()));
             } else {
                 throw new OpenEJBException(messages.format("conf.4050", xmlFile, e.getLocalizedMessage()));

Modified: trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/Unmarshaller.java (2597 => 2598)

--- trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/Unmarshaller.java	2006-04-09 03:10:50 UTC (rev 2597)
+++ trunk/openejb3/container/openejb-core/src/main/java/org/openejb/alt/config/Unmarshaller.java	2006-04-11 13:55:31 UTC (rev 2598)
@@ -156,13 +156,13 @@
             unmarshaller.setEntityResolver(resolver);
             return unmarshaller.unmarshal(reader);
         } catch (MarshalException e) {
-            if (e.getException() instanceof UnknownHostException) {
+            if (e.getCause() instanceof UnknownHostException) {
                 throw new OpenEJBException(EjbJarUtils.messages.format("xml.unkownHost", file, jarLocation, e.getLocalizedMessage()));
-            } else if (e.getException() instanceof org.xml.sax.SAXException) {
+            } else if (e.getCause() instanceof org.xml.sax.SAXException) {
                 throw new OpenEJBException(EjbJarUtils.messages.format("xml.cannotParse", file, jarLocation, e.getLocalizedMessage()));
-            } else if (e.getException() instanceof IOException) {
+            } else if (e.getCause() instanceof IOException) {
                 throw new OpenEJBException(EjbJarUtils.messages.format("xml.cannotRead", file, jarLocation, e.getLocalizedMessage()));
-            } else if (e.getException() instanceof ValidationException) {
+            } else if (e.getCause() instanceof ValidationException) {
                 throw new OpenEJBException(EjbJarUtils.messages.format("xml.cannotValidate", file, jarLocation, e.getLocalizedMessage()));
             } else {
                 e.printStackTrace();

Property changes: trunk/openejb3/container/openejb-loader

Name: svn:ignore
   - *.ipr
*.iml
*.iws
*~
.project
.classpath
target
   + *.ipr
*.iml
*.iws
*~
.project
.settings
.classpath
target

Property changes: trunk/openejb3/container/openejb-persistence

Name: svn:ignore
   + .classpath
.project
.settings

Property changes: trunk/openejb3/openejb-itests

Name: svn:ignore
   - *.ipr
*.iml
*.iws
*~
.project
.classpath
target
   + *.ipr
*.iml
*.iws
*~
.project
.settings
.classpath
target

Modified: trunk/openejb3/pom.xml (2597 => 2598)

--- trunk/openejb3/pom.xml	2006-04-09 03:10:50 UTC (rev 2597)
+++ trunk/openejb3/pom.xml	2006-04-11 13:55:31 UTC (rev 2598)
@@ -65,6 +65,17 @@
       <name>Maven Snapshot Development Repository</name>
       <url>http://snapshots.maven.codehaus.org/maven2</url>
     </repository>
+    <repository>
+      <id>maven-legacy-on-ibiblio</id>
+      <name>Maven1 Repository on iBiblio</name>
+      <url>http://www.ibiblio.org/maven</url>
+      <layout>legacy</layout>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -94,6 +105,11 @@
         <version>1.0</version>
       </dependency>
       <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <version>1.2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-reflect</artifactId>
         <version>2.3-SNAPSHOT</version>
@@ -101,7 +117,7 @@
       <dependency>
         <groupId>castor</groupId>
         <artifactId>castor</artifactId>
-        <version>1.0M3</version>
+        <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>
@@ -119,6 +135,11 @@
         <version>3.8.1</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.0.4</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>

Property changes: trunk/openejb3/server/openejb-client

Name: svn:ignore
   - *.ipr
*.iml
*.iws
*~
.project
.classpath
target
   + *.ipr
*.iml
*.iws
*~
.project
.settings
.classpath
target

Reply via email to