[jboss-svn-commits] JBL Code SVN: r29441 - in labs/jbosstm/trunk/XTS/sar: META-INF and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Sep 23 08:51:01 EDT 2009


Author: adinn
Date: 2009-09-23 08:51:01 -0400 (Wed, 23 Sep 2009)
New Revision: 29441

Added:
   labs/jbosstm/trunk/XTS/sar/META-INF/application.xml
   labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml
   labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml
   labs/jbosstm/trunk/XTS/sar/META-INF/jboss-classloading.xml
Modified:
   labs/jbosstm/trunk/XTS/sar/build.xml
Log:
restored application.xml to sar is deployed as per an ear but added jboss-classloading.xml metadata to ensure that classes in the embedded jars are visible to other apps -- now working again on 6.0.0

Added: labs/jbosstm/trunk/XTS/sar/META-INF/application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application.xml	2009-09-23 12:51:01 UTC (rev 29441)
@@ -0,0 +1,88 @@
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2006, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU Lesser General Public License, v. 2.1.
+  This program is distributed in the hope that it will be useful, but WITHOUT A
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public License,
+  v.2.1 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  MA  02110-1301, USA.
+
+  
+  (C) 2005-2006,
+  @author JBoss Inc.
+-->
+
+<!-- $Id: axis-application.xml,v 1.8.4.1 2005/11/22 10:42:05 kconner Exp $ -->
+
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+    <display-name>XML Transaction Service 1.0 and 1.1 deployment config</display-name>
+
+    <description>XML Transaction Service 1.0 and 1.1 deployment config</description>
+
+    <module>
+        <web>
+            <web-uri>ws-c10.war</web-uri>
+            <context-root>/ws-c10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>ws-t10.war</web-uri>
+            <context-root>/ws-t10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wscf10.war</web-uri>
+            <context-root>/wscf10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wstx10.war</web-uri>
+            <context-root>/wstx10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>ws-c11.war</web-uri>
+            <context-root>/ws-c11</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>ws-t11.war</web-uri>
+            <context-root>/ws-t11</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wscf11.war</web-uri>
+            <context-root>/wscf11</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wstx11.war</web-uri>
+            <context-root>/wstx11</context-root>
+        </web>
+    </module>
+
+</application>

Added: labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml	2009-09-23 12:51:01 UTC (rev 29441)
@@ -0,0 +1,60 @@
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2006, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU Lesser General Public License, v. 2.1.
+  This program is distributed in the hope that it will be useful, but WITHOUT A
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public License,
+  v.2.1 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  MA  02110-1301, USA.
+
+  
+  (C) 2005-2006,
+  @author JBoss Inc.
+-->
+
+<!-- $Id: axis-application.xml,v 1.8.4.1 2005/11/22 10:42:05 kconner Exp $ -->
+
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+    <display-name>XML Transaction Service 1.0 deployment config</display-name>
+
+    <description>XML Transaction Service 1.0 deployment config</description>
+
+    <module>
+        <web>
+            <web-uri>ws-c10.war</web-uri>
+            <context-root>/ws-c10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>ws-t10.war</web-uri>
+            <context-root>/ws-t10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wscf10.war</web-uri>
+            <context-root>/wscf10</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wstx10.war</web-uri>
+            <context-root>/wstx10</context-root>
+        </web>
+    </module>
+
+</application>

Added: labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml	2009-09-23 12:51:01 UTC (rev 29441)
@@ -0,0 +1,60 @@
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2006, Red Hat Middleware LLC, and individual contributors
+  as indicated by the @author tags. 
+  See the copyright.txt in the distribution for a full listing 
+  of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU Lesser General Public License, v. 2.1.
+  This program is distributed in the hope that it will be useful, but WITHOUT A
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public License,
+  v.2.1 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  MA  02110-1301, USA.
+
+  
+  (C) 2005-2006,
+  @author JBoss Inc.
+-->
+
+<!-- $Id: axis-application.xml,v 1.8.4.1 2005/11/22 10:42:05 kconner Exp $ -->
+
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+    <display-name>XML Transaction Service 1.1 deployment config</display-name>
+
+    <description>XML Transaction Service 1.1 deployment config</description>
+
+    <module>
+        <web>
+            <web-uri>ws-c11.war</web-uri>
+            <context-root>/ws-c11</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>ws-t11.war</web-uri>
+            <context-root>/ws-t11</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wscf11.war</web-uri>
+            <context-root>/wscf11</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wstx11.war</web-uri>
+            <context-root>/wstx11</context-root>
+        </web>
+    </module>
+
+</application>

