Author: heiko.braun(a)jboss.com Date: 2008-01-08 08:31:55 -0500 (Tue, 08 Jan 2008) New Revision: 5416 Added: stack/metro/trunk/Metro-Branch.ipr stack/metro/trunk/ant-import-tests/ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-metro.xml stack/metro/trunk/ant-import/metro-build-adapter.xml stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java stack/metro/trunk/src/test/etc/log4j.xml stack/metro/trunk/src/test/java/org/ stack/metro/trunk/src/test/java/org/jboss/ stack/metro/trunk/src/test/java/org/jboss/test/ stack/metro/trunk/src/test/java/org/jboss/test/ws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java stack/metro/trunk/src/test/resources/wsit/ stack/metro/trunk/src/test/resources/wsit/rm/ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml Removed: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/src/test/java/org/jboss/ stack/metro/trunk/src/test/java/org/jboss/test/ stack/metro/trunk/src/test/java/org/jboss/test/ws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java stack/metro/trunk/src/test/resources/wsit/rm/ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml Modified: stack/metro/trunk/ant-import/build-testsuite.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/ant-import/macros-deploy-sunri.xml stack/metro/trunk/ant.properties.example stack/metro/trunk/build.xml stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt stack/metro/trunk/version.properties Log: svn merge -r5167:HEAD https://svn.jboss.org/repos/jbossws/stack/metro/branches/hbraun Copied: stack/metro/trunk/Metro-Branch.ipr (from rev 5413, stack/metro/branches/hbraun/Metro-Branch.ipr) =================================================================== --- stack/metro/trunk/Metro-Branch.ipr (rev 0) +++ stack/metro/trunk/Metro-Branch.ipr 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </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="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="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <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="IdProvider" IDEtalkID="130CB95840D679D1651689A38EB02B70" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + </profile> + </profiles> + </component> + <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="LOCALE" /> + <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="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </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" auto-create-binding="false" can-attach-label="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" auto-create-binding="false" can-attach-label="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" auto-create-binding="false" can-attach-label="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" auto-create-binding="false" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="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" auto-create-binding="true" can-attach-label="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" auto-create-binding="true" can-attach-label="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" auto-create-binding="false" can-attach-label="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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="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" auto-create-binding="true" can-attach-label="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" auto-create-binding="true" can-attach-label="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" auto-create-binding="true" can-attach-label="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" auto-create-binding="false" can-attach-label="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" auto-create-binding="true" can-attach-label="true"> + <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" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/Metro-Branch.iml" filepath="$PROJECT_DIR$/Metro-Branch.iml" /> + <module fileurl="file://$PROJECT_DIR$/cvs/cvs-metro.iml" filepath="$PROJECT_DIR$/cvs/cvs-metro.iml" /> + <module fileurl="file://$PROJECT_DIR$/jaxws-2.1.2/jaxws-2.1.2.iml" filepath="$PROJECT_DIR$/jaxws-2.1.2/jaxws-2.1.2.iml" /> + <module fileurl="file://$PROJECT_DIR$/jaxws-tools-2.1.2/jaxws-tools-2.1.2.iml" filepath="$PROJECT_DIR$/jaxws-tools-2.1.2/jaxws-tools-2.1.2.iml" /> + </modules> + </component> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/classes" /> + </component> + <component name="ProjectRunConfigurationManager" /> + <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="StarteamVcsAdapter" /> + <component name="VssVcs" /> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> + </component> + <component name="libraryTable" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> + <UsedPathMacros /> +</project> + Copied: stack/metro/trunk/ant-import/build-metro.xml (from rev 5413, stack/metro/branches/hbraun/ant-import/build-metro.xml) =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml (rev 0) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project basedir="." name="Build-Metro"> + + <property name="cvs.dir" value="cvs"/> + <property name="metro.dir" value="${cvs.dir}/wsit/wsit"/> + + <macrodef name="antbridge"> + <attribute name="target" default="main"/> + <attribute name="file" default="build.xml"/> + <sequential> + <exec dir="${metro.dir}" executable="ant" failonerror="true"> + <arg value="@{target}"/> + <arg value="-f"/> + <arg value="@{file}"/> + </exec> + </sequential> + </macrodef> + + <target name="-cvs.init"> + <available property="same.checkout" file="checkout_id-${cvs.tag}" type="file"/> + </target> + + <target name="checkout" depends="init, -cvs.init, -cvs.message" unless="same.checkout" + description="Checkout/Update the local metro sources"> + + <touch file="checkout_id-${cvs.tag}"/> + + <mkdir dir="${cvs.dir}"/> + + <echo>**********************************</echo> + <echo>CVS out to: ${cvs.dir}</echo> + <echo>**********************************</echo> + + <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs" + package="wsit/wsit" + dest="${cvs.dir}" + tag="${cvs.tag}" + /> + + </target> + + <target name="-cvs.message" if="same.checkout"> + <echo>**********************************</echo> + <echo>No checkout required.</echo> + <echo>Using same CVS tag: ${cvs.tag} </echo> + <echo>To force an update you need to remove the file './checkout_id-${cvs.tag}'</echo> + <echo>**********************************</echo> + </target> + + <target name="install.adapter" depends="init"> + <copy todir="${metro.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/> + </target> + + <target name="clean.metro"> + <antbridge target="clean"/> + <delete dir="thirdparty-gen"/> + </target> + + <target name="clean.cvs"> + <delete file="checkout_id-${cvs.tag}"/> + </target> + + <target name="build.metro" depends="checkout, install.adapter, clean.metro"> + <antbridge target="copy-binaries" file="metro-build-adapter.xml"/> + <echo>*********************************</echo> + <echo>The metro binaries have been copied to 'thirdparty-gen'</echo> + <echo>*********************************</echo> + </target> + +</project> \ No newline at end of file Modified: stack/metro/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import/build-testsuite.xml 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/ant-import/build-testsuite.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -47,8 +47,7 @@ <path id="tests.extra.classpath"> <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> </path> </target> Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -69,7 +69,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar" dest="${thirdparty.dir}/jsr173_api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr250-api.jar" dest="${thirdparty.dir}/jsr250-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> + <!--get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/--> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/> Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -102,7 +102,8 @@ <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - </fileset> + <include name="jboss-wsit-tools.jar"/> + </fileset> </copy> <copy todir="${jboss423.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> @@ -134,7 +135,8 @@ <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> <include name="jbossws-sunri-client.jar"/> - </fileset> + <include name="jboss-wsit-tools.jar"/> + </fileset> </delete> <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> Copied: stack/metro/trunk/ant-import/metro-build-adapter.xml (from rev 5413, stack/metro/branches/hbraun/ant-import/metro-build-adapter.xml) =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml (rev 0) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="JBossWS-BuildAdapter" default="copy-binaries" basedir="."> + + <import file="properties.xml"/> + <import file="build.xml"/> + + <property name="thirdparty.gen" value="../../../thirdparty-gen"/> + <property name="thirdparty" value="../../../thirdparty"/> + + <target name="adapter.init"> + <!-- Directory for metro generated jars that are not distributed through 'repository.jboss.com' --> + <mkdir dir="${thirdparty.gen}"/> + </target> + <!-- + Creates the core metro extension jar: + 'rt/build/wsit-rt.jar' + --> + <target name="-metro.runtime.jar" depends="WSIT.main"> + <ant dir="." target="create-wsit-runtime-jar"/> + <mkdir dir="${rt.dir}/build/jboss-tmp"/> + <unzip src="${rt.dir}/build/wsit-rt.jar" dest="${rt.dir}/build/jboss-tmp/"/> + <rename src="${rt.dir}/build/jboss-tmp/WEB-INF" dest="${rt.dir}/build/jboss-tmp/wsdl"/> + <zip destfile="${rt.dir}/build/jboss-wsit-rt.jar" basedir="${rt.dir}/build/jboss-tmp/"/> + </target> + + <!-- build the metro tools extension --> + <target name="-metro.tools.jar"> + <ant dir="tools" target="wsit-jars-tools"> + <property name="tools.dir" value="."/> + </ant> + + <mkdir dir="${tools.dir}/build/jboss-tmp"/> + + <copy todir="${tools.dir}/build/jboss-tmp/META-INF/services" overwrite="true" verbose="true"> + <fileset dir="./etc/META-INF/services"> + <include name="*.TWSDLExtensionHandler"/> + </fileset> + </copy> + + <unzip src="${tools.dir}/build/wsit-tools.jar" dest="${tools.dir}/build/jboss-tmp/"/> + + <zip destfile="${tools.dir}/build/jboss-wsit-tools.jar" basedir="${tools.dir}/build/jboss-tmp/"/> + </target> + + + <target name="metro.jars" description="Creates the metro standalone jars" depends="init"> + <antcall target="-metro.runtime.jar"/> + <antcall target="-metro.tools.jar"/> + </target> + + <target name="copy-binaries" + description="Builds the metro jars and copies them to thirdparty-gen" + depends="metro.jars"> + + <copy todir="${thirdparty.gen}" verbose="true"> + + <!-- runtime jars --> + <fileset dir="${rt.dir}/build/"> + <include name="jboss-wsit-rt.jar"/> + </fileset> + + <!-- tools jars --> + <fileset dir="${tools.dir}/build/"> + <include name="jboss-wsit-tools.jar"/> + </fileset> + + <!-- Metro 3rd party thats not available through repo.jboss.com --> + + <fileset dir="${lib.runtime.dir}"> + <include name="jaxws-local-transport.jar"/> + <include name="mimepull.jar"/> + <include name="stax-utils.jar"/> + <include name="txnannprocessor.jar"/> + <include name="wstx-asl-3.2.1.jar"/> + <include name="xmldsig.jar"/> + <include name="xws-security.jar"/> + + <!-- a custom jarjar resolver package --> + <include name="resolver.jar"/> + </fileset> + </copy> + + + </target> + +</project> \ No newline at end of file Copied: stack/metro/trunk/ant-import-tests (from rev 5413, stack/metro/branches/hbraun/ant-import-tests) Deleted: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project> - - <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-jars-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - - <!-- wsit-rm --> - <war warfile="${tests.output.dir}/libs/wsit-rm.war" webxml="${tests.output.dir}/resources/wsit/rm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> - <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> - <include name="org/jboss/test/ws/wsit/rm/jaxws/Add.class"/> - <include name="org/jboss/test/ws/wsit/rm/jaxws/AddResponse.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/wsit/rm/WEB-INF"> - <include name="sun-web.xml"/> - <include name="web.xml"/> - <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/> - </webinf> - </war> - - </target> - -</project> Copied: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml (from rev 5413, stack/metro/branches/hbraun/ant-import-tests/build-jars-jaxws.xml) =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml (rev 0) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <description>JBossWS test archive builder</description> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + + <!-- wsit-rm --> + <war warfile="${tests.output.dir}/libs/wsit-rm.war" webxml="${tests.output.dir}/resources/wsit/rm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> + <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> + <include name="org/jboss/test/ws/wsit/rm/jaxws/Add.class"/> + <include name="org/jboss/test/ws/wsit/rm/jaxws/AddResponse.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/wsit/rm/WEB-INF"> + <include name="sun-web.xml"/> + <include name="web.xml"/> + <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/> + </webinf> + </war> + + </target> + +</project> Deleted: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project> - - <property name="tests.output.dir" value="${sunri.dir}/output/tests"/> - - <import file="${sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/> - - <!-- Define excluded tests --> - <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - - <property name="tests.dir" value="${sunri.dir}/src/test"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> - - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-rt.jar"/> - - <!--pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/--> - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> - - <pathelement location="${int.sunri.dir}/thirdparty-gen/xws-security.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> - </path> - - <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> - <classpath refid="ws.stack.classpath"/> - </taskdef> - - </target> - - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> - - <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts"> - - <mkdir dir="${tests.output.dir}/wsimport"/> - - <wsimport - wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" - destdir="${tests.output.dir}/wsimport" - sourcedestdir="${tests.output.dir}/wsimport" - keep="true" - verbose="false" - package="org.jboss.test.ws.wsit.rm"/> - - </target> - - <!-- - Generate JAX-WS sources - --> - <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts."> - - <!-- placeholder for jaxws tools extension points --> - - </target> - - <target name="tests-compile-generated-resources" depends="wsgen"> - - </target> - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources"> - <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${sunri.dir}/src/test/java" excludesfile="${excludesfile}"/> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${sunri.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${sunri.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> - <ant antfile="${sunri.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - -</project> Copied: stack/metro/trunk/ant-import-tests/build-testsuite.xml (from rev 5413, stack/metro/branches/hbraun/ant-import-tests/build-testsuite.xml) =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml (rev 0) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <property name="tests.output.dir" value="${sunri.dir}/output/tests"/> + + <import file="${sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + + <!-- Define excluded tests --> + <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + + <property name="tests.dir" value="${sunri.dir}/src/test"/> + <property name="tests.java.dir" value="${tests.dir}/java"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> + + <!-- + Init the various classpaths + --> + <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> + + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-rt.jar"/> + + <!--pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/--> + <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> + + <pathelement location="${int.sunri.dir}/thirdparty-gen/xws-security.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> + </path> + + <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> + <classpath refid="ws.stack.classpath"/> + </taskdef> + + </target> + + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> + + <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts"> + + <mkdir dir="${tests.output.dir}/wsimport"/> + + <wsimport + wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" + destdir="${tests.output.dir}/wsimport" + sourcedestdir="${tests.output.dir}/wsimport" + keep="true" + verbose="false" + package="org.jboss.test.ws.wsit.rm"/> + + </target> + + <!-- + Generate JAX-WS sources + --> + <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts."> + + <!-- placeholder for jaxws tools extension points --> + + </target> + + <target name="tests-compile-generated-resources" depends="wsgen"> + + </target> + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources"> + <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${sunri.dir}/src/test/java" excludesfile="${excludesfile}"/> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <macro-copy-resources srcdir="${sunri.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${sunri.dir}/src/test"/> + </target> + + <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> + <ant antfile="${sunri.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + +</project> Modified: stack/metro/trunk/ant.properties.example =================================================================== --- stack/metro/trunk/ant.properties.example 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/ant.properties.example 2008-01-08 13:31:55 UTC (rev 5416) @@ -4,7 +4,7 @@ # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ # Optional JBoss Home -#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4 +#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA #jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA @@ -38,3 +38,9 @@ javac.deprecation=no javac.fail.onerror=yes javac.verbose=no + +# +# Metro CVS access +# +cvs.user=NONE +cvs.tag=WSIT-1_0-BRANCH \ No newline at end of file Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/build.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -12,279 +12,296 @@ <!-- $Id$ --> <project default="main" basedir="." name="JBossWS-SunRI"> - - <property name="int.sunri.dir" value="${basedir}"/> - - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-bin-dist.xml"/> - <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-testsuite.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="sunri.dir" value="${int.sunri.dir}"/> - <property name="sunri.src.dir" value="${sunri.dir}/src/main"/> - <property name="sunri.distro.dir" value="${sunri.src.dir}/distro"/> - <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/> - <property name="sunri.java.dir" value="${sunri.src.dir}/java"/> - <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/> - <property name="sunri.output.dir" value="${sunri.dir}/output"/> - <property name="sunri.output.apidocs.dir" value="${sunri.output.dir}/apidocs"/> - <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/> - <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/> - <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init" depends="prepare,thirdparty"> - <mkdir dir="${sunri.output.apidocs.dir}"/> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - - <!-- Compile java sources --> - <target name="compile-classes" depends="compile-classes-sunri"/> - <target name="compile-classes-sunri" depends="init"> - <mkdir dir="${sunri.output.classes.dir}"/> - <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsf/stack/sunri/**"/> - <classpath refid="sunri.integration.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${sunri.output.etc.dir}"/> - <copy todir="${sunri.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${sunri.etc.dir}"> - <include name="component-info.xml"/> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-sunri-${version.id}"/> - <filtersfile file="${int.sunri.dir}/version.properties"/> - </filterset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> - </target> - - <target name="jars-common" depends="compile"> - - <!-- Build jbossws-sunri.jar --> - <mkdir dir="${sunri.output.lib.dir}"/> - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.classes.dir}"> - <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> - <include name="org/jboss/wsf/stack/sunri/injection/**"/> - <include name="org/jboss/wsf/stack/sunri/client/**"/> - <include name="org/jboss/wsf/stack/sunri/metadata/**"/> - <include name="org/jboss/wsf/stack/sunri/log/**"/> - <include name="org/jboss/wsf/stack/sunri/*"/> - </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/> - </jar> - <!-- jbossws-sunri-client.jar --> - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar" manifest="${sunri.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.classes.dir}"> - <include name="org/jboss/wsf/stack/sunri/client/**"/> - <include name="org/jboss/wsf/stack/sunri/tools/**"/> - </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-sunri-client.jar/META-INF"/> - </jar> + <property name="int.sunri.dir" value="${basedir}"/> - <!-- Build jbossws-context.war --> - <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${sunri.resources.dir}/jbossws-context.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${sunri.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <!-- Build jbossws-sunri-src.zip --> - <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" > - <fileset dir="${sunri.java.dir}"/> - </zip> - </target> - - <target name="jars-jboss50" depends="jars-common"> - - <!-- Concat jbossws-beans.xml --> - <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> - <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Build jbossws-sunri50.sar --> - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-bin-dist.xml"/> + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <fileset dir="${sunri.output.lib.dir}"> - <include name="jbossws-context.war"/> - </fileset> + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> - <fileset dir="${thirdparty.dir}"> - <include name="FastInfoset.jar"/> - <include name="http.jar"/> - <include name="jaxrpc-api.jar"/> - <include name="jaxws-api.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jsr173_api.jar"/> - <include name="jsr181-api.jar"/> - <include name="jsr250-api.jar"/> - <include name="resolver.jar"/> - <include name="saaj-api.jar"/> - <include name="saaj-impl.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - </fileset> - <fileset dir="${sunri.output.lib.dir}"> - <include name="jbossws-sunri.jar"/> - </fileset> - <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - </target> - - <target name="jars-jboss42" depends="jars-common"> - - <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - - <!-- Concat jboss-beans.xml --> - <concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> - <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> - <fileset file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Build jbossws-sunri42.sar --> - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.lib.dir}"> - <include name="jbossws-context.war"/> - </fileset> - <fileset dir="${sunri.output.lib.dir}"> - <include name="jbossws-sunri.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="FastInfoset.jar"/> - <include name="http.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxrpc-api.jar"/> - <include name="jaxws-api.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jsr173_api.jar"/> - <include name="jsr181-api.jar"/> - <include name="jsr250-api.jar"/> - <include name="resolver.jar"/> - <include name="saaj-api.jar"/> - <include name="saaj-impl.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - </fileset> - <fileset dir="${sunri.output.lib.dir}/jbossws-sunri42"> - <include name="jbossws.beans/**"/> - </fileset> - <metainf dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> + <property name="sunri.dir" value="${int.sunri.dir}"/> + <property name="sunri.src.dir" value="${sunri.dir}/src/main"/> + <property name="sunri.distro.dir" value="${sunri.src.dir}/distro"/> + <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/> + <property name="sunri.java.dir" value="${sunri.src.dir}/java"/> + <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/> + <property name="sunri.output.dir" value="${sunri.dir}/output"/> + <property name="sunri.output.apidocs.dir" value="${sunri.output.dir}/apidocs"/> + <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/> + <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/> + <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/> + + + <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> + <import file="${basedir}/ant-import/build-metro.xml"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="init" depends="prepare,thirdparty"> + <mkdir dir="${sunri.output.apidocs.dir}"/> </target> - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> - <!-- expand the sunri sources --> - <mkdir dir="${sunri.output.dir}/thirdparty-sources"/> - <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/> + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> - <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <pathelement path="${sunri50.integration.classpath}"/> - <pathelement path="${sunri.integration.classpath}"/> - </classpath> + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/wsf/**"/> - </packageset> - <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes"> - <include name="com/sun/**"/> - </packageset> + <!-- Compile java sources --> + <target name="compile-classes" depends="compile-classes-sunri"/> + <target name="compile-classes-sunri" depends="init"> + <mkdir dir="${sunri.output.classes.dir}"/> + <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/wsf/stack/sunri/**"/> + <classpath refid="sunri.integration.classpath"/> + </javac> + </target> - <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/--> - <group title="Stack integration" packages="org.jboss.wsf.stack*"/> - <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> - <group title="Container integration" packages="org.jboss.wsf.container*"/> + <!-- Compile etc files (manifests and such) --> + <target name="compile-etc" depends="init"> + <mkdir dir="${sunri.output.etc.dir}"/> + <copy todir="${sunri.output.etc.dir}" filtering="yes" overwrite="true"> + <fileset dir="${sunri.etc.dir}"> + <include name="component-info.xml"/> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-sunri-${version.id}"/> + <filtersfile file="${int.sunri.dir}/version.properties"/> + </filterset> + </copy> + </target> - </javadoc> - </target> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${sunri.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.sunri.dir}/thirdparty"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars,tests-main"/> - - <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/> - + <!-- ================================================================== --> + <!-- Archives --> + <!-- ================================================================== --> + + <!-- + | Build all jar files. + --> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> + </target> + + <target name="jars-common" depends="compile"> + + <!-- Build jbossws-sunri.jar --> + <mkdir dir="${sunri.output.lib.dir}"/> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.classes.dir}"> + <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> + <include name="org/jboss/wsf/stack/sunri/injection/**"/> + <include name="org/jboss/wsf/stack/sunri/client/**"/> + <include name="org/jboss/wsf/stack/sunri/metadata/**"/> + <include name="org/jboss/wsf/stack/sunri/log/**"/> + <include name="org/jboss/wsf/stack/sunri/*"/> + </fileset> + <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/> + </jar> + + <!-- jbossws-sunri-client.jar --> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.classes.dir}"> + <include name="org/jboss/wsf/stack/sunri/client/**"/> + <include name="org/jboss/wsf/stack/sunri/tools/**"/> + </fileset> + <metainf dir="${sunri.resources.dir}/jbossws-sunri-client.jar/META-INF"/> + </jar> + + <!-- Build jbossws-context.war --> + <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${sunri.resources.dir}/jbossws-context.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${sunri.resources.dir}/jbossws-context.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + + <!-- Build jbossws-sunri-src.zip --> + <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" > + <fileset dir="${sunri.java.dir}"/> + </zip> + </target> + + <target name="jars-jboss50" depends="jars-common" if="jboss500.home"> + + <!-- Concat jbossws-beans.xml --> + <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; + </header> + <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + <!-- Build jbossws-sunri50.sar --> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> + + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-context.war"/> + </fileset> + + <fileset dir="${thirdparty.dir}"> + <include name="FastInfoset.jar"/> + <include name="http.jar"/> + <include name="jaxrpc-api.jar"/> + <include name="jaxws-api.jar"/> + <include name="jaxws-rt.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + + <include name="jsr173_api.jar"/> + <include name="jsr181-api.jar"/> + <include name="jsr250-api.jar"/> + + </fileset> + + <!-- Any extra metro jar, including metro-rt.jar --> + <fileset dir="thirdparty-gen"> + <include name="*.jar"/> + </fileset> + + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-sunri.jar"/> + </fileset> + <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50"> + <include name="jbossws-beans.xml"/> + </metainf> + </jar> + </target> + + <target name="jars-jboss42" depends="jars-common" if="jboss422.home"> + + <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + + <!-- Concat jboss-beans.xml --> + <concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; + </header> + <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> + <fileset file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + <!-- Build jbossws-sunri42.sar --> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-sunri.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="FastInfoset.jar"/> + <include name="http.jar"/> + <include name="jboss-wsit-tools.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> + <include name="jaxws-api.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jsr181-api.jar"/> + <include name="jsr173_api.jar"/> + <include name="jsr250-api.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + </fileset> + + <!-- Any extra metro jar, including metro-rt.jar --> + <fileset dir="thirdparty-gen"> + <include name="*.jar"/> + </fileset> + + + <fileset dir="${sunri.output.lib.dir}/jbossws-sunri42"> + <include name="jbossws.beans/**"/> + </fileset> + <metainf dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + </target> + + <!-- Generate the JavaDoc --> + <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> + + <!-- expand the sunri sources --> + <mkdir dir="${sunri.output.dir}/thirdparty-sources"/> + <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/> + + <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath> + <pathelement path="${sunri50.integration.classpath}"/> + <pathelement path="${sunri.integration.classpath}"/> + </classpath> + + <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/wsf/**"/> + </packageset> + <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes"> + <include name="com/sun/**"/> + </packageset> + + <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/--> + <group title="Stack integration" packages="org.jboss.wsf.stack*"/> + <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> + <group title="Container integration" packages="org.jboss.wsf.container*"/> + + </javadoc> + </target> + + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${sunri.output.dir}"/> + <delete dir="thirdparty.gen"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${int.sunri.dir}/thirdparty"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars,tests-main"/> + + <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/> + </project> Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/DeploymentDescriptorParserExt.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -76,16 +76,16 @@ /** * A copy of DeploymentDescriptorParser - * * + * * @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener - * + * * @author WS Development Team * @author Kohsuke Kawaguchi * @author Thomas.Diesler(a)jboss.org * @since 10-May-2007 */ -public class DeploymentDescriptorParserExt<A> +public class DeploymentDescriptorParserExt<A> { private final Container container; private final ClassLoader classLoader; @@ -127,10 +127,21 @@ String resourcePath = "/META-INF/"; try { - loader.getResource(resourcePath); + URL resource = loader.getResource(resourcePath); + InputStream inputStream = null; + try + { + inputStream = resource.openStream(); + } + finally + { + if(inputStream!=null) + inputStream.close(); + } + log.warn("bypass collectDocs(), it doesnt work for EJB endpoints"); } - catch (MalformedURLException e) + catch (Exception e) { resourcePath = "/WEB-INF/"; log.debug("Collecting docs from " + resourcePath); @@ -278,7 +289,7 @@ ensureNoContent(reader); Invoker invoker = createInvoker(implementorClass); WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker, - serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false); + serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false); adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint)); } else Copied: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java (from rev 5413, stack/metro/branches/hbraun/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java) =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/FakeServletContext.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,164 @@ +package org.jboss.wsf.stack.sunri; + +import com.sun.xml.ws.transport.http.ResourceLoader; + +import javax.servlet.ServletContext; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import java.net.URL; +import java.net.MalformedURLException; +import java.util.Set; +import java.util.Enumeration; +import java.io.InputStream; +import java.io.IOException; + +public class FakeServletContext implements ServletContext +{ + private ResourceLoader resourceLoader; + + + public FakeServletContext(ResourceLoader resourceLoader) + { + this.resourceLoader = resourceLoader; + } + + + public ServletContext getContext(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getContextPath() + { + throw new IllegalArgumentException("Not implemented"); + } + + public int getMajorVersion() + { + throw new IllegalArgumentException("Not implemented"); + } + + public int getMinorVersion() + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getMimeType(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Set getResourcePaths(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public URL getResource(String name) + { + try + { + return resourceLoader.getResource(name); + + } catch (Throwable e) + { + return null; + } + } + + public InputStream getResourceAsStream(String string) + { + try + { + return getResource(string).openStream(); + } catch (Throwable e) + { + return null; + } + } + + public RequestDispatcher getRequestDispatcher(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public RequestDispatcher getNamedDispatcher(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Servlet getServlet(String string) throws ServletException + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getServlets() + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getServletNames() + { + throw new IllegalArgumentException("Not implemented"); + } + + public void log(String string) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void log(Exception exception, String string) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void log(String string, Throwable throwable) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public String getRealPath(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getServerInfo() + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getInitParameter(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getInitParameterNames() + { + throw new IllegalArgumentException("Not implemented"); + } + + public Object getAttribute(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getAttributeNames() + { + throw new IllegalArgumentException("Not implemented"); + } + + public void setAttribute(String string, Object object) + { + throw new IllegalArgumentException("Not implemented"); + } + + public void removeAttribute(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getServletContextName() + { + throw new IllegalArgumentException("Not implemented"); + } +} Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -83,7 +83,7 @@ if (target != null) { String query = req.getQueryString(); - if (target.isMetadataQuery(query)) { + if (isMetadataQuery(query)) { // Sends published WSDL and schema documents target.publishWSDL(context, req, res); return; @@ -139,4 +139,20 @@ { throw new IllegalArgumentException("JBWS-1869: Not implemented"); } + + /** + * Returns true if the given query string is for metadata request. + * + * @param query + * String like "xsd=1" or "perhaps=some&amp;unrelated=query". + * Can be null. + * @return true for metadata requests + * false for web service requests + */ + private boolean isMetadataQuery(String query) { + // we intentionally return true even if documents don't exist, + // so that they get 404. + return query != null && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd=")); + } + } Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/metadata/RuntimeModelDeploymentAspect.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -39,9 +39,11 @@ import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.stack.sunri.DeploymentDescriptorParserExt; import org.jboss.wsf.stack.sunri.DeploymentDescriptorParserJBWS; +import org.jboss.wsf.stack.sunri.FakeServletContext; import org.jboss.wsf.stack.sunri.log.MessageLogPipelineHook; import javax.xml.ws.WebServiceException; +import javax.servlet.ServletContext; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -79,7 +81,6 @@ throw new IllegalArgumentException("Null runtimeLoader"); ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); - JBossWSContainer container = new JBossWSContainer(); try { @@ -88,6 +89,7 @@ ResourceLoaderAdapter resourceLoaderAdapter = new ResourceLoaderAdapter(runtimeLoader); ResourceLoader resourceLoader = new VFSResourceLoader(resourceLoaderAdapter); + JBossWSContainer container = new JBossWSContainer(resourceLoader); // TODO: refactor to general HTTPAdapter usage ServletAdapterList adapterList = new ServletAdapterList(); @@ -159,11 +161,13 @@ /** - * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}. Pipes - * can get ServletContext from Container and use it to load some resources. + * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}. + * Pipes can get ServletContext from Container and use it to load some resources. */ static class JBossWSContainer extends Container { + private ResourceLoader resourceLoader; + private final Module module = new Module() { private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>(); @@ -175,8 +179,9 @@ } }; - JBossWSContainer() + JBossWSContainer(ResourceLoader loader) { + this.resourceLoader = loader; } public <T> T getSPI(Class<T> spiType) @@ -193,6 +198,10 @@ { return (T)new MessageLogPipelineHook(); } + else if(spiType == ServletContext.class) + { + return (T)new FakeServletContext(resourceLoader); + } log.warn("Unable to resolve SPI for type: " + spiType); return null; Copied: stack/metro/trunk/src/test/etc/log4j.xml (from rev 5413, stack/metro/branches/hbraun/src/test/etc/log4j.xml) =================================================================== --- stack/metro/trunk/src/test/etc/log4j.xml (rev 0) +++ stack/metro/trunk/src/test/etc/log4j.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id$ --> + +<!-- +| For more configuration infromation and examples see the Jakarta Log4j +| owebsite: http://jakarta.apache.org/log4j +--> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="${build.testlog}/test.log"/> + <param name="Append" value="false"/> + + <!-- Rollover at midnight each day --> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + + <category name="org.jboss.ws.core.MessageTrace"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> + </category> + + <category name="org.jboss.remoting"> + <priority value="INFO"/> + </category> + + <!-- Apache security is verbose --> + <category name="org.apache.xml.security"> + <priority value="INFO"/> + </category> + + <!-- + <category name="org.jboss.xb"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> + </category> + --> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> +<!-- + <appender-ref ref="CONSOLE"/> +--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Copied: stack/metro/trunk/src/test/java/org (from rev 5413, stack/metro/branches/hbraun/src/test/java/org) Copied: stack/metro/trunk/src/test/java/org/jboss (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss) Copied: stack/metro/trunk/src/test/java/org/jboss/test (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test) Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws) Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit) Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm) Deleted: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java =================================================================== --- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of Sun Microsystems, Inc. nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.jboss.test.ws.wsit.rm; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; - -/** - * - * @author User - */ -@WebService( - targetNamespace = "http://calculator.me.org/", - portName = "CalculatorWSPort", - serviceName = "CalculatorWSService" -) -public class CalculatorWSImpl implements CalculatorWS -{ - - /** - * Web service operation - */ - @WebMethod(operationName = "add") - public int add(@WebParam(name = "i") int i, @WebParam(name = "j") int j) - { - - int result = i + j; - System.out.println("*** WSIT-RM ***"); - System.out.println("Result is: " + result); - return result; - } - -} Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java) =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * * Neither the name of Sun Microsystems, Inc. nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.jboss.test.ws.wsit.rm; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; + +/** + * + * @author User + */ +@WebService( + targetNamespace = "http://calculator.me.org/", + portName = "CalculatorWSPort", + serviceName = "CalculatorWSService" +) +public class CalculatorWSImpl implements CalculatorWS +{ + + /** + * Web service operation + */ + @WebMethod(operationName = "add") + public int add(@WebParam(name = "i") int i, @WebParam(name = "j") int j) + { + + int result = i + j; + System.out.println("*** WSIT-RM ***"); + System.out.println("Result is: " + result); + return result; + } + +} Deleted: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java =================================================================== --- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,37 +0,0 @@ -package org.jboss.test.ws.wsit.rm; - -import junit.framework.Test; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import java.net.URL; - -import com.sun.xml.ws.Closeable; - - -public class RMTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(RMTestCase.class, "wsit-rm.war"); - } - - public void testRMExchange() throws Exception - { - URL url = new URL("http://" + getServerHost() + ":8080/wsit-rm?wsdl"); - QName qName = new QName("http://calculator.me.org/";, "CalculatorWSService"); - - CalculatorWSService service = new CalculatorWSService(url,qName); - CalculatorWS port = service.getCalculatorWSPort(); - - int i = 10; - int j = 20; - - int result = port.add(i, j); - assertTrue(result == 30); - - ((Closeable)port).close(); - } -} - Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java) =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,37 @@ +package org.jboss.test.ws.wsit.rm; + +import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import java.net.URL; + +import com.sun.xml.ws.Closeable; + + +public class RMTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(RMTestCase.class, "wsit-rm.war"); + } + + public void testRMExchange() throws Exception + { + URL url = new URL("http://" + getServerHost() + ":8080/wsit-rm?wsdl"); + QName qName = new QName("http://calculator.me.org/";, "CalculatorWSService"); + + CalculatorWSService service = new CalculatorWSService(url,qName); + CalculatorWS port = service.getCalculatorWSPort(); + + int i = 10; + int j = 20; + + int result = port.add(i, j); + assertTrue(result == 30); + + ((Closeable)port).close(); + } +} + Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws) Deleted: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java =================================================================== --- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,59 +0,0 @@ - -package org.jboss.test.ws.wsit.rm.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "add", namespace = "http://rm.me.org/") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "add", namespace = "http://rm.me.org/", propOrder = { - "i", - "j" -}) -public class Add { - - @XmlElement(name = "i", namespace = "") - private int i; - @XmlElement(name = "j", namespace = "") - private int j; - - /** - * - * @return - * returns int - */ - public int getI() { - return this.i; - } - - /** - * - * @param i - * the value for the i property - */ - public void setI(int i) { - this.i = i; - } - - /** - * - * @return - * returns int - */ - public int getJ() { - return this.j; - } - - /** - * - * @param j - * the value for the j property - */ - public void setJ(int j) { - this.j = j; - } - -} Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java) =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/Add.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,59 @@ + +package org.jboss.test.ws.wsit.rm.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "add", namespace = "http://rm.me.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "add", namespace = "http://rm.me.org/", propOrder = { + "i", + "j" +}) +public class Add { + + @XmlElement(name = "i", namespace = "") + private int i; + @XmlElement(name = "j", namespace = "") + private int j; + + /** + * + * @return + * returns int + */ + public int getI() { + return this.i; + } + + /** + * + * @param i + * the value for the i property + */ + public void setI(int i) { + this.i = i; + } + + /** + * + * @return + * returns int + */ + public int getJ() { + return this.j; + } + + /** + * + * @param j + * the value for the j property + */ + public void setJ(int j) { + this.j = j; + } + +} Deleted: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java =================================================================== --- stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,36 +0,0 @@ - -package org.jboss.test.ws.wsit.rm.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "addResponse", namespace = "http://rm.me.org/") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "addResponse", namespace = "http://rm.me.org/") -public class AddResponse { - - @XmlElement(name = "return", namespace = "") - private int _return; - - /** - * - * @return - * returns int - */ - public int getReturn() { - return this._return; - } - - /** - * - * @param _return - * the value for the _return property - */ - public void setReturn(int _return) { - this._return = _return; - } - -} Copied: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java (from rev 5413, stack/metro/branches/hbraun/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java) =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/AddResponse.java 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.wsit.rm.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "addResponse", namespace = "http://rm.me.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addResponse", namespace = "http://rm.me.org/") +public class AddResponse { + + @XmlElement(name = "return", namespace = "") + private int _return; + + /** + * + * @return + * returns int + */ + public int getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(int _return) { + this._return = _return; + } + +} Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-01-08 13:31:55 UTC (rev 5416) @@ -2,6 +2,15 @@ # $Id$ # +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + # [JBWS-1673] Fix JAXR samples for SunRI org/jboss/test/ws/jaxws/samples/jaxr/** Copied: stack/metro/trunk/src/test/resources/wsit (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit) Copied: stack/metro/trunk/src/test/resources/wsit/rm (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm) Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF) Deleted: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml =================================================================== --- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> - -<sun-web-app error-url=""> - <context-root>/CalculatorApp</context-root> - <class-loader delegate="true"/> - <jsp-config> - <property name="keepgenerated" value="true"> - <description>Keep a copy of the generated servlet class' java code.</description> - </property> - </jsp-config> -</sun-web-app> Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/sun-web.xml) =================================================================== --- stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml (rev 0) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> + +<sun-web-app error-url=""> + <context-root>/CalculatorApp</context-root> + <class-loader delegate="true"/> + <jsp-config> + <property name="keepgenerated" value="true"> + <description>Keep a copy of the generated servlet class' java code.</description> + </property> + </jsp-config> +</sun-web-app> Deleted: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml =================================================================== --- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <servlet> - <servlet-name>Calculator</servlet-name> - <servlet-class>org.jboss.test.ws.wsit.rm.CalculatorWSImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Calculator</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - <session-config> - <session-timeout> - 30 - </session-timeout> - </session-config> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> -</web-app> Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/web.xml) =================================================================== --- stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml (rev 0) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/web.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>Calculator</servlet-name> + <servlet-class>org.jboss.test.ws.wsit.rm.CalculatorWSImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Calculator</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout> + 30 + </session-timeout> + </session-config> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> +</web-app> Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsdl) Deleted: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl =================================================================== --- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. --> -<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. --> -<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="http://calculator.me.org/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns="http://schemas.xmlsoap.org/wsdl/" - targetNamespace="http://calculator.me.org/" - name="CalculatorWSService"> - - <wsp:UsingPolicy></wsp:UsingPolicy> - <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy"> - <wsp:ExactlyOne> - <wsp:All> - <ns1:RMAssertion xmlns:ns1="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">... - <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"></n... - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <types> - <xsd:schema> - <!-- http://calculator.me.org/ --> - <xsd:import namespace="http://calculator.me.org/" schemaLocation="xsd1.xsd"></xsd:import> - </xsd:schema> - - </types> - <message name="add"> - <part name="parameters" element="tns:add"></part> - </message> - <message name="addResponse"> - <part name="parameters" element="tns:addResponse"></part> - </message> - <portType name="CalculatorWS"> - <operation name="add"> - <input message="tns:add"></input> - <output message="tns:addResponse"></output> - </operation> - </portType> - <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS"> - <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"></wsp:PolicyReference> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding> - <operation name="add"> - - <soap:operation soapAction=""></soap:operation> - <input> - <soap:body use="literal"></soap:body> - </input> - <output> - <soap:body use="literal"></soap:body> - </output> - </operation> - </binding> - <service name="CalculatorWSService"> - <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"> - <soap:address location="http://127.0.0.1:8080/wsit-rm"></soap:address> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl) =================================================================== --- stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl (rev 0) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. --> +<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. --> +<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://calculator.me.org/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns="http://schemas.xmlsoap.org/wsdl/" + targetNamespace="http://calculator.me.org/" + name="CalculatorWSService"> + + <wsp:UsingPolicy></wsp:UsingPolicy> + <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">... + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"></n... + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <types> + <xsd:schema> + <!-- http://calculator.me.org/ --> + <xsd:import namespace="http://calculator.me.org/" schemaLocation="xsd1.xsd"></xsd:import> + </xsd:schema> + + </types> + <message name="add"> + <part name="parameters" element="tns:add"></part> + </message> + <message name="addResponse"> + <part name="parameters" element="tns:addResponse"></part> + </message> + <portType name="CalculatorWS"> + <operation name="add"> + <input message="tns:add"></input> + <output message="tns:addResponse"></output> + </operation> + </portType> + <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS"> + <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"></wsp:PolicyReference> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding> + <operation name="add"> + + <soap:operation soapAction=""></soap:operation> + <input> + <soap:body use="literal"></soap:body> + </input> + <output> + <soap:body use="literal"></soap:body> + </output> + </operation> + </binding> + <service name="CalculatorWSService"> + <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"> + <soap:address location="http://127.0.0.1:8080/wsit-rm"></soap:address> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd =================================================================== --- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. --> -<xs:schema xmlns:tns="http://calculator.me.org/" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - version="1.0" - targetNamespace="http://calculator.me.org/"> - - <xs:element name="add" type="tns:add"></xs:element> - - <xs:element name="addResponse" type="tns:addResponse"></xs:element> - - <xs:complexType name="add"> - <xs:sequence> - <xs:element name="i" type="xs:int"></xs:element> - <xs:element name="j" type="xs:int"></xs:element> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="addResponse"> - <xs:sequence> - <xs:element name="return" type="xs:int"></xs:element> - </xs:sequence> - - </xs:complexType> -</xs:schema> \ No newline at end of file Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd) =================================================================== --- stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd (rev 0) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. --> +<xs:schema xmlns:tns="http://calculator.me.org/" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + version="1.0" + targetNamespace="http://calculator.me.org/"> + + <xs:element name="add" type="tns:add"></xs:element> + + <xs:element name="addResponse" type="tns:addResponse"></xs:element> + + <xs:complexType name="add"> + <xs:sequence> + <xs:element name="i" type="xs:int"></xs:element> + <xs:element name="j" type="xs:int"></xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="addResponse"> + <xs:sequence> + <xs:element name="return" type="xs:int"></xs:element> + </xs:sequence> + + </xs:complexType> +</xs:schema> \ No newline at end of file Deleted: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml =================================================================== --- stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml 2008-01-08 12:15:00 UTC (rev 5413) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="CalculatorWSService" targetNamespace="http://calculator.me.org/" xmlns:tns="http://calculator.me.org/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" -> - <message name="add"/> - <message name="addResponse"/> - <portType name="CalculatorWS"> - <operation name="add"> - <input message="tns:add"/> - <output message="tns:addResponse"/> - </operation> - </portType> - <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS"> - <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"/> - <operation name="add"> - <input/> - <output/> - </operation> - </binding> - <service name="CalculatorWSService"> - <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"/> - </service> - <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy"> - <wsp:ExactlyOne> - <wsp:All> - <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/> - <wsrm:RMAssertion/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> -</definitions> Copied: stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml (from rev 5413, stack/metro/branches/hbraun/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml) =================================================================== --- stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml (rev 0) +++ stack/metro/trunk/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml 2008-01-08 13:31:55 UTC (rev 5416) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="CalculatorWSService" targetNamespace="http://calculator.me.org/" xmlns:tns="http://calculator.me.org/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" +> + <message name="add"/> + <message name="addResponse"/> + <portType name="CalculatorWS"> + <operation name="add"> + <input message="tns:add"/> + <output message="tns:addResponse"/> + </operation> + </portType> + <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS"> + <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"/> + <operation name="add"> + <input/> + <output/> + </operation> + </binding> + <service name="CalculatorWSService"> + <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"/> + </service> + <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrm:RMAssertion/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-01-08 12:28:32 UTC (rev 5415) +++ stack/metro/trunk/version.properties 2008-01-08 13:31:55 UTC (rev 5416) @@ -28,7 +28,11 @@ sun-jaf=1.1 sun-jaxb=2.1.4 sun-jaxrpc=1.1 -sun-jaxws=2.1.1 +sun-jaxws=2.1.2 sun-servlet=2.5 ibm-wsdl4j=1.6.2 woodstox=3.1.1 + +xml-commons=1.2 +xml-sec=1.3 +sun-javamail=1.4