Author: ningjiang
Date: Mon Oct 9 20:31:10 2006
New Revision: 454594
URL: http://svn.apache.org/viewvc?view=rev&rev=454594
Log:
CXF-149 Applied david's patch
Modified:
incubator/cxf/trunk/jca/pom.xml
incubator/cxf/trunk/jca/src/main/java/org/apache/cxf/jca/servant/EJBServant.java
Modified: incubator/cxf/trunk/jca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/pom.xml?view=diff&rev=454594&r1=454593&r2=454594
==============================================================================
--- incubator/cxf/trunk/jca/pom.xml (original)
+++ incubator/cxf/trunk/jca/pom.xml Mon Oct 9 20:31:10 2006
@@ -82,29 +82,20 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
</dependency>
+
+ <!--TODO It's pretty unclear why there is code requiring ejb classes.
Perhaps the code doesn't belong here? -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <version>4.0.2</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
</dependency>
+
</dependencies>
</project>
Modified:
incubator/cxf/trunk/jca/src/main/java/org/apache/cxf/jca/servant/EJBServant.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/src/main/java/org/apache/cxf/jca/servant/EJBServant.java?view=diff&rev=454594&r1=454593&r2=454594
==============================================================================
---
incubator/cxf/trunk/jca/src/main/java/org/apache/cxf/jca/servant/EJBServant.java
(original)
+++
incubator/cxf/trunk/jca/src/main/java/org/apache/cxf/jca/servant/EJBServant.java
Mon Oct 9 20:31:10 2006
@@ -229,7 +229,7 @@
/**
* Creates a new Initial Context with the specified properties.
- * @param props Properties for initial context.
+ * @param propers Properties for initial context.
* @return Context initial context for EJB lookup.
* @throws NamingException if there is an error getting initial context.
*/
