[jboss-svn-commits] JBL Code SVN: r29422 - in labs/jbosstm/trunk/XTS: WSCF/tests/classes/com/arjuna/wscf/tests and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 21 12:34:58 EDT 2009
Author: adinn
Date: 2009-09-21 12:34:57 -0400 (Mon, 21 Sep 2009)
New Revision: 29422
Removed:
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
Modified:
labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/TestInitialisation.java
labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/TestInitialisation.java
labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf11/tests/TestInitialisation.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx/tests/TestInitialisation.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx11/tests/TestInitialisation.java
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
modified to load correctly on AS 6.0
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/TestInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/TestInitialisation.java 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/TestInitialisation.java 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,5 +1,9 @@
package com.arjuna.wsas.tests;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+import java.util.EventListener;
+
/**
* Created by IntelliJ IDEA.
* User: adinn
@@ -7,5 +11,13 @@
* Time: 1:50:50 PM
* To change this template use File | Settings | File Templates.
*/
-public class TestInitialisation {
+public class TestInitialisation implements ServletContextListener
+{
+ public void contextInitialized(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/TestInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/TestInitialisation.java 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/TestInitialisation.java 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,7 +1,18 @@
package com.arjuna.wscf.tests;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
/**
- * perform any setup required for the 1.1 WSCF tests
+ * perform any setup required for the 1.0 WSCF tests
*/
-public class TestInitialisation {
+public class TestInitialisation implements ServletContextListener
+{
+ public void contextInitialized(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf11/tests/TestInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf11/tests/TestInitialisation.java 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf11/tests/TestInitialisation.java 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,7 +1,18 @@
package com.arjuna.wscf11.tests;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
/**
* perform any setup required for the 1.1 WSCF tests
*/
-public class TestInitialisation {
+public class TestInitialisation implements ServletContextListener
+{
+ public void contextInitialized(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx/tests/TestInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx/tests/TestInitialisation.java 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx/tests/TestInitialisation.java 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,5 +1,8 @@
package com.arjuna.wstx.tests;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
/**
* Created by IntelliJ IDEA.
* User: adinn
@@ -7,5 +10,13 @@
* Time: 1:50:50 PM
* To change this template use File | Settings | File Templates.
*/
-public class TestInitialisation {
-}
+public class TestInitialisation implements ServletContextListener
+{
+ public void contextInitialized(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
+}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx11/tests/TestInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx11/tests/TestInitialisation.java 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wstx11/tests/TestInitialisation.java 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,5 +1,8 @@
package com.arjuna.wstx11.tests;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
/**
* Created by IntelliJ IDEA.
* User: adinn
@@ -7,5 +10,13 @@
* Time: 1:50:50 PM
* To change this template use File | Settings | File Templates.
*/
-public class TestInitialisation {
+public class TestInitialisation implements ServletContextListener
+{
+ public void contextInitialized(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent) {
+ // do nothing for now
+ }
}
\ No newline at end of file
Deleted: labs/jbosstm/trunk/XTS/sar/META-INF/application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application.xml 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application.xml 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,88 +0,0 @@
-<!--
- 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>
Deleted: labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application10.xml 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,60 +0,0 @@
-<!--
- 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>
Deleted: labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/application11.xml 2009-09-21 16:34:57 UTC (rev 29422)
@@ -1,60 +0,0 @@
-<!--
- 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>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2009-09-21 16:00:30 UTC (rev 29421)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2009-09-21 16:34:57 UTC (rev 29422)
@@ -222,9 +222,6 @@
<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 -->
@@ -244,9 +241,6 @@
<!-- include service def (e.g. dependencies) -->
<fileset dir="." includes="META-INF/jboss-beans.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>
@@ -264,9 +258,6 @@
<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 -->
@@ -283,9 +274,6 @@
<!-- include service def (e.g. dependencies) -->
<fileset dir="." includes="META-INF/jboss-beans.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>
@@ -303,9 +291,6 @@
<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 -->
@@ -322,9 +307,6 @@
<!-- include service def (e.g. dependencies) -->
<fileset dir="." includes="META-INF/jboss-beans.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