You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2005/01/08 02:19:21 UTC
svn commit: r124598 - /geronimo/trunk/etc/project.properties /geronimo/trunk/modules/assembly/project.xml /geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml /geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Author: dblevins
Date: Fri Jan 7 17:19:20 2005
New Revision: 124598
URL: http://svn.apache.org/viewcvs?view=rev&rev=124598
Log:
Added WSContainer and related GBeans and libraries.
Modified:
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Modified: geronimo/trunk/etc/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?view=diff&rev=124598&p1=geronimo/trunk/etc/project.properties&r1=124597&p2=geronimo/trunk/etc/project.properties&r2=124598
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Fri Jan 7 17:19:20 2005
@@ -149,9 +149,12 @@
p2psockets_version=1.1.2
regexp_version=1.3
spring_version=1.0.1
+stax_version=1.1.1-dev
+stax_api_version=1.0
tomcat_version=5.5.4
velocity_version=1.4-rc1
xerces_version=2.6.2
+xfire_version=20041222
xml_apis_version=1.0.b2
xml_resolver_version=1.1
xml_parser_apis_version=2.2.1
@@ -159,6 +162,7 @@
xmlpull_version=1.1.3.4d_b4_min
xstream_version=1.0.2
xpp3_version=1.1.3.3
+wsdl4j_version=1.4
#####################################################
# Site Colors
Modified: geronimo/trunk/modules/assembly/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&rev=124598&p1=geronimo/trunk/modules/assembly/project.xml&r1=124597&p2=geronimo/trunk/modules/assembly/project.xml&r2=124598
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri Jan 7 17:19:20 2005
@@ -900,6 +900,59 @@
<repository>true</repository>
</properties>
</dependency>
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>xfire</artifactId>
+ <version>${xfire_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>xfire-java</artifactId>
+ <version>${xfire_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>xfire-jaxrpc</artifactId>
+ <version>${xfire_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>${stax_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax_api_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&rev=124598&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r1=124597&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r2=124598
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Fri Jan 7 17:19:20 2005
@@ -133,6 +133,26 @@
<uri>ant/jars/ant-${ant_version}.jar</uri>
</dependency>
+ <!-- HTTP/SOAP with XFire -->
+ <dependency>
+ <uri>xfire/jars/xfire-${xfire_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xfire/jars/xfire-java-${xfire_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xfire/jars/xfire-jaxrpc-${xfire_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>wsdl4j/jars/wsdl4j-${wsdl4j_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>stax/jars/stax-${stax_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
+ </dependency>
+
<gbean name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.deployment.Deployer">
<reference name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/J2EEDeployer,*</reference>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&rev=124598&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r1=124597&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r2=124598
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Fri Jan 7 17:19:20 2005
@@ -119,6 +119,28 @@
<uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
</dependency>
+
+ <!-- HTTP/SOAP with XFire -->
+ <dependency>
+ <uri>xfire/jars/xfire-${xfire_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xfire/jars/xfire-java-${xfire_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xfire/jars/xfire-jaxrpc-${xfire_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>wsdl4j/jars/wsdl4j-${wsdl4j_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>stax/jars/stax-${stax_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
+ </dependency>
+
+
<!-- Default security realm using properties files -->
<gbean name="geronimo.security:type=LoginModule,name=properties-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
@@ -229,7 +251,21 @@
<!-- <attribute name="MaxIdleTime" type="int">10</attribute>-->
</gbean>
- <!-- EJB container -->
+ <!-- EJB Protocol -->
+ <gbean name="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
+ <attribute name="name">EJB</attribute>
+ <attribute name="port">4201</attribute>
+ <attribute name="address">127.0.0.1</attribute>
+ <attribute name="allowHosts">127.0.0.1</attribute>
+ <attribute name="priority">5</attribute>
+ <attribute name="threads">20</attribute>
+ <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
+ <attribute name="logOnFailure">HOST,NAME</attribute>
+ <reference name="Server">openejb:type=Server,name=EJB</reference>
+ </gbean>
+ <gbean name="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
+ <reference name="ContainerIndex">openejb:type=ContainerIndex</reference>
+ </gbean>
<!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
<gbean name="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
<references name="EJBContainers">
@@ -239,17 +275,28 @@
</references>
</gbean>
- <!-- EJB Protocol -->
- <gbean name="openejb:type=SocketService,name=EJB" class="org.openejb.server.SimpleSocketService">
- <attribute name="serviceClassName">org.openejb.server.ejbd.EjbServer</attribute>
- <attribute name="onlyFrom">127.0.0.1</attribute>
- <reference name="ContainerIndex">openejb:type=ContainerIndex</reference>
+ <!-- HTTP/SOAP Protocol -->
+ <gbean name="openejb:type=NetworkService,name=HTTPSOAP" class="org.openejb.server.StandardServiceStackGBean">
+ <attribute name="name">HTTPSOAP</attribute>
+ <attribute name="port">8000</attribute>
+ <attribute name="address">127.0.0.1</attribute>
+ <attribute name="allowHosts">127.0.0.1</attribute>
+ <attribute name="priority">5</attribute>
+ <attribute name="threads">5</attribute>
+ <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
+ <attribute name="logOnFailure">HOST,NAME</attribute>
+ <reference name="Server">openejb:type=Server,name=HTTPSOAP</reference>
</gbean>
- <gbean name="openejb:type=ServiceDaemon,name=EJB" class="org.openejb.server.ServiceDaemon">
- <attribute name="port">4201</attribute>
- <attribute name="inetAddress">127.0.0.1</attribute>
- <reference name="SocketService">openejb:type=SocketService,name=EJB</reference>
+ <gbean name="openejb:type=Server,name=HTTPSOAP" class="org.openejb.server.httpd.HttpServerGBean">
+ <reference name="Listener">openejb:type=SoapHttpListener</reference>
</gbean>
+ <gbean name="openejb:type=SoapHttpListener" class="org.openejb.server.soap.SoapHttpListenerGBean">
+ <reference name="WSContainerIndex">openejb:type=WSContainerIndex</reference>
+ </gbean>
+ <gbean name="openejb:type=WSContainerIndex" class="org.openejb.server.soap.WSContainerIndexGBean">
+ <reference name="WSContainers">openejb:type=WSContainer,*</reference>
+ </gbean>
+
<!-- JSR77 Management Objects -->
<gbean name="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>