Author: heiko.braun(a)jboss.com Date: 2007-07-20 11:34:56 -0400 (Fri, 20 Jul 2007) New Revision: 3962 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java Removed: trunk/hbraun-trunk.ipr trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml Log: Move EndpointAddressDeploymentAspect to 'spi.framework' package Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/JBossWS-Trunk.iws 2007-07-20 15:34:56 UTC (rev 3962) @@ -228,66 +228,24 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> + <file leaf-file-name="jbossws-deployer-beans.xml" pinned="false" current="true" current-in-tab="true"> + <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="79" column="24" selection-start="1291" selection-end="2750" vertical-scroll-proportion="0.9006211"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="org.jboss.ws.core.server.HttpServer" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <file leaf-file-name="DeploymentAspectInstaller.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="org.jboss.wsf.spi.invocation.InvocationModelFactory" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="72" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.5031056"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2132" selection-end="2132" vertical-scroll-proportion="0.3416149"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -574,7 +532,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -584,11 +542,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <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/jboss42" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -598,25 +556,33 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <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/jboss42" /> + <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/jboss42/src" /> + <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/jboss42/src/main" /> + <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/jboss42/src/main/resources" /> + <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_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -624,35 +590,35 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <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/jboss42" /> + <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/jboss42/src" /> + <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/jboss42/src/main" /> + <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/jboss42/src/main/resources" /> + <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/jboss42/src/main/resources/jbossws-jboss42.jar" /> + <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_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -662,43 +628,39 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> + <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/jboss42" /> + <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/jboss42/src" /> + <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/jboss42/src/main" /> + <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" /> + <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="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <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" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -708,25 +670,37 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <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/jboss40" /> + <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/jboss40/src" /> + <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/jboss40/src/main" /> + <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/jboss40/src/main/resources" /> + <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_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <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/wsf/framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -734,33 +708,41 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <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/jboss40" /> + <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/jboss40/src" /> + <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/jboss40/src/main" /> + <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/jboss40/src/main/resources" /> + <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/jboss40/src/main/resources/jbossws-jboss40.sar" /> + <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_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.sar/META-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <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/wsf/framework" /> + <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/wsf/framework/deployment" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -768,37 +750,51 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <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/jboss40" /> + <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/jboss40/src" /> + <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/jboss40/src/main" /> + <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/jboss40/src/main/resources" /> + <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/jboss40/src/main/resources/jbossws-jboss40.jar" /> + <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="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF" /> + <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/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services" /> + <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> @@ -806,27 +802,43 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="int-50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <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="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <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-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -836,21 +848,29 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="int-50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/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/jboss50/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/jboss50/src/main/java/org/jboss/wsf/container/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> </component> <component name="ProjectReloadState"> @@ -885,8 +905,8 @@ </component> <component name="RecentsManager"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.framework.deployment" /> <recent name="org.jboss.wsf.framework" /> - <recent name="org.jboss.wsf.framework.deployment" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -1013,7 +1033,7 @@ <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="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33353883" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.31935883" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.465063" 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" /> @@ -1099,20 +1119,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="10" selection-start="1534" selection-end="1534" vertical-scroll-proportion="0.35714287"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1463" selection-end="1463" vertical-scroll-proportion="0.30952382"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> <provider selected="true" editor-type-id="text-editor"> <state line="65" column="60" selection-start="2361" selection-end="2361" vertical-scroll-proportion="0.33333334"> @@ -1154,9 +1160,9 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <state line="66" column="45" selection-start="2559" selection-end="2559" vertical-scroll-proportion="0.621118"> <folding /> </state> </provider> @@ -1170,6 +1176,27 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <provider selected="true" editor-type-id="text-editor"> + <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$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> <state line="43" column="72" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.5031056"> @@ -1179,36 +1206,36 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="45" selection-start="2559" selection-end="2559" vertical-scroll-proportion="0.621118"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2132" selection-end="2132" vertical-scroll-proportion="0.3416149"> + <state line="55" column="3" selection-start="2129" selection-end="2129" vertical-scroll-proportion="0.3416149"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="67" column="26" selection-start="2596" selection-end="2596" vertical-scroll-proportion="0.6787879"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> + <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="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> + <folding /> + </state> + </provider> + </entry> </component> </project> Deleted: trunk/hbraun-trunk.ipr =================================================================== --- trunk/hbraun-trunk.ipr 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/hbraun-trunk.ipr 2007-07-20 15:34:56 UTC (rev 3962) @@ -1,224 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4" relativePaths="false"> - <component name="AntConfiguration"> - <defaultAnt bundledAnt="true" /> - </component> - <component name="CodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS" /> - <option name="USE_PER_PROJECT_SETTINGS" value="false" /> - </component> - <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> - <option name="DEPLOY_AFTER_MAKE" value="0" /> - <resourceExtensions> - <entry name=".+\.(properties|xml|html|dtd|tld)" /> - <entry name=".+\.(gif|png|jpeg|jpg)" /> - </resourceExtensions> - <wildcardResourcePatterns> - <entry name="?*.properties" /> - <entry name="?*.xml" /> - <entry name="?*.gif" /> - <entry name="?*.png" /> - <entry name="?*.jpeg" /> - <entry name="?*.jpg" /> - <entry name="?*.html" /> - <entry name="?*.dtd" /> - <entry name="?*.tld" /> - </wildcardResourcePatterns> - </component> - <component name="DataSourceManagerImpl" /> - <component name="DependenciesAnalyzeManager"> - <option name="myForwardDirection" value="false" /> - </component> - <component name="DependencyValidationManager" /> - <component name="EntryPointsManager"> - <entry_points /> - </component> - <component name="ExportToHTMLSettings"> - <option name="PRINT_LINE_NUMBERS" value="false" /> - <option name="OPEN_IN_BROWSER" value="false" /> - <option name="OUTPUT_DIRECTORY" /> - </component> - <component name="GUI Designer component loader factory" /> - <component name="JavacSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="DEPRECATION" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> - <component name="JavadocGenerationManager"> - <option name="OUTPUT_DIRECTORY" /> - <option name="OPTION_SCOPE" value="protected" /> - <option name="OPTION_HIERARCHY" value="true" /> - <option name="OPTION_NAVIGATOR" value="true" /> - <option name="OPTION_INDEX" value="true" /> - <option name="OPTION_SEPARATE_INDEX" value="true" /> - <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> - <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> - <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> - <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> - <option name="OPTION_DEPRECATED_LIST" value="true" /> - <option name="OTHER_OPTIONS" value="" /> - <option name="HEAP_SIZE" /> - <option name="OPEN_IN_BROWSER" value="true" /> - </component> - <component name="JikesSettings"> - <option name="JIKES_PATH" value="" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="DEPRECATION" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="IS_EMACS_ERRORS_MODE" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="Palette2"> - <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"> - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> - </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false"> - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> - <initial-values> - <property name="text" value="Button" /> - </initial-values> - </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="RadioButton" /> - </initial-values> - </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="CheckBox" /> - </initial-values> - </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="Label" /> - </initial-values> - </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - </group> - </component> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/server/42-server.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/server/42-server.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/system/42-system.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/system/42-system.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/as-ejb3.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/ejb3/as-ejb3.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/server/as-server.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/server/as-server.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/system/as-system.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/system/as-system.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/tomcat/as-tomcat.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/tomcat/as-tomcat.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/jboss40/int-40.iml" filepath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/jboss42/int-42.iml" filepath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/jboss50/int-50.iml" filepath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/native/int-native.iml" filepath="$PROJECT_DIR$/integration/native/int-native.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/sunri/int-sunri.iml" filepath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/xfire/int-xfire.iml" filepath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> - <module fileurl="file://$PROJECT_DIR$/jbossws-core/jbossws-core.iml" filepath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> - <module fileurl="file://$PROJECT_DIR$/integration/spi/spi.iml" filepath="$PROJECT_DIR$/integration/spi/spi.iml" /> - <module fileurl="file:///home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" filepath="/home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" /> - <module fileurl="file://$PROJECT_DIR$/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/testsuite/testsuite.iml" /> - </modules> - </component> - <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" /> - <component name="RmicSettings"> - <option name="IS_EANABLED" value="false" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="GENERATE_IIOP_STUBS" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> - <component name="libraryTable"> - <library name="jboss-logging-spi"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </component> - <component name="uidesigner-configuration"> - <option name="INSTRUMENT_CLASSES" value="true" /> - <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> - </component> - <UsedPathMacros /> -</project> - Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-20 15:34:56 UTC (rev 3962) @@ -90,7 +90,7 @@ </bean> <!-- TODO: Move to framework code --> - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-20 15:34:56 UTC (rev 3962) @@ -89,7 +89,7 @@ <property name="provides">ContextRoot</property> </bean> - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-20 15:34:56 UTC (rev 3962) @@ -143,7 +143,7 @@ <property name="provides">ContextRoot</property> </bean> - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2007-07-20 15:34:56 UTC (rev 3962) @@ -0,0 +1,57 @@ +/* + * 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.framework.deployment; + +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; + +//$Id$ + +/** + * A deployer that assigns the endpoint address. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class EndpointAddressDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep) + { + String contextRoot = dep.getService().getContextRoot(); + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + String urlPattern = ep.getURLPattern(); + if (urlPattern == null) + throw new IllegalStateException("Cannot obtain url pattern"); + + if (urlPattern.endsWith("/*")) + urlPattern = urlPattern.substring(0, urlPattern.length() - 2); + + ep.setAddress(contextRoot + urlPattern); + } + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java 2007-07-20 15:24:12 UTC (rev 3961) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAddressDeploymentAspect.java 2007-07-20 15:34:56 UTC (rev 3962) @@ -1,53 +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.spi.deployment; - -//$Id: URLPatternDeployer.java 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ - -/** - * A deployer that assigns the endpoint address. - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public class EndpointAddressDeploymentAspect extends DeploymentAspect -{ - @Override - public void create(Deployment dep) - { - String contextRoot = dep.getService().getContextRoot(); - if (contextRoot == null) - throw new IllegalStateException("Cannot obtain context root"); - - for (Endpoint ep : dep.getService().getEndpoints()) - { - String urlPattern = ep.getURLPattern(); - if (urlPattern == null) - throw new IllegalStateException("Cannot obtain url pattern"); - - if (urlPattern.endsWith("/*")) - urlPattern = urlPattern.substring(0, urlPattern.length() - 2); - - ep.setAddress(contextRoot + urlPattern); - } - } -} \ No newline at end of file