dain 2004/04/25 16:21:50
Modified: . project.properties
etc global.properties
modules/assembly maven.xml project.xml
modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
modules/connector project.xml
modules/core project.xml
modules/deployment project.xml
modules/maven-plugin project.xml
modules/maven-xmlbeans-plugin project.xml
modules/security project.xml
modules/security/src/etc/META-INF geronimo-service.xml
Log:
Added OpenEJB to assembly
Changed regexp version to 1.3
Changed xml-commons-resolver dependency to xml-resolver
Revision Changes Path
1.10 +2 -2 incubator-geronimo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.properties 22 Mar 2004 00:30:18 -0000 1.9
+++ project.properties 25 Apr 2004 23:21:50 -0000 1.10
@@ -5,4 +5,4 @@
# the directory containing the geronimo website in CVS
geronimo.cvs.docdir = ../incubator-site/build/site/projects/geronimo
-maven.repo.remote=http://www.apache.org/~dain/maven,
http://tranql.codehaus.org/maven, http://www.ibiblio.org/maven/
+maven.repo.remote=http://www.apache.org/~dain/maven,
http://tranql.codehaus.org/maven, http://www.openejb.org/maven,
http://www.ibiblio.org/maven
1.12 +2 -2 incubator-geronimo/etc/global.properties
Index: global.properties
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/global.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- global.properties 8 Apr 2004 05:22:15 -0000 1.11
+++ global.properties 25 Apr 2004 23:21:50 -0000 1.12
@@ -23,7 +23,7 @@
# Build and Deployment
#####################################################
-maven.repo.remote=http://www.apache.org/~dain/maven,
http://tranql.codehaus.org/maven, http://www.ibiblio.org/maven/
+#maven.repo.remote=http://www.apache.org/~dain/maven,http://tranql.codehaus.org/maven,http://www.openejb.org/maven,http://www.ibiblio.org/maven
maven.compile.source=1.4
maven.compile.target=1.4
1.10 +1 -4 incubator-geronimo/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 23 Apr 2004 03:08:28 -0000 1.9
+++ maven.xml 25 Apr 2004 23:21:50 -0000 1.10
@@ -99,9 +99,6 @@
<ant:mkdir dir="${distDir}/repository"/>
<ant:copy todir="${distDir}/repository">
<ant:fileset dir="${maven.repo.local}">
- <ant:include name="geronimo/**"/>
- <ant:include name="geronimo-spec/**"/>
-
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('repository') ==
'true'}">
1.12 +114 -2 incubator-geronimo/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 22 Apr 2004 00:05:48 -0000 1.11
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.12
@@ -52,6 +52,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-clustering</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
@@ -61,6 +64,7 @@
<properties>
<lib>true</lib>
<deploy>true</deploy>
+ <repository>true</repository>
</properties>
</dependency>
@@ -68,6 +72,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
@@ -81,6 +88,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
@@ -90,6 +100,7 @@
<properties>
<lib>true</lib>
<deploy>true</deploy>
+ <repository>true</repository>
</properties>
</dependency>
@@ -97,12 +108,18 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
@@ -120,6 +137,7 @@
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
+ <repository>true</repository>
</properties>
</dependency>
@@ -127,18 +145,27 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-remoting</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
@@ -149,6 +176,7 @@
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
+ <repository>true</repository>
</properties>
</dependency>
@@ -156,18 +184,27 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2eeschema</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
</dependency>
<dependency>
@@ -180,6 +217,24 @@
</dependency>
<dependency>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ <version>1.0-M3-dev</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>0.9.3.9</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
<version>2.0</version>
@@ -214,6 +269,15 @@
</dependency>
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.0</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
@@ -226,6 +290,15 @@
</dependency>
<dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>1.0</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.2</version>
@@ -235,6 +308,15 @@
</dependency>
<dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ <version>3.26</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
<version>5.0.beta0</version>
@@ -244,6 +326,15 @@
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
@@ -267,9 +358,30 @@
</dependency>
<dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-jca</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-itests</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3-dev</version>
+ <version>1.3</version>
<properties>
<repository>true</repository>
</properties>
1.7 +23 -9
incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- j2ee-deployer-plan.xml 12 Apr 2004 06:30:37 -0000 1.6
+++ j2ee-deployer-plan.xml 25 Apr 2004 23:21:50 -0000 1.7
@@ -27,21 +27,27 @@
parentId="org/apache/geronimo/DeployerSystem"
>
- <include>
+ <dependency>
+ <uri>openejb/jars/openejb-core-DEV.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
- </include>
- <include>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-core-DEV.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-security-DEV.jar</uri>
- </include>
+ </dependency>
<dependency>
<uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
</dependency>
- <include>
+ <dependency>
<uri>geronimo/jars/geronimo-naming-DEV.jar</uri>
- </include>
- <include>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-transaction-DEV.jar</uri>
- </include>
+ </dependency>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2eeschema-DEV.jar</uri>
</dependency>
@@ -51,7 +57,10 @@
</dependency>
<!-- required for rar 1.5 to load realms -->
<dependency>
- <uri>regexp/jars/regexp-1.3-dev.jar</uri>
+ <uri>regexp/jars/regexp-1.3.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tranql/jars/tranql-SNAPSHOT.jar</uri>
</dependency>
<gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.Deployer">
@@ -76,6 +85,11 @@
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=WAR,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.jetty.deployment.WARConfigBuilder">
+ <reference name="Kernel">geronimo.boot:role=Kernel</reference>
+ <reference name="Repository">*:role=Repository,*</reference>
+ </gbean>
+
+ <gbean
name="geronimo.deployer:role=Builder,type=EJB,config=org/apache/geronimo/J2EEDeployer"
class="org.openejb.deployment.EJBConfigBuilder">
<reference name="Kernel">geronimo.boot:role=Kernel</reference>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
1.6 +27 -1
incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- j2ee-server-plan.xml 22 Mar 2004 00:30:19 -0000 1.5
+++ j2ee-server-plan.xml 25 Apr 2004 23:21:50 -0000 1.6
@@ -36,7 +36,7 @@
<uri>geronimo/jars/geronimo-j2ee-DEV.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
+ <uri>geronimo/jars/geronimo-core-DEV.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-connector-DEV.jar</uri>
@@ -56,6 +56,12 @@
<dependency>
<uri>tranql/jars/tranql-SNAPSHOT.jar</uri>
</dependency>
+ <dependency>
+ <uri>openejb/jars/openejb-core-DEV.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-jetty-DEV.jar</uri>
+ </dependency>
<gbean name="geronimo.server:type=ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
@@ -87,6 +93,26 @@
<reference
name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference>
<!-- <attribute name="MaxConnections" type="int">10</attribute>-->
<!-- <attribute name="MaxIdleTime" type="int">10</attribute>-->
+ </gbean>
+
+ <gbean name="openejb:type=ContainerIndex"
class="org.openejb.ContainerIndex">
+ <references name="EJBContainers">
+ <pattern>openejb:j2eeType=StatelessSessionBean,*</pattern>
+ <pattern>openejb:j2eeType=StatefulSessionBean,*</pattern>
+ <pattern>openejb:j2eeType=EntityBean,*</pattern>
+ </references>
+ </gbean>
+
+ <!-- EJB Protocol -->
+ <gbean name="openejb:type=SocketService,name=EJB"
class="org.openejb.server.SimpleSocketService">
+ <attribute name="ServiceClassName"
type="java.lang.String">org.openejb.server.ejbd.EjbServer</attribute>
+ <attribute name="OnlyFrom"
type="java.net.InetAddress[]">127.0.0.1</attribute>
+ <reference
name="ContainerIndex">openejb:type=ContainerIndex</reference>
+ </gbean>
+ <gbean name="openejb:type=ServiceDaemon,name=EJB"
class="org.openejb.server.ServiceDaemon">
+ <attribute name="Port" type="int">4201</attribute>
+ <attribute name="InetAddress"
type="java.net.InetAddress">127.0.0.1</attribute>
+ <reference
name="SocketService">openejb:type=SocketService,name=EJB</reference>
</gbean>
<!-- JSR77 Management Objects -->
1.17 +2 -2 incubator-geronimo/modules/connector/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 22 Apr 2004 00:05:48 -0000 1.16
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.17
@@ -163,7 +163,7 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3-dev</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/regexp</url>
</dependency>
</dependencies>
1.52 +3 -3 incubator-geronimo/modules/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- project.xml 22 Apr 2004 00:05:48 -0000 1.51
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.52
@@ -177,8 +177,8 @@
</dependency>
<dependency>
- <groupId>xml-commons-resolver</groupId>
- <artifactId>xml-commons-resolver</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons</url>
</dependency>
1.16 +3 -3 incubator-geronimo/modules/deployment/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/deployment/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 22 Apr 2004 00:05:48 -0000 1.15
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.16
@@ -108,8 +108,8 @@
</dependency>
<dependency>
- <groupId>xml-commons-resolver</groupId>
- <artifactId>xml-commons-resolver</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons</url>
</dependency>
1.11 +2 -2 incubator-geronimo/modules/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/maven-plugin/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 22 Apr 2004 00:05:49 -0000 1.10
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.11
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>xml-commons-resolver</groupId>
- <artifactId>xml-commons-resolver</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<version>1.1</version>
</dependency>
1.6 +2 -2
incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 10 Mar 2004 09:59:06 -0000 1.5
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.6
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>xml-commons-resolver</groupId>
- <artifactId>xml-commons-resolver</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<version>1.1</version>
</dependency>
1.16 +4 -4 incubator-geronimo/modules/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/security/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 22 Apr 2004 00:05:49 -0000 1.15
+++ project.xml 25 Apr 2004 23:21:50 -0000 1.16
@@ -156,7 +156,7 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3-dev</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/regexp</url>
</dependency>
@@ -168,8 +168,8 @@
</dependency>
<dependency>
- <groupId>xml-commons-resolver</groupId>
- <artifactId>xml-commons-resolver</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons</url>
</dependency>
1.6 +1 -1
incubator-geronimo/modules/security/src/etc/META-INF/geronimo-service.xml
Index: geronimo-service.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/security/src/etc/META-INF/geronimo-service.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geronimo-service.xml 10 Mar 2004 09:59:25 -0000 1.5
+++ geronimo-service.xml 25 Apr 2004 23:21:50 -0000 1.6
@@ -19,7 +19,7 @@
<gbeans>
<path>geronimo-security-DEV.jar</path>
<path>geronimo-spec-j2ee-jacc-DEV.jar</path>
- <path>regexp-1.3-dev.jar</path>
+ <path>regexp-1.3.jar</path>
<!-- security -->
<gbean class="org.apache.geronimo.security.SecurityService"
objectName="geronimo.security:type=SecurityService">
