Bug 1036685

This is my bad.  I am actually not familiar with how riftsaw builds the BPM console.  As a result I may have added the deployment structure XML file unintentionally when trying to build it locally (for testing my changes).  Would it be possible for you to compare the two and see if they are different?

Most likely I did add the overlord auth module to the deployment structure file, so it will probably be different.  I was trying to make sure I didn't mess anything up in the community edition...working from imperfect understanding of how everything fits together. :(

Hi,

In Riftsaw we have e.g. for console/gwt-console-server/src/main/resources/jboss-deployment-structure.xml
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
<deployment>
	 <dependencies>
		  <module name="org.slf4j" />
	      <module name="org.jboss.resteasy.resteasy-jaxrs" />
		  <module name="org.jboss.resteasy.resteasy-jaxb-provider" />
		  <module name="org.jboss.resteasy.resteasy-multipart-provider" />
	      <module name="org.switchyard.component.bpel" services="import"/>
	 </dependencies>
 </deployment>
</jboss-deployment-structure>

but in BPMConsole it is 
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
<deployment>
     <dependencies>
          <module name="org.slf4j" />
          <module name="org.picketbox" />
          <module name="org.picketlink" />
          <module name="org.overlord.commons.overlord-commons-auth" />
          <module name="org.jboss.as.web" />
          <module name="org.jboss.resteasy.resteasy-jaxrs" />
          <module name="org.jboss.resteasy.resteasy-jaxb-provider" />
          <module name="org.jboss.resteasy.resteasy-multipart-provider" />
          <module name="org.switchyard.component.bpel" services="import"/>
     </dependencies>
 </deployment>
</jboss-deployment-structure>

For ./gui/war/target/default-war/META-INF/jboss-deployment-structure.xml there is

<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
    <deployment>
	 <dependencies>
          <module name="org.slf4j" />
          <module name="org.javassist" />
	      <module name="org.switchyard.component.bpel"/>
	    </dependencies>		
    </deployment>
</jboss-deployment-structure>


but in BPMConsole there is

<jboss-deployment-structure>
  <deployment>
    <dependencies>
      <module name="org.jboss.as.naming" />
      <module name="org.jboss.as.server" />
      <module name="org.jboss.msc" />
      <module name="org.jboss.netty" />
      <module name="org.picketbox" />
      <module name="org.picketlink" />
      <module name="org.jboss.resteasy.resteasy-jaxrs" />
      <module name="org.overlord.commons.overlord-commons-auth" />
      <module name="org.apache.httpcomponents" />
      <module name="org.apache.commons.codec" />
      <module name="org.apache.commons.configuration" />
      <module name="org.apache.commons.lang" />
      </dependencies>
  </deployment>
</jboss-deployment-structure>


Should BPMConsole have the "org.switchyard.component.bpel" dependency?

Ok I updated git with what I think is the right content for this file:

https://github.com/jboss-integration/bpm-console/commit/28bb6a0f89d1b2febd203f26badcfc3ad63929ad

As a result, I think we should deploy the one that's checked in to the BPM console repository:

https://github.com/jboss-integration/bpm-console/blob/28bb6a0f89d1b2febd203f26badcfc3ad63929ad/gui/war/src/main/webapp/META-INF/jboss-deployment-structure.xml

Please advise on what to do next - would you like a new ER7 tag?

Yes please. But can we update riftsaw as well so that it doesn't overwrite this file during assembly ?

I will update the jboss-deployment-structure.xml files appropriately (for both the bpel-console WAR and the bpel-console-server WAR) and check them in to the riftsaw repo.  I will also *delete* the copies in the bpm-console repository.  This will leave us with just one copy in the same place it's always been.

Done in latest tags.

The file contents in ER8 are:

more jboss-deployment-structure.xml
<!-- ~ Copyright 2011 JBoss, by Red Hat, Inc ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); 
  ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ 
  ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software 
  ~ 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. -->
<jboss-deployment-structure>
  <deployment>
    <dependencies>
      <module name="org.slf4j" />
      <module name="org.javassist" />
      <module name="org.jboss.as.naming" />
      <module name="org.jboss.as.server" />
      <module name="org.jboss.msc" />
      <module name="org.jboss.netty" />
      <module name="org.picketbox" />
      <module name="org.picketlink" />
      <module name="org.jboss.resteasy.resteasy-jaxrs" />
      <module name="org.overlord.commons.overlord-commons-auth" />
      <module name="org.apache.httpcomponents" />
      <module name="org.apache.commons.codec" />
      <module name="org.apache.commons.configuration" />
      <module name="org.apache.commons.lang" />
      <module name="org.switchyard.component.bpel" />
    </dependencies>
  </deployment>
</jboss-deployment-structure>

This looks right to me.