3:22 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2010-07-29 04:22:20 -0400 (Thu, 29 Jul 2010)
New Revision: 12700
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
Log:
- [JBPAPP-3823] Applying Yiqiao / Fernando 's patch for supporting EWP
- securing console after installer run and adding ant target for noauth version
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml 2010-07-28
16:42:24 UTC (rev 12699)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml 2010-07-29
08:22:20 UTC (rev 12700)
@@ -14,39 +14,45 @@
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
-
- <target name="deploy-structure-jboss51"
depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <!-- all -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+
+ <target name="deploy-jbossws-cxf51-all"
if="jbossws.all.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false"
>
<param name="installserver"
value="${deploy.structure}/server/all"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir"
value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
</antcall>
- <!-- standard -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+ </target>
+
+ <target name="deploy-jbossws-cxf51-standard"
if="jbossws.standard.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false"
>
<param name="installserver"
value="${deploy.structure}/server/standard"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir"
value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
</antcall>
- <!-- production -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+ </target>
+
+ <target name="deploy-jbossws-cxf51-production"
if="jbossws.production.available">
+ <antcall target="deploy-jbossws-cxf51"
inheritall="false">
<param name="installserver"
value="${deploy.structure}/server/production"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir"
value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
</antcall>
- <!-- web -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
- <param name="installserver"
value="${deploy.structure}/server/web"/>
- <param name="jbossid" value="jboss510"/>
- <param name="artifactsdir"
value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
- </antcall>
- <!-- default -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+ </target>
+
+ <target name="deploy-jbossws-cxf51-web"
if="jbossws.web.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false"
>
+ <param name="installserver"
value="${deploy.structure}/server/web"/>
+ <param name="jbossid" value="jboss510"/>
+ <param name="artifactsdir"
value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
+ </antcall>
+ </target>
+
+ <target name="deploy-jbossws-cxf51-default"
if="jbossws.default.available">
+ <antcall target="deploy-jbossws-cxf51"
inheritall="false">
<param name="installserver"
value="${deploy.structure}/server/default"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir"
value="${deploy.artifacts.dir}"/>
@@ -54,10 +60,24 @@
</antcall>
</target>
+ <target name="deploy-structure-jboss51"
depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <!-- all -->
+ <antcall target="deploy-jbossws-cxf51-all"/>
+ <!-- standard -->
+ <antcall target="deploy-jbossws-cxf51-standard"/>
+ <!-- production -->
+ <antcall target="deploy-jbossws-cxf51-production"/>
+ <!-- web -->
+ <antcall target="deploy-jbossws-cxf51-web"/>
+ <!-- default -->
+ <antcall target="deploy-jbossws-cxf51-default"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Deployment JBoss510 -->
<!-- ================================================================== -->
-
+
<target name="deploy-jboss510"
depends="undeploy-jboss510,deploy-structure-jboss51">
<fail message="Please make sure you're running this script from
$JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/>
<copy todir="${jboss510.home}" overwrite="true">
@@ -68,11 +88,27 @@
<target name="undeploy-jboss510" depends="init">
<fail message="Please make sure you're running this script from your
$JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/>
+ <antcall target="undeploy-jboss510-all"/>
+ <antcall target="undeploy-jboss510-production"/>
+ <antcall target="undeploy-jboss510-web"/>
+ <antcall target="undeploy-jboss510-standard"/>
+ <antcall target="undeploy-jboss510-default"/>
+ </target>
+
+ <target name="undeploy-jboss510-all"
if="jbossws.all.available">
<macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/all/deploy/jbossws.sar"
defaultconf="${jbossws.all.deploy.conf}"/>
+ </target>
+ <target name="undeploy-jboss510-production"
if="jbossws.production.available">
<macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/production/deploy/jbossws.sar"
defaultconf="${jbossws.production.deploy.conf}"/>
- <macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/web/deploy/jbossws.sar"
defaultconf="${jbossws.web.deploy.conf}"/>
+ </target>
+ <target name="undeploy-jboss510-web"
if="jbossws.web.available">
+ <macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/web/deploy/jbossws.sar"
defaultconf="${jbossws.web.deploy.conf}"/>
+ </target>
+ <target name="undeploy-jboss510-standard"
if="jbossws.standard.available">
<macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/standard/deploy/jbossws.sar"
defaultconf="${jbossws.standard.deploy.conf}"/>
- <macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/default/deploy/jbossws.sar"
defaultconf="${jbossws.default.deploy.conf}"/>
</target>
+ <target name="undeploy-jboss510-default"
if="jbossws.default.available">
+ <macro-undeploy-jbossws51
targetdir="${jboss510.home}/server/default/deploy/jbossws.sar"
defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
</project>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2010-07-28 16:42:24
UTC (rev 12699)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2010-07-29 08:22:20
UTC (rev 12700)
@@ -29,11 +29,39 @@
<property name="jbossws.integration.target"
value="jboss510"/>
<property name="jboss510.home" value="${basedir}/.."/>
-
+ <available property="jbossws.default.available"
file="${jboss510.home}/server/default"/>
+ <available property="jbossws.standard.available"
file="${jboss510.home}/server/standard"/>
+ <available property="jbossws.production.available"
file="${jboss510.home}/server/production"/>
+ <available property="jbossws.web.available"
file="${jboss510.home}/server/web"/>
+ <available property="jbossws.all.available"
file="${jboss510.home}/server/all"/>
+
<import file="${build.dir}/build-setup.xml"/>
<import file="${build.dir}/build-deploy.xml"/>
<import file="${build.dir}/jbossws-installer-macros.xml"/>
+
+ <target name="secure-console">
+ <!-- all -->
+ <copy file="build/web.xml"
tofile="${jboss510.home}/server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml"
overwrite="true"/>
+ <copy file="build/jboss-web.xml"
tofile="${jboss510.home}/server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml"
overwrite="true"/>
+
+ <!-- production -->
+ <copy file="build/web.xml"
tofile="${jboss510.home}/server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml"
overwrite="true"/>
+ <copy file="build/jboss-web.xml"
tofile="${jboss510.home}/server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml"
overwrite="true"/>
+
+ <!-- web -->
+ <copy file="build/web.xml"
tofile="${jboss510.home}/server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml"
overwrite="true"/>
+ <copy file="build/jboss-web.xml"
tofile="${jboss510.home}/server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml"
overwrite="true"/>
+
+ <!-- standard -->
+ <copy file="build/web.xml"
tofile="${jboss510.home}/server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml"
overwrite="true"/>
+ <copy file="build/jboss-web.xml"
tofile="${jboss510.home}/server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml"
overwrite="true"/>
+
+ <!-- default -->
+ <copy file="build/web.xml"
tofile="${jboss510.home}/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml"
overwrite="true"/>
+ <copy file="build/jboss-web.xml"
tofile="${jboss510.home}/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml"
overwrite="true"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
@@ -52,10 +80,15 @@
<!-- dummy targets -->
<target name="prepare-deploy" depends="init"/>
- <target name="install" depends="clean, deploy-jboss510"
description="Install JBossWS-CXF">
+ <target name="install" depends="clean, deploy-jboss510,
secure-console" description="Install JBossWS-CXF">
<echo
message="-----------------------------------------------------------------------"/>
</target>
+ <!-- copy noauth xml files over to server/<config> dir to disable
authentication when "ant noauth" is called -->
+ <target name="install-noauth" depends="clean, deploy-jboss510"
description="Install JBossWS-CXF with no authentication">
+ <echo
message="-----------------------------------------------------------------------"/>
+ </target>
+
<target name="clean" depends="prepare">
<delete dir="${output.dir}"/>
</target>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
(rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml 2010-07-29
08:22:20 UTC (rev 12700)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!-- A security domain that restricts access -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
+
+ <context-root>jbossws</context-root>
+
+</jboss-web>
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
(rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml 2010-07-29 08:22:20
UTC (rev 12700)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ A web application that installs the JBossWS servlets
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossWS</display-name>
+
+ <servlet>
+ <servlet-name>ContextServlet</servlet-name>
+
<servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+ </servlet>
+
+ <!-- now the mappings -->
+
+ <servlet-mapping>
+ <servlet-name>ContextServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- A security constraint that restricts access -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>ContextServlet</web-resource-name>
+ <description>An example security config that only allows users with the
+ role 'JBossAdmin' to access the JBossWS console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBossWS Management Console</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
+
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml 2010-07-28
16:42:24 UTC (rev 12699)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml 2010-07-29
08:22:20 UTC (rev 12700)
@@ -25,7 +25,18 @@
<include>build-setup.xml</include>
</includes>
</fileSet>
+
+ <!-- include secure version of files web.xml, jboss-web.xml -->
<fileSet>
+ <directory>src/main/installer</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>web.xml</include>
+ <include>jboss-web.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>modules/resources/src/main/resources/resources</directory>
<outputDirectory>build</outputDirectory>
<includes>