[jbossws-commits] JBossWS SVN: r3970 - in trunk: integration/jboss42 and 3 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-07-24 04:39:35 -0400 (Tue, 24 Jul 2007) New Revision: 3970 Removed: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java Modified: trunk/JBossWS-Trunk.ipr trunk/JBossWS-Trunk.iws trunk/integration/jboss42/int-42.iml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss50/int-50.iml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java Log: Respect MC lifecycle when initializing from SPI Modified: trunk/JBossWS-Trunk.ipr =================================================================== --- trunk/JBossWS-Trunk.ipr 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/JBossWS-Trunk.ipr 2007-07-24 08:39:35 UTC (rev 3970) @@ -217,6 +217,20 @@ <JAVADOC /> <SOURCES /> </library> + <library name="jboss-jmx"> + <CLASSES> + <root url="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="jboss-system-jmx"> + <CLASSES> + <root url="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> </component> <component name="uidesigner-configuration"> <option name="INSTRUMENT_CLASSES" value="true" /> Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/JBossWS-Trunk.iws 2007-07-24 08:39:35 UTC (rev 3970) @@ -147,7 +147,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="65" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="74" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -227,26 +227,7 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="EndpointServlet.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="jbossws-sunri-config.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -277,7 +258,7 @@ <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> </component> <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="int-xfire" /> + <option name="LAST_EDITED_MODULE_NAME" value="int-42" /> <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> @@ -294,7 +275,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-42" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -304,7 +285,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-42" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -319,137 +300,15 @@ <option name="myItemId" value="wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> + <option name="myItemId" value="container" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> + <option name="myItemId" value="jboss42" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="management" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="management" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -502,182 +361,12 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="PackagesPane" splitterProportion="0.5"> + <navigator currentView="ProjectPane" splitterProportion="0.5"> <flattenPackages PackagesPane="false" /> <showMembers /> <showModules /> @@ -829,22 +518,22 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> <editor active="false" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.59335625" order="8" /> + <window_info id="Dependency Viewer" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.66323024" order="8" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23551172" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23366214" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -920,109 +609,109 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="108" column="15" selection-start="4477" selection-end="4477" vertical-scroll-proportion="0.35776398"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="94" selection-start="2985" selection-end="2985" vertical-scroll-proportion="0.60121953"> + <state line="33" column="43" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.31707317"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="104" selection-start="12676" selection-end="12676" vertical-scroll-proportion="0.3416149"> + <state line="20" column="43" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="93" column="19" selection-start="3382" selection-end="3382" vertical-scroll-proportion="0.58536583"> + <state line="48" column="13" selection-start="1794" selection-end="1794" vertical-scroll-proportion="0.19756098"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="96" column="22" selection-start="3479" selection-end="3479" vertical-scroll-proportion="0.63414633"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.8606061"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="70" column="4" selection-start="2767" selection-end="2767" vertical-scroll-proportion="-0.9689441"> + <state line="47" column="99" selection-start="2024" selection-end="2024" vertical-scroll-proportion="0.031055901"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="59" column="14" selection-start="1776" selection-end="2413" vertical-scroll-proportion="-0.39130434"> + <state line="33" column="13" selection-start="1408" selection-end="1408" vertical-scroll-proportion="0.2195122"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="1" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.34146342"> + <state line="34" column="22" selection-start="1363" selection-end="1363" vertical-scroll-proportion="0.32298136"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1440" selection-end="1440" vertical-scroll-proportion="0.34146342"> + <state line="33" column="22" selection-start="1328" selection-end="1328" vertical-scroll-proportion="0.31707317"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="61" column="41" selection-start="2210" selection-end="2210" vertical-scroll-proportion="0.9268293"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="46" column="13" selection-start="1888" selection-end="1888" vertical-scroll-proportion="0.31707317"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1441" selection-end="1441" vertical-scroll-proportion="0.33333334"> + <state line="43" column="13" selection-start="1862" selection-end="1862" vertical-scroll-proportion="0.20609756"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.33333334"> + <state line="110" column="37" selection-start="3837" selection-end="3837" vertical-scroll-proportion="0.85119045"> <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-common-core.jar!/org/jboss/util/NotImplementedException.class"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="13" selection-start="152" selection-end="152" vertical-scroll-proportion="0.0952381"> - <folding /> + <state line="76" column="0" selection-start="2055" selection-end="2788" vertical-scroll-proportion="0.6"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939"> + <state line="98" column="43" selection-start="3153" selection-end="3153" vertical-scroll-proportion="0.36969697"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242"> + <state line="107" column="37" selection-start="3745" selection-end="3745" vertical-scroll-proportion="-0.0952381"> <folding /> </state> </provider> Modified: trunk/integration/jboss42/int-42.iml =================================================================== --- trunk/integration/jboss42/int-42.iml 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/int-42.iml 2007-07-24 08:39:35 UTC (rev 3970) @@ -30,6 +30,9 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="jboss-system" level="project" /> + <orderEntry type="library" name="jboss-jmx" level="project" /> + <orderEntry type="library" name="jboss-system-jmx" level="project" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -47,34 +47,39 @@ // provide logging protected final Logger log = Logger.getLogger(getClass()); - protected DeploymentAspectManager deploymentAspectManager; + private DeploymentAspectManager deploymentAspectManager; private DeploymentModelFactory deploymentModelFactory; private List<ObjectName> phaseOneInterceptors; private List<ObjectName> phaseTwoInterceptors; - /** - * MC callback in create step - * @throws Exception - */ - public void create() throws Exception + public DeploymentAspectManager getDeploymentAspectManager() { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + if(null == deploymentAspectManager) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + } + return deploymentAspectManager; + } + + public DeploymentModelFactory getDeploymentModelFactory() + { if(null == deploymentModelFactory) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } - if(null == deploymentAspectManager) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); - } + return deploymentModelFactory; + } public Deployment createDeployment() { try { - return deploymentModelFactory.createDeployment(); + return getDeploymentModelFactory().createDeployment(); } catch (Exception ex) { @@ -86,7 +91,7 @@ { try { - return deploymentModelFactory.createEndpoint(); + return getDeploymentModelFactory().createEndpoint(); } catch (Exception ex) { @@ -115,6 +120,7 @@ */ public void start() { + MBeanServer server = MBeanServerLocator.locateJBoss(); try { @@ -172,4 +178,8 @@ throw new WSFDeploymentException(e); } } + + /** Get the deployment type this deployer can handle + */ + public abstract Deployment.DeploymentType getDeploymentType(); } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.container.jboss42; +import org.jboss.wsf.spi.deployment.Deployment; + //$Id$ /** @@ -31,4 +33,5 @@ */ public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook { + } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -94,7 +94,7 @@ dep.getContext().addAttachment(DeploymentInfo.class, unit); } - deploymentAspectManager.deploy(dep); + getDeploymentAspectManager().deploy(dep); unit.context.put(Deployment.class, dep); } } @@ -108,7 +108,7 @@ if (dep != null) { log.debug("undeploy: " + unit.shortName); - deploymentAspectManager.undeploy(dep); + getDeploymentAspectManager().undeploy(dep); unit.context.remove(Deployment.class); } } Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY 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 along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.container.jboss42; - -//$Id$ - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deploymentAspectManager.deploy(dep); - } - } - - public void undeploy(DeploymentInfo unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deploymentAspectManager.undeploy(dep); - } - } -} Modified: trunk/integration/jboss50/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss50/int-50.iml 2007-07-24 08:39:35 UTC (rev 3970) @@ -494,30 +494,14 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../trunk/jbossws-core/thirdparty/jboss-deployers.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../trunk/jbossws-core/thirdparty/jboss-microcontainer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="jboss-system" level="project" /> + <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -43,27 +43,36 @@ // provide logging protected final Logger log = Logger.getLogger(getClass()); - protected DeploymentAspectManager deploymentAspectManager; + private DeploymentAspectManager deploymentAspectManager; private DeploymentModelFactory deploymentModelFactory; - public void create() throws Exception + public DeploymentAspectManager getDeploymentAspectManager() { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + if(null == deploymentAspectManager) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + } + return deploymentAspectManager; + } + + public DeploymentModelFactory getDeploymentModelFactory() + { if(null == deploymentModelFactory) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } - if(null == deploymentAspectManager) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); + return deploymentModelFactory; } public Deployment createDeployment() { try { - return deploymentModelFactory.createDeployment(); + return getDeploymentModelFactory().createDeployment(); } catch (Exception ex) { @@ -75,7 +84,7 @@ { try { - return deploymentModelFactory.createService(); + return getDeploymentModelFactory().createService(); } catch (Exception ex) { @@ -87,7 +96,7 @@ { try { - return deploymentModelFactory.createEndpoint(); + return getDeploymentModelFactory().createEndpoint(); } catch (Exception ex) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -91,7 +91,7 @@ dep.getContext().addAttachment(DeploymentUnit.class, unit); } - deploymentAspectManager.deploy(dep); + getDeploymentAspectManager().deploy(dep); unit.addAttachment(Deployment.class, dep); } } @@ -105,7 +105,7 @@ if (dep != null) { log.debug("undeploy: " + unit.getName()); - deploymentAspectManager.undeploy(dep); + getDeploymentAspectManager().undeploy(dep); unit.removeAttachment(Deployment.class); } }