Skip to content

Commit

Permalink
[JBWS-3934] Add support for WildFly 8.2.1.Final and remove support fo…
Browse files Browse the repository at this point in the history
…r WildFly 8.2.0.Final

Conflicts:
	modules/dist/src/main/scripts/build-deploy.xml
	modules/testsuite/pom.xml
	pom.xml
  • Loading branch information
asoldano committed Jul 31, 2015
1 parent ea48fc9 commit a94b249
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 41 deletions.
10 changes: 5 additions & 5 deletions modules/dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,22 +227,22 @@
</profile>

<!--
Name: wildfly820
Descr: WildFly-8.2.0 specific dependencies
Name: wildfly821
Descr: WildFly-8.2.1 specific dependencies
-->
<profile>
<id>wildfly820</id>
<id>wildfly821</id>
<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>wildfly820</classifier>
<classifier>wildfly821</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly820-server-integration</artifactId>
<artifactId>jbossws-wildfly821-server-integration</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
34 changes: 17 additions & 17 deletions modules/dist/src/main/scripts/build-deploy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<property name="deploy.artifacts.dir" value="${basedir}/target/assembly/deploy-artifacts"/>
<property name="jbossws.default.modules.conf" value="${basedir}/target/assembly/deploy-artifacts/modules-deploy.conf"/>

<target name="deploy" depends="prepare,deploy-wildfly820-if-available,deploy-wildfly900-if-available,deploy-wildfly1000-if-available" description="Deploy jbossws to wildfly"/>
<target name="deploy" depends="prepare,deploy-wildfly821-if-available,deploy-wildfly900-if-available,deploy-wildfly1000-if-available" description="Deploy jbossws to wildfly"/>

<target name="deploy-wildfly820-if-available" if="wildfly820.available">
<antcall target="deploy-wildfly820"/>
<target name="deploy-wildfly821-if-available" if="wildfly821.available">
<antcall target="deploy-wildfly821"/>
</target>

<target name="deploy-wildfly900-if-available" if="wildfly900.available">
Expand All @@ -43,19 +43,19 @@
</target>

<target name="prepare">
<condition property="wildfly820.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly820"/>
<condition property="wildfly821.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly821"/>
</condition>
<condition property="wildfly900.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly900"/>
</condition>
<condition property="wildfly1000.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly1000"/>
</condition>
<property name="wildfly820.available.file" value="${wildfly820.home}/jboss-modules.jar"/>
<property name="wildfly821.available.file" value="${wildfly821.home}/jboss-modules.jar"/>
<property name="wildfly900.available.file" value="${wildfly900.home}/jboss-modules.jar"/>
<property name="wildfly1000.available.file" value="${wildfly1000.home}/jboss-modules.jar"/>
<available property="wildfly820.available" file="${wildfly820.available.file}"/>
<available property="wildfly821.available" file="${wildfly821.available.file}"/>
<available property="wildfly900.available" file="${wildfly900.available.file}"/>
<available property="wildfly1000.available" file="${wildfly1000.available.file}"/>
<tstamp>
Expand Down Expand Up @@ -107,32 +107,32 @@
</target>

<!-- ================================================================== -->
<!-- Deployment wildfly820 -->
<!-- Deployment wildfly821 -->
<!-- ================================================================== -->

<target name="target-wildfly820">
<property name="jbossws.integration.target" value="wildfly820"/>
<target name="target-wildfly821">
<property name="jbossws.integration.target" value="wildfly821"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}"/>
</target>

<target name="deploy-wildfly820" depends="undeploy-wildfly820,deploy-structure-wildfly80x,check-spring,install-spring-module80x">
<fail message="Not available: ${wildfly820.available.file}" unless="wildfly820.available"/>
<copy todir="${wildfly820.home}" overwrite="true" verbose="true">
<target name="deploy-wildfly821" depends="undeploy-wildfly821,deploy-structure-wildfly80x,check-spring,install-spring-module80x">
<fail message="Not available: ${wildfly821.available.file}" unless="wildfly821.available"/>
<copy todir="${wildfly821.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}">
<exclude name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</copy>
<!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
<installModules targetDir="${wildfly820.home}/modules/system/layers/base/">
<installModules targetDir="${wildfly821.home}/modules/system/layers/base/">
<fileset dir="${deploy.structure}/modules/system/layers/base">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
</target>

<target name="undeploy-wildfly820" depends="target-wildfly820,init">
<fail message="Not available: ${wildfly820.available.file}" unless="wildfly820.available"/>
<macro-undeploy-jbossws-modules targetdir="${wildfly820.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
<target name="undeploy-wildfly821" depends="target-wildfly821,init">
<fail message="Not available: ${wildfly821.available.file}" unless="wildfly821.available"/>
<macro-undeploy-jbossws-modules targetdir="${wildfly821.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>

<!-- ================================================================== -->
Expand Down
6 changes: 3 additions & 3 deletions modules/resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
<phase>package</phase>
</execution>
<execution>
<id>wildfly820</id>
<id>wildfly821</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
<configuration>
<classifier>wildfly820</classifier>
<classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly820/jbossws.beans</classesDirectory>
<classifier>wildfly821</classifier>
<classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly821/jbossws.beans</classesDirectory>
</configuration>
</execution>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion modules/server/src/main/scripts/antrun-beans-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<copy
file="${src.dir}/jbossws-cxf-config-as8.xml"
tofile="${dest.dir}/jbossws-wildfly820/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
tofile="${dest.dir}/jbossws-wildfly821/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>

