[jboss-osgi-commits] JBoss-OSGI SVN: r93122 - in projects/jboss-osgi/trunk/distribution/installer: scripts and 4 other directories.

jboss-osgi-commits at lists.jboss.org jboss-osgi-commits at lists.jboss.org
Wed Sep 2 06:10:05 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-09-02 06:10:04 -0400 (Wed, 02 Sep 2009)
New Revision: 93122

Added:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/
Removed:
   projects/jboss-osgi/trunk/distribution/installer/runtime/
   projects/jboss-osgi/trunk/distribution/installer/src/main/etc/jboss501/
Modified:
   projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml
   projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
#1 jbossas integration 

Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml	2009-09-02 09:38:16 UTC (rev 93121)
+++ projects/jboss-osgi/trunk/distribution/installer/scripts/antrun-installer.xml	2009-09-02 10:10:04 UTC (rev 93122)
@@ -22,7 +22,7 @@
   <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" />
   <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" />
   <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" />
-  <property name="runtime.dir" value="${basedir}/runtime" />
+  <property name="runtime.dir" value="${resources.dir}/runtime" />
 
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->

Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml	2009-09-02 09:38:16 UTC (rev 93121)
+++ projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml	2009-09-02 10:10:04 UTC (rev 93122)
@@ -32,7 +32,7 @@
       <unpack>false</unpack>
     </dependencySet>
     <dependencySet>
-      <outputDirectory>lib/apache-felix</outputDirectory>
+      <outputDirectory>lib/org.apache.felix</outputDirectory>
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <useStrictFiltering>true</useStrictFiltering>
       <includes>
