[jboss-svn-commits] JBL Code SVN: r26038 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-04-15 10:53:59 -0400 (Wed, 15 Apr 2009)
New Revision: 26038

Added:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-structure.xml
Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
   labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml
   labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml
   labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
Log:
Moved the jar from the esb.deployers directory to esb.deployers/lib to make easier to "see" the config files we have.


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml	2009-04-15 13:53:51 UTC (rev 26037)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml	2009-04-15 14:53:59 UTC (rev 26038)
@@ -196,7 +196,7 @@
         <property name="deployers.dir" value="${server.dir}/deployers"/>
         <mkdir dir="${deployers.dir}/esb.deployer"/>
 		        
-        <copy todir="${deployers.dir}/esb.deployer" overwrite="true">
+        <copy todir="${deployers.dir}/esb.deployer/lib" overwrite="true">
             <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar/lib">
                 <include name="jbossesb-rosetta.jar"/>
             	<include name="jbossesb-config-model-1.0.1.jar"/>
@@ -225,8 +225,14 @@
                 <include name="commons-codec-1.3.jar"/>
             </fileset>
         </copy>
-		<copy todir="${deployers.dir}/esb.deployer/META-INF" file="${basedir}/esb-deployers-jboss-beans.xml" overwrite="true"/>
 		
+		<copy todir="${deployers.dir}/esb.deployer/META-INF" overwrite="true">
+            <fileset dir="${basedir}">
+                <include name="esb-deployers-jboss-beans.xml"/>
+                <include name="jboss-structure.xml"/>
+            </fileset>
+        </copy>
+		
 		<copy todir="${deployers.dir}/esb.deployer" overwrite="true">
             <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
                 <include name="actionArtifactMap.properties"/>

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml	2009-04-15 13:53:51 UTC (rev 26037)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml	2009-04-15 14:53:59 UTC (rev 26038)
@@ -6,12 +6,14 @@
 	
     <!-- Will pickup and parse jboss-esb.xml configuration files from esb archives. -->
 	<bean name="EsbConfigParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbConfigParser">
-      <property name="deploymentPrefix">jboss.esb:deployment=</property>
+      <property name="esbDeploymentPrefix">jboss.esb:deployment=</property>
       <property name="actionArtifactsFile">/actionArtifactMap.properties</property>
     </bean>
 	
 	<bean name="EsbWebServiceDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbWebServiceDeployer"/>
 	
+	<bean name="EsbWsdlDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbWsdlDeployer"/>
+	
 	<!-- Will create the BeanMetaData that describes a esb deployment -->
     <bean name="EsbDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbDeployer"/>
 

Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-structure.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-structure.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-structure.xml	2009-04-15 14:53:59 UTC (rev 26038)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+    <context>
+        <path name=""/>
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>        
+        <classpath>
+            <path name=""/>
+            <path name="lib" suffixes=".jar"/>
+        </classpath>
+    </context>
+</structure>

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml	2009-04-15 13:53:51 UTC (rev 26037)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml	2009-04-15 14:53:59 UTC (rev 26038)
@@ -5,7 +5,7 @@
             xmlns="urn:jboss:bean-deployer:2.0">
 
    <bean name="EsbConfigParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbConfigParser">
-      <property name="deploymentPrefix">jboss.esb:deployment=</property>
+      <property name="esbDeploymentPrefix">jboss.esb:deployment=</property>
       <property name="actionArtifactsFile">/org/jboss/soa/esb/listeners/deployers/mc/actionArtifactMap.properties</property>
    </bean>
    

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml	2009-04-15 13:53:51 UTC (rev 26037)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml	2009-04-15 14:53:59 UTC (rev 26038)
@@ -202,7 +202,7 @@
 		<property name="org.jboss.esb.server.common.lib" location="${org.jboss.esb.server.home}/common/lib"/>
 
         <path id="deployment-classpath">
-            <fileset dir="${org.jboss.esb.server.server}/deployers/esb.deployer" includes="*.jar"/>
+            <fileset dir="${org.jboss.esb.server.server}/deployers/esb.deployer/lib" includes="*.jar"/>
             <!-- jbossesb config -->
             <fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.esb" includes="*.jar"/>
             <pathelement location="${org.jboss.esb.server.deploy.dir}/jbossesb.esb"/>