Author: thomas.diesler(a)jboss.com Date: 2009-10-12 08:36:23 -0400 (Mon, 12 Oct 2009) New Revision: 94666 Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml Removed: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java Log: Patch jboss501/jboss510 to support OSGi *.war deployments Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-10-12 08:30:32 UTC (rev 94665) +++ projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -81,7 +81,7 @@ <!-- jbossas --> <fileSet> <directory>src/main/resources/jbossas</directory> - <outputDirectory>resources/jbossas-config</outputDirectory> + <outputDirectory>resources/jbossas</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-10-12 08:30:32 UTC (rev 94665) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -346,10 +346,20 @@ <description>Integration with an existing JBossAS instance</description> <!-- https://jira.jboss.org/jira/browse/JBOSGI-94 --> - <fileset condition="isJBoss501" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" - override="true"> + <fileset condition="isJBoss501" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss501&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true"> <include name="metadata-deployer-jboss-beans.xml" /> </fileset> + <!-- https://jira.jboss.org/jira/browse/JBAS-7322 --> + <fileset condition="isJBoss501" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss501&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbossweb.deployer/META-INF" override="true"> + <include name="war-deployers-jboss-beans.xml" /> + </fileset> + <!-- https://jira.jboss.org/jira/browse/JBAS-7322 --> + <fileset condition="isJBoss510" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss510&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbossweb.deployer/META-INF" override="true"> + <include name="war-deployers-jboss-beans.xml" /> + </fileset> <!-- deployers/osgi.deployer --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> @@ -381,7 +391,7 @@ <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> - <singlefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" + <singlefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-felix.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> @@ -405,7 +415,7 @@ <include name="org.apache.equinox.framework.jar" /> <include name="org.eclipse.osgi.jar" /> </fileset> - <singlefile condition="isEquinox" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" + <singlefile condition="isEquinox" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-equinox.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> @@ -423,7 +433,7 @@ override="true"> <include name="jboss-osgi-framework.jar" /> </fileset> - <singlefile condition="isJBossMC" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" + <singlefile condition="isJBossMC" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib/org.osgi&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml (from rev 94664, 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/jboss501/metadata-deployer-jboss-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/metadata-deployer-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -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> Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -0,0 +1,248 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Web application deployers +$Id$ +--> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- WAR Structure --> + <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure"> + <property name="webInfLibFilter"> + <!-- We accept all .jar files in WEB-INF/lib --> + <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter"> + <constructor><parameter class="java.lang.String">.jar</parameter></constructor> + </bean> + </property> + <property name="includeWebInfInClasspath">true</property> + <property name="contextInfoOrder">1000</property> + </bean> + + <!-- web.xml parsing deployer --> + <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer"> + <property name="relativeOrder">2000</property> + </bean> + <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer"> + <property name="relativeOrder">2001</property> + </bean> + + <!-- See JBAS-6062 + <bean name="WebXmlLessDeployer" class="org.jboss.deployment.LegacyWebXmlLessDeployer"/> + --> + + <!-- Allow for war local class loaders: in testing --> + <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer"> + <property name="relativeOrder">-1</property> + <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property> + </bean> + + <!-- + Injects default clustering metadata. + TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml + and conf/standardjboss.xml as the source for defaults. + --> + <bean name="WebAppClusteringDefaultsDeployer" + class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer"> + + <!-- Default session cache config used by distributable webapps --> + <property name="cacheName">standard-session-cache</property> + <!-- Default session cache config used by FIELD granularity distributable webapps --> + <property name="fieldGranularityCacheName">field-granularity-session-cache</property> + + <!-- + The following two properties define when sessions are replicated to + the other nodes. + The default value, "instant", uses the request thread to replicate changes + to the other nodes at the end of requests. In this case, the + "SnapshotInterval" property is not used. + The "interval" mode uses a background thread that periodically checks for + modified sessions and replicates them. The "SnapshotInterval" + property controls how often (in milliseconds) the background thread + should run. + + Note that this property is not in effect if the replication-granularity + is set to FIELD. If it is FIELD, it will be per http request (that is, + "instant" mode.) + --> + <property name="snapshotMode">INSTANT</property> + <property name="snapshotInterval">1000</property> + + <property name="replicationGranularity">SESSION</property> + <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property> + <property name="replicationFieldBatchMode">true</property> + + <!-- + Whether by default to add special session handling to coordinate use + with mod_jk or other JK connector variants. + If a JK connector is used, you will need to set the JvmRoute inside + JBossWeb, e.g. configure, + Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost" + in server.xml. + + This value can be configured per webapp in the webapp's jboss.xml. + + If not set, the default will be to add the special session handling + if a jvmRoute is configured on the Engine. So, generally the only reason + to configure this overall default is to set it to 'false' and thus force + per webapp configuration. + --> + <!-- + <property name="useJK">false</property> + + <property name="useSessionPassivation">false</property> + <property name="passivationMaxIdleTime">-1</property> + <property name="passivationMinIdleTime">-1</property> + --> + + <!-- + Determines the maximum interval between requests, in seconds, after + which a request will trigger replication of the session's timestamp + regardless of whether the request has otherwise made the session dirty. + Such replication ensures that other nodes in the cluster are aware of + the most recent value for the session's timestamp and won't incorrectly + expire an unreplicated session upon failover. It also results in correct + values for HttpSession.getLastAccessedTime() calls following failover. + + The cost of timestamp replication is considerably lower in JBoss AS 5 + than it is in earlier versions since replicating a timestamp does not + necessitate replicating any other data. + + A value of 0 means the metadata will be replicated whenever the session is + accessed. A value of -1 means the metadata will be replicated only if some + other activity during the request (e.g. modifying an attribute) has + resulted in other replication work involving the session. A positive value + greater than the HttpSession.getMaxInactiveInterval() value will be treated + as a likely misconfiguration and converted to 0; i.e. replicate the + metadata on every request. + --> + <property name="maxUnreplicatedInterval">60</property> + + </bean> + + <!-- The WebMetaData to service mbean deployer --> + <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer"> + <install bean="ManagedDeploymentCreator" method="addAttachmentType"> + <parameter> + <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value> + </parameter> + <parameter> + <value>war</value> + </parameter> + </install> + <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> + <parameter> + <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value> + </parameter> + </uninstall> + + <!-- Inject the MainDeployer for resolving cross deployment refs --> + <property name="mainDeployer"><inject bean="MainDeployer" /></property> + + <property name="relativeOrder">2003</property> + + <!-- FIXME Get this moved to TomcatService in deploy --> + <property name="configFile"> + <value-factory bean="ServiceBindingManager" method="getResourceBinding"> + <parameter>jboss.web:service=WebServer</parameter> + <parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter> + </value-factory> + </property> + + <!-- You can configure a set of authenticators keyed by http-auth method + used. This will apply the same set of authenticators across all web + applications. You can override the set of authenticators at the web + application level by adding <authenticators> element to the respective + jboss-web.xml + --> + <property name="authenticators"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>BASIC</key> + <value>org.apache.catalina.authenticator.BasicAuthenticator</value> + </entry> + <entry> + <key>CLIENT-CERT</key> + <value>org.apache.catalina.authenticator.SSLAuthenticator</value> + </entry> + <entry> + <key>DIGEST</key> + <value>org.apache.catalina.authenticator.DigestAuthenticator</value> + </entry> + <entry> + <key>FORM</key> + <value>org.apache.catalina.authenticator.FormAuthenticator</value> + </entry> + <entry> + <key>NONE</key> + <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value> + </entry> + </map> + </property> + + <!-- The JAAS security domain to use in the absense of an explicit + security-domain specification in the war WEB-INF/jboss-web.xml + --> + <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property> + + <!-- Get the flag indicating if the normal Java2 parent first class + loading model should be used over the servlet 2.3 web container first + model. + --> + <property name="java2ClassLoadingCompliance">false</property> + <!-- A flag indicating if the JBoss Loader should be used. This loader + uses a unified class loader as the class loader rather than the tomcat + specific class loader. + The default is false to ensure that wars have isolated class loading + for duplicate jars and jsp files. + --> + <property name="useJBossWebLoader">false</property> + <!-- The list of package prefixes that should not be loaded without + delegating to the parent class loader before trying the web app + class loader. The packages listed here are those tha are used by + the web container implementation and cannot be overriden. The format + is a comma separated list of the package names. There cannot be any + whitespace between the package prefixes. + This setting only applies when UseJBossWebLoader=false. + --> + <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property> + + <property name="lenientEjbLink">true</property> + + <!--Flag to delete the Work Dir on Context Destroy --> + <property name="deleteWorkDirOnContextDestroy">false</property> + + <!-- + Class of the session manager (used if context is marked as 'distributable'. Currently allowed values: + - org.jboss.web.tomcat.service.session.JBossCacheManager + --> + <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property> + + <!-- The name of the request property under with the authenticated JAAS + Subject is stored on successful authentication. If null or empty then + the Subject will not be stored. + --> + <!-- + <property name="subjectAttributeName">j_subject</property> + --> + + <!-- The SessionIdAlphabet is the set of characters used to create a session Id + It must be made up of exactly 65 unique characters + <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-_</property> + --> + + <property name="domain">jboss.web</property> + <!-- Specify a Bean for JBoss Security PolicyRegistration --> + <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property> + + <!-- Specify a SecurityManagement Wrapper --> + <property name="securityManagementName">JNDIBasedSecurityManagement</property> + + <!-- Specify a SecurityContext FQN class name --> + <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> + </bean> + + <bean name="MergedJBossWebMetaDataDeployer" + class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer"> + </bean> + +</deployment> Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss501/war-deployers-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Web application deployers +$Id$ +--> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- WAR Structure --> + <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure"> + <property name="webInfLibFilter"> + <!-- We accept all .jar files in WEB-INF/lib --> + <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter"> + <constructor><parameter class="java.lang.String">.jar</parameter></constructor> + </bean> + </property> + <property name="includeWebInfInClasspath">true</property> + <property name="contextInfoOrder">1000</property> + </bean> + + <!-- web.xml parsing deployer --> + <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer"> + <property name="relativeOrder">2000</property> + </bean> + <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer"> + <property name="relativeOrder">2001</property> + </bean> + + <!-- See JBAS-6062 + <bean name="WebXmlLessDeployer" class="org.jboss.deployment.LegacyWebXmlLessDeployer"/> + --> + + <!-- Allow for war local class loaders: in testing --> + <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer"> + <property name="relativeOrder">-1</property> + <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property> + </bean> + + <!-- + Injects default clustering metadata. + TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml + and conf/standardjboss.xml as the source for defaults. + --> + <bean name="WebAppClusteringDefaultsDeployer" + class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer"> + + <!-- Default session cache config used by distributable webapps --> + <property name="cacheName">standard-session-cache</property> + <!-- Default session cache config used by FIELD granularity distributable webapps --> + <property name="fieldGranularityCacheName">field-granularity-session-cache</property> + + <!-- + The following two properties define when sessions are replicated to + the other nodes. + The default value, "instant", uses the request thread to replicate changes + to the other nodes at the end of requests. In this case, the + "SnapshotInterval" property is not used. + The "interval" mode uses a background thread that periodically checks for + modified sessions and replicates them. The "SnapshotInterval" + property controls how often (in milliseconds) the background thread + should run. + + Note that this property is not in effect if the replication-granularity + is set to FIELD. If it is FIELD, it will be per http request (that is, + "instant" mode.) + --> + <property name="snapshotMode">INSTANT</property> + <property name="snapshotInterval">1000</property> + + <property name="replicationGranularity">SESSION</property> + <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property> + <property name="replicationFieldBatchMode">true</property> + + <!-- + Whether by default to add special session handling to coordinate use + with mod_jk or other JK connector variants. + If a JK connector is used, you will need to set the JvmRoute inside + JBossWeb, e.g. configure, + Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost" + in server.xml. + + This value can be configured per webapp in the webapp's jboss.xml. + + If not set, the default will be to add the special session handling + if a jvmRoute is configured on the Engine. So, generally the only reason + to configure this overall default is to set it to 'false' and thus force + per webapp configuration. + --> + <!-- + <property name="useJK">false</property> + + <property name="useSessionPassivation">false</property> + <property name="passivationMaxIdleTime">-1</property> + <property name="passivationMinIdleTime">-1</property> + --> + + <!-- + Determines the maximum interval between requests, in seconds, after + which a request will trigger replication of the session's timestamp + regardless of whether the request has otherwise made the session dirty. + Such replication ensures that other nodes in the cluster are aware of + the most recent value for the session's timestamp and won't incorrectly + expire an unreplicated session upon failover. It also results in correct + values for HttpSession.getLastAccessedTime() calls following failover. + + The cost of timestamp replication is considerably lower in JBoss AS 5 + than it is in earlier versions since replicating a timestamp does not + necessitate replicating any other data. + + A value of 0 means the metadata will be replicated whenever the session is + accessed. A value of -1 means the metadata will be replicated only if some + other activity during the request (e.g. modifying an attribute) has + resulted in other replication work involving the session. A positive value + greater than the HttpSession.getMaxInactiveInterval() value will be treated + as a likely misconfiguration and converted to 0; i.e. replicate the + metadata on every request. + --> + <property name="maxUnreplicatedInterval">60</property> + + </bean> + + <!-- The WebMetaData to service mbean deployer --> + <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer"> + <install bean="ManagedDeploymentCreator" method="addAttachmentType"> + <parameter> + <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value> + </parameter> + <parameter> + <value>war</value> + </parameter> + </install> + <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> + <parameter> + <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value> + </parameter> + </uninstall> + + <!-- Inject the MainDeployer for resolving cross deployment refs --> + <property name="mainDeployer"><inject bean="MainDeployer" /></property> + + <property name="relativeOrder">2003</property> + + <!-- FIXME Get this moved to TomcatService in deploy --> + <property name="configFile"> + <value-factory bean="ServiceBindingManager" method="getResourceBinding"> + <parameter>jboss.web:service=WebServer</parameter> + <parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter> + </value-factory> + </property> + + <!-- You can configure a set of authenticators keyed by http-auth method + used. This will apply the same set of authenticators across all web + applications. You can override the set of authenticators at the web + application level by adding <authenticators> element to the respective + jboss-web.xml + --> + <property name="authenticators"> + <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>BASIC</key> + <value>org.apache.catalina.authenticator.BasicAuthenticator</value> + </entry> + <entry> + <key>CLIENT-CERT</key> + <value>org.apache.catalina.authenticator.SSLAuthenticator</value> + </entry> + <entry> + <key>DIGEST</key> + <value>org.apache.catalina.authenticator.DigestAuthenticator</value> + </entry> + <entry> + <key>FORM</key> + <value>org.apache.catalina.authenticator.FormAuthenticator</value> + </entry> + <entry> + <key>NONE</key> + <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value> + </entry> + </map> + </property> + + <!-- The JAAS security domain to use in the absense of an explicit + security-domain specification in the war WEB-INF/jboss-web.xml + --> + <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property> + + <!-- Get the flag indicating if the normal Java2 parent first class + loading model should be used over the servlet 2.3 web container first + model. + --> + <property name="java2ClassLoadingCompliance">false</property> + + <!-- This is NO LONGER supported this way and it will be completely removed for 6.x. + See JBAS-6914 for how you can achieve the same in 5.x with new MC JBossCL layer. + + A flag indicating if the JBoss Loader should be used. This loader + uses a unified class loader as the class loader rather than the tomcat + specific class loader. + The default is false to ensure that wars have isolated class loading + for duplicate jars and jsp files. + <property name="useJBossWebLoader">false</property> + --> + + <!-- The list of package prefixes that should not be loaded without + delegating to the parent class loader before trying the web app + class loader. The packages listed here are those tha are used by + the web container implementation and cannot be overriden. The format + is a comma separated list of the package names. There cannot be any + whitespace between the package prefixes. + This setting only applies when UseJBossWebLoader=false. + --> + <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property> + + <property name="lenientEjbLink">true</property> + + <!--Flag to delete the Work Dir on Context Destroy --> + <property name="deleteWorkDirOnContextDestroy">false</property> + + <!-- + Class of the session manager (used if context is marked as 'distributable'. Currently allowed values: + - org.jboss.web.tomcat.service.session.JBossCacheManager + --> + <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property> + + <!-- The name of the request property under with the authenticated JAAS + Subject is stored on successful authentication. If null or empty then + the Subject will not be stored. + --> + <!-- + <property name="subjectAttributeName">j_subject</property> + --> + + <!-- The SessionIdAlphabet is the set of characters used to create a session Id + It must be made up of exactly 65 unique characters + <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-_</property> + --> + + <property name="domain">jboss.web</property> + <!-- Specify a Bean for JBoss Security PolicyRegistration --> + <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property> + + <!-- Specify a SecurityManagement Wrapper --> + <property name="securityManagementName">JNDIBasedSecurityManagement</property> + + <!-- Specify a SecurityContext FQN class name --> + <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> + </bean> + + <bean name="MergedJBossWebMetaDataDeployer" + class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer"> + </bean> + +</deployment> Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss510/war-deployers-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: 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 2009-10-12 08:30:32 UTC (rev 94665) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/metadata-deployer-jboss-beans.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -1,348 +0,0 @@ -<?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> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-12 08:30:32 UTC (rev 94665) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-12 12:36:23 UTC (rev 94666) @@ -72,17 +72,6 @@ <include name="message.txt"/> </fileset> </war> - <!-- OSGi *.war deployments not supported jbossas less than jboss520 --> - <war destfile="${tests.output.dir}/test-libs/example-webapp.jar" - manifest="${tests.resources.dir}/webapp/MANIFEST.MF" - webxml="${tests.resources.dir}/webapp/web.xml"> - <classes dir="${tests.classes.dir}"> - <include name="**/example/webapp/bundle/*.class"/> - </classes> - <fileset dir="${tests.resources.dir}/webapp"> - <include name="message.txt"/> - </fileset> - </war> <!-- xml/jaxb --> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-xml-jaxb.jar" files="${tests.resources.dir}/xml/jaxb/example-xml-jaxb.bnd" /> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-12 08:30:32 UTC (rev 94665) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-12 12:36:23 UTC (rev 94666) @@ -57,15 +57,7 @@ runtime = osgiTestHelper.getDefaultRuntime(); runtime.addCapability(new WebAppCapability()); - OSGiBundle bundle; - - // OSGi *.war deployments not supported jbossas less than jboss520 - String targetContainer = osgiTestHelper.getTargetContainer(); - if ("jboss501".equals(targetContainer) || "jboss510".equals(targetContainer)) - bundle = runtime.installBundle("example-webapp.jar"); - else - bundle = runtime.installBundle("example-webapp.war"); - + OSGiBundle bundle = runtime.installBundle("example-webapp.war"); bundle.start(); }