[jbossws-commits] JBossWS SVN: r6419 - in stack/cxf/branches/tdiesler/trunk: ant-import and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 14 09:50:16 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-14 09:50:16 -0400 (Mon, 14 Apr 2008)
New Revision: 6419
Added:
stack/cxf/branches/tdiesler/trunk/runtime/server/ant/
stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-server.jar/
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-server.jar/META-INF/
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf.sar/
Removed:
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/META-INF/
stack/cxf/branches/tdiesler/trunk/src/main/resources/
Modified:
stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml
Log:
Migrate resource handling
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-14 13:34:48 UTC (rev 6418)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -42,9 +42,8 @@
<include name="jbossws-cxf-server-${version.id}.jar"/>
</fileset>
</copy>
- <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${deploy.artifacts.dir}/lib/wstx.jar"/>
<copy todir="${deploy.artifacts.dir}/resources">
- <fileset dir="${cxf.output.resources.dir}">
+ <fileset dir="${cxf.runtime.server.dir}/target/resources">
<include name="jbossws-cxf42-beans.xml"/>
<include name="jbossws-cxf50-beans.xml"/>
<include name="jbossws-jboss42.sar/**"/>
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 13:34:48 UTC (rev 6418)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -72,40 +72,8 @@
| documentation compiles.
-->
- <target name="compile" depends="init,compile-resources" description="Compile all source files."/>
+ <target name="compile" depends="init" description="Compile all source files."/>
- <!-- Compile resource files -->
- <target name="compile-resources" depends="init">
-
- <!-- Concat jbossws-cxf50-beans.xml -->
- <mkdir dir="${cxf.output.resources.dir}"/>
- <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <copy todir="${cxf.output.resources.dir}">
- <fileset dir="${cxf.resources.dir}">
- <include name="jbossws-cxf.sar/**"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
Added: stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main">
+
+ <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+ <property name="project.build.directory" value="${basedir}/target"/>
+ <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
+
+ <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="main" depends="init">
+
+ <!-- concat jbossws-cxf50-beans.xml -->
+ <echo message="Concat jbossws-cxf50-beans.xml"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-cxf50-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-cxf42-beans.xml -->
+ <echo message="Concat jbossws-cxf42-beans.xml"/>
+ <unzip dest="${project.build.resources.directory}" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-cxf42-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ </target>
+
+</project>
Property changes on: stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-14 13:34:48 UTC (rev 6418)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -6,6 +6,7 @@
<artifactId>jbossws-cxf-server</artifactId>
<packaging>jar</packaging>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-cxf-runtime</artifactId>
@@ -14,13 +15,23 @@
<!-- Plugins -->
<build>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>src/main/resources/jbossws-cxf-server.jar</directory>
+ </resource>
+ <resource>
+ <targetPath>../resources/jbossws-cxf.sar</targetPath>
+ <directory>src/main/resources/jbossws-cxf.sar</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy</id>
+ <id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
@@ -32,6 +43,23 @@
</execution>
</executions>
</plugin>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="ant/build-concat.xml"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Copied: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml (from rev 6407, stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-cxf-config.xml)
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -0,0 +1,126 @@
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>org.apache.cxf</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
+ <property name="requires">EndpointAddress</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
+ <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ </bean>
+
+ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+
+ <!-- Phase 2 -->
+ <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ </bean>
+
+ <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
+
Copied: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-server.jar/META-INF (from rev 6407, stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/META-INF)
Copied: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf.sar (from rev 6407, stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-cxf.sar)
More information about the jbossws-commits
mailing list