<copy
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
def root = new XmlParser().parse(project.properties['inputFile'])

/**
* Fix logging: remove CONSOLE handler and set a specific log file
*
*/
def logHandlers = root.profile.subsystem.'root-logger'.handlers[0]
def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'}
logHandlers.remove(consoleHandler)
def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
file.attributes()['path'] = project.properties['serverLog']

/**
* Modify ApplicationRealm security-realm to use custom properties files
*
* <security-realm name="ApplicationRealm">
* <authentication>
* <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
* <properties path="jbws-application-users.properties" relative-to="jboss.server.config.dir"/>
* </authentication>
* <authorization>
* <properties path="jbws-application-roles.properties" relative-to="jboss.server.config.dir"/>
* </authorization>
* </security-realm>
**/
def securityRealms = root.management.'security-realms'[0]
def appRealm = securityRealms.find{it.@name == 'ApplicationRealm'}
def realmAuthentication = appRealm.'authentication'[0];
def authenticationProps = realmAuthentication.'properties'
authenticationProps.@path = 'jbws-application-users.properties'
def realmAuthorization = appRealm.'authorization'[0];
def authorizationProps = realmAuthorization.'properties'
authorizationProps.@path = 'jbws-application-roles.properties'

/**
* Add a JMS queue like this
*
* <subsystem xmlns="urn:jboss:domain:messaging:2.0">
* <hornetq-server>
* <jms-destinations>
* <jms-queue name="testQueue">
* <entry name="queue/test"/>
* <entry name="java:jboss/exported/jms/queue/test"/>
* </jms-queue>
* </jms-destinations>
* </hornetq-server>
* </subsystem>
**/
def hornetqServer = root.profile.subsystem.'hornetq-server'[0]
def jmsDestinations = hornetqServer.'jms-destinations'[0]
if (jmsDestinations == null) {
jmsDestinations = hornetqServer.appendNode('jms-destinations');
}
def jmsQueue = jmsDestinations.appendNode('jms-queue', ['name':'testQueue'])
jmsQueue.appendNode('entry', ['name':'queue/test'])
jmsQueue.appendNode('entry', ['name':'java:jboss/exported/jms/queue/test'])

/**
* Save the configuration to a new file
*/
def writer = new StringWriter()
writer.println('<?xml version="1.0" encoding="UTF-8"?>')
new XmlNodePrinter(new PrintWriter(writer)).print(root)
def f = new File(project.properties['outputFile'])
f.write(writer.toString())

/*
* copy the preconfigured jbws-application-roles.properties and jbws-application-users.properties
* files into the standalone/configure directory
*/
def srcUsersProperties = project.properties['srcUsersProperties']
def destUsersProperties = project.properties['destUsersProperties']
new AntBuilder().copy( file:srcUsersProperties,
tofile:destUsersProperties)

def srcRolesProperties = project.properties['srcRolesProperties']
def destRolesProperties = project.properties['destRolesProperties']
new AntBuilder().copy( file:srcRolesProperties,
tofile:destRolesProperties)
8 changes: 4 additions & 4 deletions modules/testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -596,15 +596,15 @@
</profile>

<!--
Name: wildfly820
Descr: WildFly-8.2.0 specific options
Name: wildfly821
Descr: WildFly-8.2.1 specific options
-->
<profile>
<id>wildfly820</id>
<id>wildfly821</id>
<dependencies>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly820-tests-integration</artifactId>
<artifactId>jbossws-wildfly821-tests-integration</artifactId>
</dependency>
<!-- Arquillian container integration -->
<dependency>
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
<jbossws.spi.version>3.0.1-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>3.0.1-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.1.Final</jbossws.common.tools.version>
<jbossws.wildfly820.version>5.0.0.Final</jbossws.wildfly820.version>
<jbossws.wildfly821.version>5.0.1-SNAPSHOT</jbossws.wildfly821.version>
<jbossws.wildfly900.version>5.0.1-SNAPSHOT</jbossws.wildfly900.version>
<wildfly820.version>8.2.0.Final</wildfly820.version>
<wildfly821.version>8.2.1.Final</wildfly821.version>
<wildfly900.version>9.0.0.Final</wildfly900.version>
<wildfly1000.version>10.0.0.Beta1-SNAPSHOT</wildfly1000.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
Expand Down Expand Up @@ -142,13 +142,13 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly820-server-integration</artifactId>
<version>${jbossws.wildfly820.version}</version>
<artifactId>jbossws-wildfly821-server-integration</artifactId>
<version>${jbossws.wildfly821.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly820-tests-integration</artifactId>
<version>${jbossws.wildfly820.version}</version>
<artifactId>jbossws-wildfly821-tests-integration</artifactId>
<version>${jbossws.wildfly821.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
Expand Down Expand Up @@ -1270,15 +1270,15 @@
</profile>

<!--
Name: wildfly820
Descr: WildFly-8.2.0 specific options
Name: wildfly821
Descr: WildFly-8.2.1 specific options
-->
<profile>
<id>wildfly820</id>
<id>wildfly821</id>
<properties>
<jbossws.integration.target>wildfly820</jbossws.integration.target>
<jbossws.integration.target>wildfly821</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly820.version}</jboss.version>
<jboss.version>${wildfly821.version}</jboss.version>
<additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl ${ipVerArgs}</additionalJvmArgs>
</properties>
<modules>
Expand Down

0 comments on commit a94b249

Please sign in to comment.