@@ -88,5 +88,10 @@
         <include>jboss501/**</include>
       </includes>
     </fileSet>
+    <!-- jbossas -->
+    <fileSet>
+      <directory>src/main/resources/jbossas</directory>
+      <outputDirectory>resources/jbossas-config</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-02 09:38:16 UTC (rev 93121)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-02 10:10:04 UTC (rev 93122)
@@ -231,7 +231,7 @@
         <include name="jboss-osgi-runtime-felix.jar" />
         <include name="org.apache.felix.framework.jar" />
       </fileset>
-      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/apache-felix" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
+      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.apache.felix" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
@@ -309,7 +309,7 @@
       <description>Integration with an existing JBossAS instance</description>
 
       <!-- https://jira.jboss.org/jira/browse/JBOSGI-94 -->
-      <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
+      <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
         <include name="metadata-deployer-jboss-beans.xml" />
       </fileset>
       
@@ -327,10 +327,8 @@
         <include name="jboss-osgi-common.jar" />
         <include name="jboss-osgi-jaxb.jar" />
         <include name="jboss-osgi-webconsole.jar" />
-        <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.http.jetty.jar" />
         <include name="org.apache.felix.log.jar" />
-        <include name="org.apache.felix.metatype.jar" />
       </fileset>
       
       <!-- Felix Integration -->
@@ -341,7 +339,14 @@
       </fileset>
       <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml" 
         target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
+      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+        <include name="jboss-osgi-runtime-jbossas.jar" />
+      </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+        <include name="org.apache.felix.configadmin.jar" />
+        <include name="org.apache.felix.metatype.jar" />
+      </fileset>
+      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.apache.felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
       
@@ -354,21 +359,23 @@
       </fileset>
       <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml" 
         target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
+      <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+        <include name="jboss-osgi-runtime-jbossas.jar" />
+      </fileset>
       <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+        <include name="org.apache.felix.configadmin.jar" />
+        <include name="org.apache.felix.metatype.jar" />
         <include name="org.eclipse.osgi.services.jar" />
       </fileset>
       
       <!-- JBossMC Integration -->
       
       <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
-        <include name="jboss-osgi-runtime-jbossmc.jar" />
-        <include name="org.jbossmc.framework.jar" />
+        <include name="jboss-osgi-runtime-microcontainer.jar" />
       </fileset>
-      <!-- 
       <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" 
         target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
-      -->
-      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
       

Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	                        (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	2009-09-02 10:10:04 UTC (rev 93122)
@@ -0,0 +1,175 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- 
+  ********************************
+  *                              *  
+  *  OSGi Framework              *
+  *                              *
+  ********************************
+  -->
+  
+  <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+    <constructor>
+      <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
+      <parameter><inject bean="MainDeployer" /></parameter>
+    </constructor>
+    <property name="properties">
+      <map keyClass="java.lang.String" valueClass="java.lang.String">
+        <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/osgi-store</value></entry>
+        <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+        <entry><key>org.osgi.framework.system.packages.extra</key><value>
+          <!-- [JBOSGI-145]  JAXB classes are loaded from the system classpath -->
+          com.sun.xml.internal.bind.v2,
+          
+          org.jboss.beans.metadata.plugins;version=2.0,
+          org.jboss.beans.metadata.plugins.builder;version=2.0,
+          org.jboss.beans.metadata.spi;version=2.0,
+          org.jboss.beans.metadata.spi.builder;version=2.0,
+          org.jboss.dependency.spi;version=2.0,
+          org.jboss.kernel.spi.dependency;version=2.0,
+          org.jboss.logging;version=2.0,
+          
+          org.jboss.osgi.spi;version=1.0,
+          org.jboss.osgi.spi.capability;version=1.0,
+          org.jboss.osgi.spi.framework;version=1.0,
+          org.jboss.osgi.spi.logging;version=1.0,
+          org.jboss.osgi.spi.management;version=1.0,
+          org.jboss.osgi.spi.service;version=1.0,
+          org.jboss.osgi.spi.testing;version=1.0,
+          org.jboss.osgi.spi.util;version=1.0
+        </value></entry>
+        <!-- Hot Deployment -->
+        <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
+        <!-- Husky socket connector properties -->
+        <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+        <!-- HTTP Service Port -->
+        <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+        <!-- Config Admin Service -->
+        <entry><key>felix.cm.dir</key><value>${osgi.server.home}/data/osgi-configadmin</value></entry>
+        <!-- JMX bundle properties -->
+        <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
+        <!-- JNDI bundle properties -->
+        <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+        <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
+        <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
+      </map>
+    </property>
+    <incallback method="addPlugin" />
+    <uncallback method="removePlugin" />
+  </bean>
+  
+  <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+    <property name="autoInstall">
+     <list elementClass="java.net.URL">
+      <value>${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar</value>
+     </list>
+    </property>
+    <property name="autoStart">
+     <list elementClass="java.net.URL">
+      <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value>
+      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value>
+      <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value>
+     </list>
+    </property>
+  </bean>
+  <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+  </bean>
+  <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+  </bean>
+  <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl">
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+  </bean>
+  
+  <!--
+  ********************************
+  *                              *  
+  *  OSGi Deployment             *
+  *                              *
+  ********************************
+  -->
+  
+  <!-- The MainDeployer -->
+  <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+    <property name="structuralDeployers"><inject bean="StructuralDeployers" /></property>
+    <property name="deployers"><inject bean="Deployers" /></property>
+  </bean>
+
+  <!-- The holder for deployers that determine structure -->
+  <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+    <property name="structureBuilder">
+      <!-- The consolidator of the structure information -->
+      <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder" />
+    </property>
+    <!-- Accept any implementor of structure deployer -->
+    <incallback method="addDeployer" />
+    <uncallback method="removeDeployer" />
+  </bean>
+
+  <!-- The holder for deployers that do real deployment -->
+  <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+    <constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor>
+    <!-- Accept any implementor of deployer -->
+    <incallback method="addDeployer" />
+    <uncallback method="removeDeployer" />
+  </bean>
+
+  <!-- Bundle Structure -->
+  <bean name="BundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+  
+  <!-- JAR & File Structure (needed for negative testing) -->
+  <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" />
+  <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" />
+
+  <!-- POJO Deployment -->
+  <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" />
+  <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer" />
+  <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+    <constructor>
+      <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
+    </constructor>
+  </bean>
+
+  <!-- OSGI Deployment -->
+  <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
+  <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+  </bean>
+  <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/>
+  <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+
+  <!--
+  ********************************
+  *                              *  
+  *  OSGi Classloading           *
+  *                              *
+  ********************************
+  -->
+  
+  <!-- ClassLoading -->
+  <bean name="ClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" >
+    <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+  </bean>
+  <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+    <incallback method="addModule" state="Configured" />
+    <uncallback method="removeModule" state="Configured" />
+  </bean>
+  <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+    <property name="defaultMetaData">
+      <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true" />
+    </property>
+  </bean>
+  <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer" />
+  <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+    <property name="classLoading"><inject bean="ClassLoading" /></property>
+  </bean>
+  <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+    <property name="classLoading"><inject bean="ClassLoading" /></property>
+    <property name="system"><inject bean="ClassLoaderSystem" /></property>
+  </bean>
+
+</deployment>
\ No newline at end of file

Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml	                        (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml	2009-09-02 10:10:04 UTC (rev 93122)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    MetaData configuration
+    
+    This add the DeploymentProvidedDUFilter which does not exist in jboss501
+    
+    $Id$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- A reference metadata resolving deployer that creates and endpoint map
+      for the deployments
+   -->
+  <bean name="ReferenceMetaDataResolverDeployer" class="org.jboss.deployment.MappedReferenceMetaDataResolverDeployer" />
+
+  <!-- Generic scanning deployer - using javassist to do lookup -->
+
+  <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer" />
+
+  <bean name="JBossMetaDataDUFilter" class="org.jboss.deployment.JBossMetaDataDeploymentUnitFilter" />
+
+  <bean name="ScanningMetaDataDeployer" class="org.jboss.deployers.vfs.plugins.annotations.ScanningMetaDataDeployer" />
+  <bean name="ScanningMetaDataDUFilter" class="org.jboss.deployers.vfs.plugins.annotations.ScanningDeploymentUnitFilter" />
+
+  <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
+    <constructor>
+      <parameter>
+        <bean class="org.jboss.deployment.FileNameVirtualFileFilter">
+          <constructor>
+            <parameter>
+              <map keyClass="java.lang.String" valueClass="java.util.Set">
+                <entry>
+                  <key>jbossweb.sar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>console-mgr.sar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>jbossws.sar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>jmx-remoting.sar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>jboss-local-jdbc.rar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>jboss-xa-jdbc.rar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>jms-ra.rar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>mail-ra.rar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>quartz-ra.rar</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+                <entry>
+                  <key>jmx-console.war</key>
+                  <value>
+                    <null />
+                  </value>
+                </entry>
+              </map>
+            </parameter>
+          </constructor>
+        </bean>
+      </parameter>
+    </constructor>
+  </bean>
+  
+  <bean name="DeploymentProvidedDUFilter" class="org.jboss.osgi.deployer.helpers.DeploymentProvidedDeploymentUnitFilter" />
+
+  <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationEnvironmentDeployer">
+    <property name="filter">
+      <bean class="org.jboss.deployment.ListDeploymentUnitFilter">
+        <property name="filters">
+          <list>
+            <inject bean="DeploymentProvidedDUFilter" />
+            <inject bean="JBossMetaDataDUFilter" />
+            <inject bean="ScanningMetaDataDUFilter" />
+            <inject bean="JBossCustomDeployDUFilter" />
+          </list>
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
+    <property name="metaDataCompleteIsDefault">false</property>
+  </bean>
+
+  <!--
+    Extract annotations into a standard metadata view <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.AnnotationMetaDataDeployer"> <property
+    name="metaDataCompleteIsDefault">false</property> </bean>
+  -->
+
+  <!--
+    The schema location to JBossXB binding class mappings. We specify the dtd/xsd name of the schema as the location to work with legacy dtd as well as namespace based
+    documents.
+  -->
+  <bean name="SchemaResolverConfig" class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
+
+    <!-- schemaLocation to JBossXBuilder binding classes -->
+    <property name="bindingClassesByLocations">
+      <map keyClass="java.lang.String" valueClass="java.lang.String">
+        <!-- EarMetaData -->
+        <entry>
+          <key>application</key>
+          <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>application_1_2.dtd</key>
+          <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>application_1_3.dtd</key>
+          <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>application_1_4.xsd</key>
+          <value>org.jboss.metadata.ear.spec.Ear14MetaData</value>
+        </entry>
+        <entry>
+          <key>application_5.xsd</key>
+          <value>org.jboss.metadata.ear.spec.Ear50MetaData</value>
+        </entry>
+        <!-- JBossAppMetaData -->
+        <entry>
+          <key>jboss-app</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-app_3_0.dtd</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-app_3_2.dtd</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-app_4_0.dtd</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-app_4_2.dtd</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-app_5_0.dtd</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-app_5_0.xsd</key>
+          <value>org.jboss.metadata.ear.jboss.JBoss50AppMetaData</value>
+        </entry>
+
+        <!-- ApplicationClientMetaData -->
+        <entry>
+          <key>application-client</key>
+          <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>application-client_1_2.dtd</key>
+          <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>application-client_1_3.dtd</key>
+          <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>application-client_1_4.xsd</key>
+          <value>org.jboss.metadata.client.spec.ApplicationClient14MetaData</value>
+        </entry>
+        <entry>
+          <key>application-client_5.xsd</key>
+          <value>org.jboss.metadata.client.spec.ApplicationClient5MetaData</value>
+        </entry>
+        <!-- ApplicationClientMetaData -->
+        <entry>
+          <key>jboss-client</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-client_3_0.dtd</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-client_3_2.dtd</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-client_4_0.dtd</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-client_4_2.dtd</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-client_5_0.dtd</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-client_5_0.xsd</key>
+          <value>org.jboss.metadata.client.jboss.JBossClient5MetaData</value>
+        </entry>
+
+        <!-- EjbJarMetaData -->
+        <entry>
+          <key>ejb-jar</key>
+          <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
+        </entry>
+        <entry>
+          <key>ejb-jar_1_1.dtd</key>
+          <value>org.jboss.metadata.ejb.spec.EjbJar1xMetaData</value>
+        </entry>
+        <entry>
+          <key>ejb-jar_2_0.dtd</key>
+          <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
+        </entry>
+        <entry>
+          <key>ejb-jar_2_1.xsd</key>
+          <value>org.jboss.metadata.ejb.spec.EjbJar21MetaData</value>
+        </entry>
+        <entry>
+          <key>ejb-jar_3_0.xsd</key>
+          <value>org.jboss.metadata.ejb.spec.EjbJar30MetaData</value>
+        </entry>
+
+        <!-- JBossMetaData -->
+        <entry>
+          <key>jboss</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss_3_0.dtd</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss_3_2.dtd</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss_4_0.dtd</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss_4_2.dtd</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss_5_0.dtd</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss_5_0.xsd</key>
+          <value>org.jboss.metadata.ejb.jboss.JBoss50MetaData</value>
+        </entry>
+
+        <!-- WebMetaData -->
+        <entry>
+          <key>web-app</key>
+          <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+        </entry>
+        <entry>
+          <key>web-app_2_2.dtd</key>
+          <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+        </entry>
+        <entry>
+          <key>web-app_2_3.dtd</key>
+          <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+        </entry>
+        <entry>
+          <key>web-app_2_4.xsd</key>
+          <value>org.jboss.metadata.web.spec.Web24MetaData</value>
+        </entry>
+        <entry>
+          <key>web-app_2_5.xsd</key>
+          <value>org.jboss.metadata.web.spec.Web25MetaData</value>
+        </entry>
+        <!-- JBossWebMetaData -->
+        <entry>
+          <key>jboss-web</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-web_3_0.dtd</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-web_3_2.dtd</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-web_4_0.dtd</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-web_4_2.dtd</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-web_5_0.dtd</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+        </entry>
+        <entry>
+          <key>jboss-web_5_0.xsd</key>
+          <value>org.jboss.metadata.web.jboss.JBoss50WebMetaData</value>
+        </entry>
+        <!-- PersistenceMetaData -->
+        <entry>
+          <key>persistence_1_0.xsd</key>
+          <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+        </entry>
+      </map>
+    </property>
+  </bean>
+
+</deployment>


Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime (from rev 93120, projects/jboss-osgi/trunk/distribution/installer/runtime)



More information about the jboss-osgi-commits mailing list