Added: labs/jbosstm/trunk/XTS/sar/META-INF/jboss-classloading.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/jboss-classloading.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/jboss-classloading.xml	2009-09-23 12:51:01 UTC (rev 29441)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    JBoss, Home of Professional Open Source
+    Copyright 2009, Red Hat Middleware LLC, and individual contributors
+    as indicated by the @author tags.
+    See the copyright.txt in the distribution for a
+    full listing of individual contributors.
+    This copyrighted material is made available to anyone wishing to use,
+    modify, copy, or redistribute it subject to the terms and conditions
+    of the GNU Lesser General Public License, v. 2.1.
+    This program is distributed in the hope that it will be useful, but WITHOUT A
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+    PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public License,
+    v.2.1 along with this distribution; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA  02110-1301, USA.
+         *
+    (C) 2009,
+    @author JBoss Inc.
+    -->
+<classloading xmlns="urn:jboss:classloading:1.0"
+              name="jbossxts.ear"
+              domain="DefaultDomain"
+              export-all="NON_EMPTY"
+              import-all="true">
+</classloading>
\ No newline at end of file

Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml	2009-09-23 11:56:34 UTC (rev 29440)
+++ labs/jbosstm/trunk/XTS/sar/build.xml	2009-09-23 12:51:01 UTC (rev 29441)
@@ -222,6 +222,9 @@
             <fileset dir="${build.conf.dir}"/>
         </jar>
 
+        <!-- copy 11 and 1.0 application.xml to build dir -->
+        <copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application.xml"/>
+
         <!-- pack everything in the service archive -->
         <jar jarfile="${build.dir}/jbossxts.sar">
             <!-- include generic 1.0 and 1.1 jars -->
@@ -241,6 +244,12 @@
             <!-- include service def (e.g. dependencies) -->
             <fileset dir="." includes="META-INF/jboss-beans.xml"/>
 
+            <!-- include classloading directives -->
+            <fileset dir="." includes="META-INF/jboss-classloading.xml"/>
+
+            <!-- include web service config -->
+            <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
+
             <!-- include sar boot and shutdown code and 1.1 bridge code *but* exclude the bridge API class -->
 	        <fileset dir="${build.classes.dir}" includes="**/*" excludes="${bridge.api.class.files}"/>
         </jar>
@@ -258,6 +267,9 @@
             <fileset dir="${build.conf.dir}"/>
         </jar>
 
+        <!-- copy 11 application.xml to build dir -->
+        <copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application11.xml"/>
+
         <!-- pack everything in the service archive -->
         <jar jarfile="${build.dir}/jbossxts.sar">
             <!-- include generic and 1.1 jars -->
@@ -274,6 +286,12 @@
             <!-- include service def (e.g. dependencies) -->
             <fileset dir="." includes="META-INF/jboss-beans.xml"/>
 
+            <!-- include classloading directives -->
+            <fileset dir="." includes="META-INF/jboss-classloading.xml"/>
+
+            <!-- include web service config -->
+            <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
+
             <!-- include sar boot and shutdown code and 1.1 bridge code *but* exclude the bridge API class -->
 	        <fileset dir="${build.classes.dir}" includes="**/*" excludes="${bridge.api.class.files}"/>
         </jar>
@@ -291,6 +309,9 @@
             <fileset dir="${build.conf.dir}"/>
         </jar>
 
+        <!-- copy 10 application.xml to build dir -->
+        <copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application10.xml"/>
+
         <!-- pack everything in the service archive -->
         <jar jarfile="${build.dir}/jbossxts.sar">
             <!-- include generic and 1.0 jars -->
@@ -307,6 +328,12 @@
             <!-- include service def (e.g. dependencies) -->
             <fileset dir="." includes="META-INF/jboss-beans.xml"/>
 
+            <!-- include classloading directives -->
+            <fileset dir="." includes="META-INF/jboss-classloading.xml"/>
+
+            <!-- include web service config -->
+            <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
+
             <!-- include sar boot and shutdown code -->
             <fileset dir="${build.classes.dir}" includes="**/*"/>
         </jar>



More information about the jboss-svn-commits mailing list