You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/09/09 10:14:59 UTC
svn commit: r573957 [2/2] - in /geronimo/server/trunk: configs/
configs/activemq-broker/ configs/activemq-broker/src/main/plan/
configs/activemq-ra/ configs/activemq-ra/src/main/plan/
configs/axis-deployer/ configs/axis-deployer/src/main/plan/ configs/...
Modified: geronimo/server/trunk/configs/connector-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/main/plan/plan.xml Sun Sep 9 01:14:57 2007
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+ 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
@@ -12,110 +13,90 @@
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$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <environment>
- <moduleId>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>car</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- <hidden-classes/>
- <non-overridable-classes/>
- </environment>
- <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
- <attribute name="defaultMaxSize">10</attribute>
- <attribute name="defaultMinSize">0</attribute>
- <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
- <attribute name="defaultIdleTimeoutMinutes">15</attribute>
- <attribute name="defaultXATransactionCaching">true</attribute>
- <attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="ServiceBuilders">
- <name>GBeanBuilder</name>
- </reference>
- <xml-attribute name="defaultEnvironment">
- <environment>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- </gbean>
- <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
- <xml-attribute name="defaultEnvironment">
- <environment/>
- </xml-attribute>
- <reference name="CorbaGBeanNameSource">
- <name>EARBuilder</name>
- </reference>
- </gbean>
- <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
- </gbean>
- <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
- <attribute name="defaultMaxSize">10</attribute>
- <attribute name="defaultMinSize">0</attribute>
- <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
- <attribute name="defaultIdleTimeoutMinutes">15</attribute>
- <attribute name="defaultXATransactionCaching">true</attribute>
- <attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="ServiceBuilders">
- <name>GBeanBuilder</name>
- </reference>
- <xml-attribute name="defaultEnvironment">
- <environment>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-transaction</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- </gbean>
- <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
- <xml-attribute name="defaultEnvironment">
- <environment/>
- </xml-attribute>
- <reference name="CorbaGBeanNameSource">
- <name>AppClientBuilder</name>
- </reference>
- </gbean>
- <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
- </gbean>
-</module>
\ No newline at end of file
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+ <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <attribute name="defaultMaxSize">10</attribute>
+ <attribute name="defaultMinSize">0</attribute>
+ <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+ <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+ <attribute name="defaultXATransactionCaching">true</attribute>
+ <attribute name="defaultXAThreadCaching">false</attribute>
+ <reference name="ServiceBuilders">
+ <name>GBeanBuilder</name>
+ </reference>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>transaction</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+ <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"/>
+ </xml-attribute>
+ <reference name="CorbaGBeanNameSource">
+ <name>EARBuilder</name>
+ </reference>
+ </gbean>
+
+ <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
+
+ <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <attribute name="defaultMaxSize">10</attribute>
+ <attribute name="defaultMinSize">0</attribute>
+ <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+ <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+ <attribute name="defaultXATransactionCaching">true</attribute>
+ <attribute name="defaultXAThreadCaching">false</attribute>
+ <reference name="ServiceBuilders">
+ <name>GBeanBuilder</name>
+ </reference>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>client-transaction</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+ <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"/>
+ </xml-attribute>
+ <reference name="CorbaGBeanNameSource">
+ <name>AppClientBuilder</name>
+ </reference>
+ </gbean>
+
+ <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
+
+</module>
Modified: geronimo/server/trunk/configs/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/pom.xml Sun Sep 9 01:14:57 2007
@@ -32,7 +32,9 @@
<artifactId>cxf-deployer</artifactId>
<name>Geronimo Configs :: CXF Deployer</name>
<packaging>car</packaging>
-
+
+ <description>Geronimo web services deployer for Apache CXF</description>
+
<dependencies>
<dependency>
@@ -57,4 +59,58 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <useMavenDependencies>
+ <value>false</value>
+ </useMavenDependencies>
+ <category>Web Services</category>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jaxws-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>cxf</artifactId>
+ <type>car</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-cxf-builder</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <type>jar</type>
+ <import>classes</import>
+ </dependency>
+ </dependencies>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content>
+ <gbean name="CXFModuleBuilderExtension">
+ <attribute name="listener">?name=#{webcontainer}</attribute>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>#{webcontainerName}</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
+ </gbean>
+ </config-xml-content>
+ </plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml Sun Sep 9 01:14:57 2007
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<!--
+ 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
@@ -12,190 +13,170 @@
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$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <environment>
- <moduleId>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf-deployer</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>car</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-cxf-builder</artifactId>
- <version>2.1-SNAPSHOT</version>
- <type>jar</type>
- <import>classes</import>
- </dependency>
- </dependencies>
- <hidden-classes/>
- <non-overridable-classes/>
- </environment>
- <gbean name="CXFBuilder" class="org.apache.geronimo.cxf.builder.CXFBuilder">
- <xml-attribute name="defaultEnvironment">
- <environment>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- </gbean>
- <gbean name="CXFServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
- <xml-attribute name="defaultEnvironment">
- <environment>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- <reference name="CXFBuilder">
- <name>CXFBuilder</name>
- </reference>
- </gbean>
- <gbean name="CXFClientServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
- <xml-attribute name="defaultEnvironment">
- <environment>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-cxf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws</artifactId>
- <version>2.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-xml</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.2</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-security</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- <reference name="CXFBuilder">
- <name>CXFBuilder</name>
- </reference>
- </gbean>
- <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
- <!--This attribute and the environment must be updated appropriately in the config.xml file-->
- <attribute name="listener">?name=WebContainer</attribute>
- <reference name="WebServiceBuilder">
- <name>CXFBuilder</name>
- </reference>
- <reference name="WebServiceLinkTemplate">
- <name>CXFWebServiceEJBLinkTemplate</name>
- </reference>
- </gbean>
- <gbean name="CXFWebServiceEJBLinkTemplate" class="org.apache.geronimo.cxf.ejb.EJBWebServiceGBean"/>
-</module>
\ No newline at end of file
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+ <gbean name="CXFBuilder" class="org.apache.geronimo.cxf.builder.CXFBuilder">
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>cxf</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+ <gbean name="CXFServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>cxf</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ <reference name="CXFBuilder">
+ <name>CXFBuilder</name>
+ </reference>
+ </gbean>
+
+ <gbean name="CXFClientServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-cxf</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-xml</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-security</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ <reference name="CXFBuilder">
+ <name>CXFBuilder</name>
+ </reference>
+ </gbean>
+
+ <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+ <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
+ <attribute name="listener">?name=WebContainer</attribute>
+
+ <reference name="WebServiceBuilder">
+ <name>CXFBuilder</name>
+ </reference>
+ <reference name="WebServiceLinkTemplate">
+ <name>CXFWebServiceEJBLinkTemplate</name>
+ </reference>
+ </gbean>
+
+ <gbean name="CXFWebServiceEJBLinkTemplate" class="org.apache.geronimo.cxf.ejb.EJBWebServiceGBean"/>
+
+</module>
Modified: geronimo/server/trunk/configs/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf/pom.xml Sun Sep 9 01:14:57 2007
@@ -33,6 +33,10 @@
<name>Geronimo Configs :: CXF</name>
<packaging>car</packaging>
+ <description>
+ Geronimo Web Services Apache CSF integration
+ </description>
+
<dependencies>
<dependency>
@@ -142,5 +146,21 @@
<artifactId>neethi</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Web Services</category>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/configs/cxf/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/src/main/plan/plan.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf/src/main/plan/plan.xml Sun Sep 9 01:14:57 2007
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more
+<?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
@@ -12,163 +13,11 @@
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$ $Date$-->
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>cxf</dep:artifactId>
- <dep:version>2.1-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>server-security-config</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-tools-common</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-bindings-xml</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>xml-resolver</dep:groupId>
- <dep:artifactId>xml-resolver</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>j2ee-server</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.springframework</dep:groupId>
- <dep:artifactId>spring-core</dep:artifactId>
- <dep:version>2.0.5</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-api</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-databinding-jaxb</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.ws.commons.schema</dep:groupId>
- <dep:artifactId>XmlSchema</dep:artifactId>
- <dep:version>1.2</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.springframework</dep:groupId>
- <dep:artifactId>spring-beans</dep:artifactId>
- <dep:version>2.0.5</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.neethi</dep:groupId>
- <dep:artifactId>neethi</dep:artifactId>
- <dep:version>2.0</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>webservices-common</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>transaction</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-frontend-simple</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-frontend-jaxws</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-common-utilities</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-bindings-soap</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-transports-http</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.springframework</dep:groupId>
- <dep:artifactId>spring-context</dep:artifactId>
- <dep:version>2.0.5</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>openejb</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-cxf</dep:artifactId>
- <dep:version>2.1-SNAPSHOT</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.cxf</dep:groupId>
- <dep:artifactId>cxf-rt-core</dep:artifactId>
- <dep:version>2.0-incubator</dep:version>
- <dep:type>jar</dep:type>
- <dep:import>classes</dep:import>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
-</module>
\ No newline at end of file
+
+</module>
Modified: geronimo/server/trunk/configs/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/pom.xml Sun Sep 9 01:14:57 2007
@@ -45,6 +45,7 @@
<artifactId>geronimo-dojo</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -90,13 +91,10 @@
</module>
<category>Web Framework</category>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
<instance>
<plugin-artifact>
<prerequisite>
Modified: geronimo/server/trunk/configs/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/pom.xml Sun Sep 9 01:14:57 2007
@@ -45,6 +45,7 @@
<artifactId>geronimo-dojo</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -89,13 +90,10 @@
</module>
<category>Web Framework</category>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
<instance>
<plugin-artifact>
<prerequisite>
Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Sun Sep 9 01:14:57 2007
@@ -103,11 +103,17 @@
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<osiApproved>true</osiApproved>
+<!--
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+-->
<commonInstance>
<plugin-artifact>
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.5</jvm-version>
- <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1</source-repository>
+ <source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>
<source-repository>http://repo1.maven.org/maven2/</source-repository>
</plugin-artifact>
</commonInstance>
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=573957&r1=573956&r2=573957&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sun Sep 9 01:14:57 2007
@@ -1473,6 +1473,7 @@
public static class NamespaceFilter extends XMLFilterImpl {
private static String PLUGIN_NS = "http://geronimo.apache.org/xml/ns/plugins-1.3";
private static String GBEAN_NS = "http://geronimo.apache.org/xml/ns/attributes-1.2";
+ private static String ENVIRONMENT_NS = "http://geronimo.apache.org/xml/ns/deployment-1.2";
private String namespace;
@@ -1486,6 +1487,8 @@
namespace = PLUGIN_NS;
} else if ("gbean".equals(localName)) {
namespace = GBEAN_NS;
+ } else if ("environment".equals(localName)) {
+ namespace = ENVIRONMENT_NS;
}
super.startElement(namespace, localName, qname, atts);
}
@@ -1497,6 +1500,8 @@
namespace = null;
} else if ("gbean".equals(localName)) {
namespace = PLUGIN_NS;
+ } else if ("environment".equals(localName)) {
+ namespace = GBEAN_NS;
}
}
}