geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1205089 - in /geronimo/specs/trunk: geronimo-ejb_3.1_spec-alt/ geronimo-ejb_3.1_spec-alt/src/ geronimo-ejb_3.1_spec-alt/src/main/ geronimo-ejb_3.1_spec-alt/src/main/java/ geronimo-ejb_3.1_spec-alt/src/main/java/javax/ geronimo-ejb_3.1_spec...
Date Tue, 22 Nov 2011 17:20:17 GMT
Author: dblevins
Date: Tue Nov 22 17:20:17 2011
New Revision: 1205089

URL: http://svn.apache.org/viewvc?rev=1205089&view=rev
Log:
Yanking patch file in favor of a "patch project".

Added:
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml   (with props)
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/ejb/
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/ejb/EJBException.java
      - copied, changed from r1205078, geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java
Removed:
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/SunCompatible.diff

Added: geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml?rev=1205089&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml (added)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml Tue Nov 22 17:20:17 2011
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev: 1032937 $ $Date: 2010-11-09 03:40:25 -0800 (Tue, 09 Nov 2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.specs</groupId>
+    <artifactId>geronimo-ejb_3.1_spec-alt</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo EJB Spec 3.1 (ALT)</name>
+    <version>1.0.3-SNAPSHOT</version>
+    <description>EJB 3.1 API</description>
+
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <distributionManagement>
+        <site>
+            <id>apache-website</id>
+            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+        </site>
+    </distributionManagement>
+
+    <properties>
+        <siteId>specs/${artifactId}</siteId>
+    </properties>
+
+    <dependencies>
+        <dependency>
+	  <groupId>org.apache.geronimo.specs</groupId>
+	  <artifactId>geronimo-ejb_3.1_spec</artifactId>
+	  <version>1.0.2</version>
+	  <scope>provided</scope>
+	</dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-osgi-locator</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
+                        <Specification-Title>JSR-318 Enterprise Java Beans 3.1</Specification-Title>
+                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+                        <Specification-Version>3.1</Specification-Version>
+                        <Export-Package>javax.ejb*;version=3.1</Export-Package>
+                        <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
+                        <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
+                        <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+	    <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+              <version>2.3</version>
+              <executions>
+		<execution>
+		  <id>patch</id>
+		  <phase>process-classes</phase>
+		  <goals>
+		    <goal>unpack</goal>
+		  </goals>
+		  <configuration>
+		    <excludes>javax/ejb/EJBException.class</excludes>
+		    <excludes>**/LICENSE*</excludes>
+		    <artifactItems>
+                      <artifactItem>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.1_spec</artifactId>
+			<version>1.0.2</version>
+			<overWrite>false</overWrite>
+			<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                      </artifactItem>
+		    </artifactItems>
+		  </configuration>
+		</execution>
+              </executions>
+	    </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/ejb/EJBException.java
(from r1205078, geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java)
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/ejb/EJBException.java?p2=geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/ejb/EJBException.java&p1=geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java&r1=1205078&r2=1205089&rev=1205089&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/src/main/java/javax/ejb/EJBException.java
Tue Nov 22 17:20:17 2011
@@ -37,11 +37,10 @@ public class EJBException extends Runtim
     private Exception causeException;
 
     public EJBException() {
-        super();
     }
 
     public EJBException(Exception causeException) {
-        super(causeException);
+        this.causeException = causeException;
     }
 
     public EJBException(String message) {
@@ -49,33 +48,52 @@ public class EJBException extends Runtim
     }
 
     public EJBException(String message, Exception causeException) {
-        super(message, causeException);
+        super(message);
+        this.causeException = causeException;
     }
 
     public Exception getCausedByException() {
-        Throwable cause = getCause();
-        if (cause instanceof Exception) {
-            return (Exception) cause;
-        }
-        return null;
+        return causeException;
     }
 
     public String getMessage() {
-        return super.getMessage();
-    }
 
+        if (causeException == null) return super.getMessage();
 
-    public void printStackTrace(PrintStream ps) {
-        super.printStackTrace(ps);
+        StringBuilder sb = new StringBuilder();
+
+        if (super.getMessage() != null) {
+            sb.append(super.getMessage());
+            sb.append("; ");
+        }
+
+        sb.append("nested exception is: ");
+        sb.append(causeException.toString());
+
+        return sb.toString();
     }
 
+    public void printStackTrace(PrintStream ps) {
+        if (causeException == null) {
+            super.printStackTrace(ps);
+        } else synchronized (ps) {
+            ps.println(this);
+            causeException.printStackTrace(ps);
+            super.printStackTrace(ps);
+        }
+    }
 
     public void printStackTrace() {
-        super.printStackTrace();
+        printStackTrace(System.err);
     }
 
-
     public void printStackTrace(PrintWriter pw) {
-        super.printStackTrace(pw);
+        if (causeException == null) {
+            super.printStackTrace(pw);
+        } else synchronized (pw) {
+            pw.println(this);
+            causeException.printStackTrace(pw);
+            super.printStackTrace(pw);
+        }
     }
 }



Mime
View raw message