You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/12/09 00:34:15 UTC
svn commit: r484846 - in /incubator/openejb/trunk/openejb2: ./
modules/openejb-builder/
modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/
modules/openejb-corba-builder/ modules/openejb-corba/
modules/openejb-corba/src/main/jav...
Author: dblevins
Date: Fri Dec 8 15:34:10 2006
New Revision: 484846
URL: http://svn.apache.org/viewvc?view=rev&rev=484846
Log:
Marked all the geronimo lib deps as 'provided' so any version of Geronimo can reference these libs
Modified:
incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java
incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/pom.xml
incubator/openejb/trunk/openejb2/modules/openejb-corba/pom.xml
incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java
incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml
incubator/openejb/trunk/openejb2/pom.xml
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml Fri Dec 8 15:34:10 2006
@@ -45,6 +45,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-timer</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-pkgen-builder</artifactId>
<version>${pom.version}</version>
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java Fri Dec 8 15:34:10 2006
@@ -27,8 +27,6 @@
import javax.ejb.TimerService;
/**
- *
- *
* @version $Revision$ $Date$
*/
public abstract class MockCMPEJB implements EntityBean, TimedObject {
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java Fri Dec 8 15:34:10 2006
@@ -23,8 +23,6 @@
import javax.ejb.FinderException;
/**
- *
- *
* @version $Revision$ $Date$
*/
public interface MockHome extends EJBHome {
Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/pom.xml?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/pom.xml Fri Dec 8 15:34:10 2006
@@ -43,11 +43,12 @@
<artifactId>openejb-builder</artifactId>
<version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
</dependency>
-
+
<!--- TODO this is bad news. needed for default principal xml -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba/pom.xml?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba/pom.xml Fri Dec 8 15:34:10 2006
@@ -39,6 +39,32 @@
<version>${pom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-management</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-timer</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba/src/main/java/org/apache/openejb/corba/security/config/ssl/SSLConfig.java Fri Dec 8 15:34:10 2006
@@ -77,11 +77,11 @@
* SSLConfig specifices.
*
* @throws KeystoreException
- * When a problem occurs while creating the factory.
+ * When a problem occurs while creating the factory.
*/
public SSLSocketFactory createSSLFactory(ClassLoader loader) throws KeystoreException {
if (manager != null) {
- // fix up the default algorithm now.
+ // fix up the default algorithm now.
if ("default".equalsIgnoreCase(algorithm)) {
this.algorithm = KeyManagerFactory.getDefaultAlgorithm();
}
@@ -104,11 +104,11 @@
* SSLConfig specifices.
*
* @throws KeystoreException
- * When a problem occurs while creating the factory.
+ * When a problem occurs while creating the factory.
*/
public SSLServerSocketFactory createSSLServerFactory(ClassLoader loader) throws KeystoreException {
if (manager != null) {
- // fix up the default algorithm now.
+ // fix up the default algorithm now.
if ("default".equalsIgnoreCase(algorithm)) {
this.algorithm = KeyManagerFactory.getDefaultAlgorithm();
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml Fri Dec 8 15:34:10 2006
@@ -49,12 +49,30 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!--- TODO this is bad news. needed for default principal xml -->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
</dependency>
<dependency>
Modified: incubator/openejb/trunk/openejb2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/pom.xml?view=diff&rev=484846&r1=484845&r2=484846
==============================================================================
--- incubator/openejb/trunk/openejb2/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/pom.xml Fri Dec 8 15:34:10 2006
@@ -295,72 +295,84 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-client</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-interceptor</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -373,162 +385,189 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-timer</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices-builder</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
<version>${geronimoVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
<version>${geronimoSpecEjbVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimoSpecJ2eeConnectorVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
<version>${geronimoSpecJ2eeDeploymentVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jacc_1.1_spec</artifactId>
<version>${geronimoSpecJ2eeJaccVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
<version>${geronimoSpecJ2eeManagementVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
<version>${geronimoSpecJaxrVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
<version>${geronimoSpecJaxrpcVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
<version>${geronimoSpecJspVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimoSpecJmsVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<version>${geronimoSpecJtaVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
<version>${geronimoSpecQnameVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.1_spec</artifactId>
<version>${geronimoSpecSaajVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>${geronimoSpecServletVersion}</version>
+ <scope>provided</scope>
</dependency>
<!--<dependency>-->