JBossWS SVN: r6736 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-04-29 03:57:47 -0400 (Tue, 29 Apr 2008)
New Revision: 6736
Modified:
stack/native/trunk/ant-import/build-bin-dist.xml
Log:
[JBWS-2028] Including projectGenerator test in binary distro
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-04-29 07:53:02 UTC (rev 6735)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-04-29 07:57:47 UTC (rev 6736)
@@ -91,8 +91,10 @@
<include name="etc/**"/>
<include name="java/**/jaxws/samples/**"/>
<include name="java/**/jaxws/smoke/**"/>
+ <include name="java/**/projectGenerator/**"/>
<include name="resources/jaxws/samples/**"/>
<include name="resources/jaxws/smoke/**"/>
+ <include name="resources/projectGenerator/**"/>
</fileset>
<fileset dir="${core.dir}/src/test">
<include name="resources/test-excludes-*.txt"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r6735 - in framework/trunk/testsuite/test/java/org/jboss/test/ws: projectGenerator and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-04-29 03:53:02 -0400 (Tue, 29 Apr 2008)
New Revision: 6735
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/
framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
Log:
[JBWS-2028] Adding test for the project generator
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/Endpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/Endpoint.java 2008-04-29 07:53:02 UTC (rev 6735)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.projectGenerator;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echoString", action = "urn:EchoString")
+ String echo(String input);
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-04-29 07:53:02 UTC (rev 6735)
@@ -0,0 +1,196 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.projectGenerator;
+
+//$Id$
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * A test case for the user project generator:
+ * - creates a user-project.properties file with the configuration (i.e. the output users get with the interactive setup-new-project Ant target)
+ * - calls the project generator (create-new-project Ant target)
+ * - writes a simple endpoint implementation in the project workspace
+ * - calls the deploy target of the generated build file
+ * - invokes the deployed simple endpoint
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 28-Apr-2008
+ */
+public class ProjectGeneratorTestCase extends JBossWSTest
+{
+ private String jbossHome;
+ private File workspaceHome;
+ private File binDistroDir;
+ private String projectName = "GeneratorTestProject";
+
+ private String endpointURL = "http://" + getServerHost() + ":8080/" + projectName + "/EndpointImpl";
+ private String targetNS = "http://projectGenerator.ws.test.jboss.org/";
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ jbossHome = System.getProperty("jboss.home");
+ workspaceHome = new File(".");
+ binDistroDir = new File("..");
+ }
+
+ public void testGenerator() throws Exception
+ {
+ if (!isDistroTest())
+ {
+ System.out.println("Skipping this test since it is meant to be run on binary distribution only.");
+ return;
+ }
+ File userPrjProp = new File(binDistroDir, "user-project.properties");
+ writeUserProjectProperties(userPrjProp);
+ File distroBuild = new File(binDistroDir, "build.sh");
+ assertStatusCode(executeCommand(distroBuild.getCanonicalPath() + " create-project"), "Error while creating the user project!");
+ File projectHomeDir = new File(workspaceHome, projectName);
+ File packageDir = new File(projectHomeDir.getCanonicalPath() + "/src/main/java/org/jboss/test/ws/projectGenerator");
+ packageDir.mkdirs();
+ File endpointImpl = new File(packageDir, "EndpointImpl.java");
+ writeEndpointImpl(endpointImpl);
+ File endpointInterface = new File(packageDir, "Endpoint.java");
+ writeEndpointInterface(endpointInterface);
+ File projectBuild = new File(projectHomeDir.getCanonicalPath(), "build.xml");
+ try
+ {
+ assertStatusCode(executeCommand("ant -f " + projectBuild + " deploy"), "Error while compiling / deploying the user project!");
+ //Sleeping 6 sec to let the deployment scanner pick up the user project jar
+ Thread.sleep(6000);
+ //Running the actual test
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+ finally
+ {
+ assertStatusCode(executeCommand("ant -f " + projectBuild + " undeploy"), "Error while undeploying the user project");
+ assertStatusCode(executeCommand(distroBuild.getCanonicalPath() + " delete-project"), "Error while deleting the user project");
+ userPrjProp.delete();
+ }
+ }
+
+ private void writeEndpointImpl(File file) throws Exception
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("package org.jboss.test.ws.projectGenerator;\n");
+ sb.append("import javax.jws.WebService;\n");
+ sb.append("import javax.ejb.Stateless;\n");
+ sb.append("import org.jboss.logging.Logger;\n");
+ sb.append("@Stateless\n");
+ sb.append("@WebService(name=\"Endpoint\", serviceName=\"EndpointService\", endpointInterface = \"org.jboss.test.ws.projectGenerator.Endpoint\")\n");
+ sb.append("public class EndpointImpl {\n");
+ sb.append(" private static Logger log = Logger.getLogger(EndpointImpl.class);\n");
+ sb.append(" public String echo(String input) {\n");
+ sb.append(" log.info(\"echo: \" + input);\n");
+ sb.append(" return input;\n");
+ sb.append(" }\n");
+ sb.append("}\n");
+ BufferedWriter out = new BufferedWriter(new FileWriter(file));
+ out.write(sb.toString());
+ out.close();
+ }
+
+ private void writeEndpointInterface(File file) throws Exception
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("package org.jboss.test.ws.projectGenerator;\n");
+ sb.append("import javax.jws.WebMethod;\n");
+ sb.append("import javax.jws.WebService;\n");
+ sb.append("import javax.jws.soap.SOAPBinding;\n");
+ sb.append("@WebService (name=\"Endpoint\")\n");
+ sb.append("@SOAPBinding(style = SOAPBinding.Style.RPC)\n");
+ sb.append("public interface Endpoint {\n");
+ sb.append(" @WebMethod(operationName = \"echoString\", action = \"urn:EchoString\")\n");
+ sb.append(" String echo(String input);\n");
+ sb.append("}\n");
+ BufferedWriter out = new BufferedWriter(new FileWriter(file));
+ out.write(sb.toString());
+ out.close();
+ }
+
+ private void writeUserProjectProperties(File file) throws Exception
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("#JBossWS user project generator test\n");
+ sb.append("project.name=" + projectName + "\n");
+ sb.append("project.jboss.home=" + jbossHome + "\n");
+ sb.append("project.type=jar\n");
+ sb.append("project.jboss.conf=default\n");
+ sb.append("workspace.home=" + workspaceHome.getCanonicalPath() + "\n");
+ BufferedWriter out = new BufferedWriter(new FileWriter(file));
+ out.write(sb.toString());
+ out.close();
+ }
+
+ private Process executeCommand(String command) throws IOException
+ {
+ // be verbose
+ System.out.println("cmd: " + command);
+
+ Process p = Runtime.getRuntime().exec(command);
+ return p;
+ }
+
+ private void assertStatusCode(Process p, String error) throws InterruptedException
+ {
+ // check status code
+ int status = p.waitFor();
+ assertTrue(error, status == 0);
+ }
+
+ private boolean isDistroTest() throws Exception
+ {
+ File build = new File("../build.sh");
+ if (!build.exists())
+ {
+ build = new File("../../build.sh");
+ }
+ if (!build.exists())
+ throw new Exception("Unable to find build.sh!");
+ Process p = executeCommand(build.getCanonicalPath() + " -p");
+ p.waitFor();
+ BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ if (line.contains("build-bin-dist"))
+ return false;
+ }
+ return true;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 8 months
- 1
- 0
JBossWS SVN: r6734 - stack/metro/branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 03:41:39 -0400 (Tue, 29 Apr 2008)
New Revision: 6734
Removed:
stack/metro/branches/tdiesler/src/
Log:
delete stuff
17 years, 8 months
- 1
- 0
JBossWS SVN: r6733 - stack/metro/branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 03:41:18 -0400 (Tue, 29 Apr 2008)
New Revision: 6733
Removed:
stack/metro/branches/tdiesler/tools/
stack/metro/branches/tdiesler/version.properties
Log:
delete stuff
Deleted: stack/metro/branches/tdiesler/version.properties
===================================================================
--- stack/metro/branches/tdiesler/version.properties 2008-04-29 07:40:37 UTC (rev 6732)
+++ stack/metro/branches/tdiesler/version.properties 2008-04-29 07:41:18 UTC (rev 6733)
@@ -1,47 +0,0 @@
-
-# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-3.0
-
-version.id=metro-3.0.2.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services - Sun Metro
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Dependend integration projects
-jbossws-spi=3.0.0-SNAPSHOT
-jbossws-common=3.0.0-SNAPSHOT
-jbossws-framework=3.0.2-SNAPSHOT
-
-jbossws-jboss422=3.0.0-SNAPSHOT
-jbossws-jboss423=3.0.0-SNAPSHOT
-jbossws-jboss500=3.0.0-SNAPSHOT
-jbossws-jboss501=3.0.0-SNAPSHOT
-
-junit=3.8.1
-jboss-common-core=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3Update1
-jboss-jaxr=1.2.0.GA
-jboss-security-spi=2.0.0.Beta
-sun-fi=1.2.2
-sun-jaf=1.1
-sun-jaxb=2.1.6
-sun-jaxrpc=1.1
-sun-jaxws=2.1.3
-sun-servlet=2.5
-stax-api=1.0
-ibm-wsdl4j=1.6.2
-woodstox=3.1.1
-
-xml-commons=1.2
-xml-sec=1.3
-sun-javamail=1.4
-
-# metro cvs
-metro.cvs.tag=metro1_1-release
17 years, 8 months
- 1
- 0
JBossWS SVN: r6732 - stack/metro/branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 03:40:37 -0400 (Tue, 29 Apr 2008)
New Revision: 6732
Removed:
stack/metro/branches/tdiesler/Metro-Branch.ipr
stack/metro/branches/tdiesler/ant-import-tests/
stack/metro/branches/tdiesler/ant-import/
stack/metro/branches/tdiesler/ant.properties.example
stack/metro/branches/tdiesler/build.bat
stack/metro/branches/tdiesler/build.sh
stack/metro/branches/tdiesler/build.xml
stack/metro/branches/tdiesler/metro-trunk.iml
Log:
delete stuff
Deleted: stack/metro/branches/tdiesler/Metro-Branch.ipr
===================================================================
--- stack/metro/branches/tdiesler/Metro-Branch.ipr 2008-04-29 07:39:31 UTC (rev 6731)
+++ stack/metro/branches/tdiesler/Metro-Branch.ipr 2008-04-29 07:40:37 UTC (rev 6732)
@@ -1,289 +0,0 @@
-<?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>
-
Deleted: stack/metro/branches/tdiesler/ant.properties.example
===================================================================
--- stack/metro/branches/tdiesler/ant.properties.example 2008-04-29 07:39:31 UTC (rev 6731)
+++ stack/metro/branches/tdiesler/ant.properties.example 2008-04-29 07:40:37 UTC (rev 6732)
@@ -1,57 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# Optional JBoss Home
-#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
-#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
-#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss422
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
-# Endpoint servlet used by test descriptors
-endpoint.servlet=org.jboss.wsf.stack.metro.EndpointServlet
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
-
-# Metro CVS access
-#
-# Go to the WSIT Membership page
-# https://wsit.dev.java.net/servlets/ProjectMemberList
-#
-# Login or register for an account. If you already have a java.net account, you may need to request additional permissions.
-# https://wsit.dev.java.net/servlets/ProjectMembershipRequest
-#
-# Login to CVS
-# cvs -d :pserver:yourid@cvs.dev.java.net:/cvs login
-#
-cvs.user=guest
Deleted: stack/metro/branches/tdiesler/build.bat
===================================================================
--- stack/metro/branches/tdiesler/build.bat 2008-04-29 07:39:31 UTC (rev 6731)
+++ stack/metro/branches/tdiesler/build.bat 2008-04-29 07:40:37 UTC (rev 6732)
@@ -1,101 +0,0 @@
-@echo off
-
-REM ======================================================================
-REM
-REM This is the main entry point for the build system.
-REM
-REM Users should be sure to execute this file rather than 'ant' to ensure
-REM the correct version is being used with the correct configuration.
-REM
-REM ======================================================================
-REM
-REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $
-
-REM ******************************************************
-REM Ignore the ANT_HOME variable: we want to use *our*
-REM ANT version and associated JARs.
-REM ******************************************************
-REM Ignore the users classpath, cause it might mess
-REM things up
-REM ******************************************************
-
-SETLOCAL
-
-set NOPAUSE=true
-set CLASSPATH=
-set ANT_HOME=
-
-set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat
-
-REM
-REM - "for" loops have been unrolled for compatibility
-REM with some WIN32 systems.
-REM ******************************************************
-
-set NAMES=tools\ant
-set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
-
-REM ******************************************************
-REM ********Save the command line arguments***************
-REM ******************************************************
-set BUILD_ARGS=%1
-if ""%1""=="""" goto completedArgs
-shift
-:processArg
-if ""%1""=="""" goto completedArgs
-set BUILD_ARGS=%BUILD_ARGS% %1
-shift
-goto processArg
-
-:completedArgs
-
-REM ******************************************************
-REM ******************************************************
-
-SET EXECUTED=FALSE
-for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ********* Search for names in the subfolders *********
-REM ******************************************************
-
-:subLoop
-for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ************ Test if ANT Batch file exists ***********
-REM ******************************************************
-
-:testIfExists
-if exist %1 call :BatchFound %1 %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ************** Batch file has been found *************
-REM ******************************************************
-
-:BatchFound
-if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS%
-set EXECUTED=TRUE
-
-goto :EOF
-
-REM ******************************************************
-REM ************* Execute Batch file only once ***********
-REM ******************************************************
-
-:ExecuteBatch
-echo Calling %1 %BUILD_ARGS%
-
-REM set ENDORSED=
-call %1 %BUILD_ARGS%
-
-:end
-
-if "%NOPAUSE%" == "" pause
-
Deleted: stack/metro/branches/tdiesler/build.sh
===================================================================
--- stack/metro/branches/tdiesler/build.sh 2008-04-29 07:39:31 UTC (rev 6731)
+++ stack/metro/branches/tdiesler/build.sh 2008-04-29 07:40:37 UTC (rev 6732)
@@ -1,169 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## This is the main entry point for the build system. ##
-## ##
-## Users should be sure to execute this file rather than 'ant' to ensure ##
-## the correct version is being used with the correct configuration. ##
-## ##
-## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
-## ##
-### ====================================================================== ###
-
-# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-GREP="grep"
-ROOT="/"
-
-# Ignore user's ANT_HOME if it is set
-ANT_HOME=""
-
-# the default search path for ant
-ANT_SEARCH_PATH="tools/ant"
-
-# the default build file name
-ANT_BUILD_FILE="build.xml"
-
-# the default arguments
-ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-esac
-
-#
-# Helper to complain.
-#
-die() {
- echo "${PROGNAME}: $*"
- exit 1
-}
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to source a file if it exists.
-#
-maybe_source() {
- for file in $*; do
- if [ -f "$file" ]; then
- . $file
- fi
- done
-}
-
-search() {
- search="$*"
- for d in $search; do
- ANT_HOME="`pwd`/$d"
- ANT="$ANT_HOME/bin/ant"
- if [ -x "$ANT" ]; then
- # found one
- echo $ANT_HOME
- break
- fi
- done
-}
-
-#
-# Main function.
-#
-main() {
- # if there is a build config file. then source it
- maybe_source "$DIRNAME/build.conf"
-
- # Increase the maximum file descriptors if we can
- if [ $cygwin = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
- fi
-
- # try the search path
- ANT_HOME=`search $ANT_SEARCH_PATH`
-
- # try looking up to root
- if [ "x$ANT_HOME" = "x" ]; then
- target="build"
- _cwd=`pwd`
-
- while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
- cd ..
- cwd=`pwd`
- ANT_HOME=`search $ANT_SEARCH_PATH`
- done
-
- # make sure we get back
- cd $_cwd
-
- if [ "$cwd" != "$ROOT" ]; then
- found="true"
- fi
-
- # complain if we did not find anything
- if [ "$found" != "true" ]; then
- die "Could not locate Ant; check \$ANT or \$ANT_HOME."
- fi
- fi
-
- # make sure we have one
- ANT=$ANT_HOME/bin/ant
- if [ ! -x "$ANT" ]; then
- die "Ant file is not executable: $ANT"
- fi
-
- # Set the max memory to 256m
- ANT_OPTS=-Xmx256m
-
- # Endorse JAXB, JAXWS API
- ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed"
-
- # setup some build properties
- ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
-
- # change to the directory where the script lives so users are not forced
- # to be in the same directory as build.xml
- cd $DIRNAME
-
- # export some stuff for ant
- export ANT ANT_HOME ANT_OPTS
-
- # run ant
- $ANT $ANT_OPTIONS "$@"
-}
-
-##
-## Bootstrap
-##
-
-main "$@"
Deleted: stack/metro/branches/tdiesler/build.xml
===================================================================
--- stack/metro/branches/tdiesler/build.xml 2008-04-29 07:39:31 UTC (rev 6731)
+++ stack/metro/branches/tdiesler/build.xml 2008-04-29 07:40:37 UTC (rev 6732)
@@ -1,275 +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 default="main" basedir="." name="JBossWS-Metro">
-
- <property name="stack.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-prepare-deploy.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"/>
- <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="stack.src.dir" value="${stack.dir}/src/main"/>
- <property name="stack.distro.dir" value="${stack.src.dir}/distro"/>
- <property name="stack.etc.dir" value="${stack.src.dir}/etc"/>
- <property name="stack.java.dir" value="${stack.src.dir}/java"/>
- <property name="stack.resources.dir" value="${stack.src.dir}/resources"/>
- <property name="stack.output.dir" value="${stack.dir}/output"/>
- <property name="stack.output.apidocs.dir" value="${stack.output.dir}/apidocs"/>
- <property name="stack.output.classes.dir" value="${stack.output.dir}/classes"/>
- <property name="stack.output.deploy.dir" value="${stack.output.dir}/deploy"/>
- <property name="stack.output.etc.dir" value="${stack.output.dir}/etc"/>
- <property name="stack.output.lib.dir" value="${stack.output.dir}/lib"/>
- <property name="stack.output.resources.dir" value="${stack.output.dir}/resources"/>
-
- <property name="deploy.artifacts.dir" value="${stack.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${stack.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${stack.output.deploy.dir}-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${stack.dir}/ant-import/jbossws-default-deploy.conf"/>
-
- <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty">
- </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,compile-resources" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-metro"/>
- <target name="compile-classes-metro" depends="init">
- <mkdir dir="${stack.output.classes.dir}"/>
- <javac srcdir="${stack.java.dir}" sourcepath="" destdir="${stack.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/metro/**"/>
- <classpath refid="stack.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${stack.output.etc.dir}"/>
- <copy todir="${stack.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${stack.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-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Compile resource files -->
-
- <!-- Compile resource files -->
- <target name="compile42-resources" if="jbossws.integration.jboss42">
-
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
-
- <!-- Concat jbossws-jboss422-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml">
- <header trimleading="yes">
- <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"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss423-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml">
- <header trimleading="yes">
- <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"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- </target>
-
- <target name="compile50-resources" if="jbossws.integration.jboss50">
-
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/>
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/>
-
- <!-- Concat jbossws-jboss500-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
- </target>
-
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
-
- <copy todir="${stack.output.resources.dir}">
- <fileset dir="${stack.resources.dir}">
- <include name="jbossws-metro.jar/**"/>
- <include name="jbossws-stack.sar/**"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile" description="Builds all jar files.">
-
- <!-- Build jbossws-metro.jar -->
- <mkdir dir="${stack.output.lib.dir}"/>
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/injection/**"/>
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/metadata/**"/>
- <include name="org/jboss/wsf/stack/metro/log/**"/>
- <include name="org/jboss/wsf/stack/metro/*"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro.jar/META-INF"/>
- </jar>
-
- <!-- jbossws-metro-client.jar -->
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro-client.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/tools/**"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro-client.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <copy todir="${stack.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${stack.resources.dir}/jbossws-context.war"/>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- <war warfile="${stack.output.lib.dir}/jbossws-context.war" webxml="${stack.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${stack.output.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws-metro-src.zip -->
- <zip zipfile="${stack.output.lib.dir}/jbossws-metro-src.zip">
- <fileset dir="${stack.java.dir}"/>
- </zip>
- </target>
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
-
- <!-- expand the metro sources -->
- <mkdir dir="${stack.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${stack.output.dir}/thirdparty-sources"/>
-
- <mkdir dir="${stack.output.apidocs.dir}"/>
- <javadoc destdir="${stack.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <pathelement path="${metro50.integration.classpath}"/>
- <pathelement path="${stack.integration.classpath}"/>
- </classpath>
-
- <packageset dir="${stack.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${stack.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="${stack.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${stack.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>
Deleted: stack/metro/branches/tdiesler/metro-trunk.iml
===================================================================
--- stack/metro/branches/tdiesler/metro-trunk.iml 2008-04-29 07:39:31 UTC (rev 6731)
+++ stack/metro/branches/tdiesler/metro-trunk.iml 2008-04-29 07:40:37 UTC (rev 6732)
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/jaxws-src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr250-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/sjsxp.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/wstx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr173_api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/saaj-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/stax-ex.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/FastInfoset.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module" module-name="framework" />
- <orderEntry type="module" module-name="spi" />
- <orderEntryProperties />
- </component>
-</module>
-
17 years, 8 months
- 1
- 0
JBossWS SVN: r6731 - stack/metro/branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 03:39:31 -0400 (Tue, 29 Apr 2008)
New Revision: 6731
Added:
stack/metro/branches/tdiesler/trunk/
Log:
Create userbranch
Copied: stack/metro/branches/tdiesler/trunk (from rev 6730, stack/metro/branches/tdiesler)
17 years, 8 months
- 1
- 0
JBossWS SVN: r6730 - stack/metro/branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 03:36:44 -0400 (Tue, 29 Apr 2008)
New Revision: 6730
Added:
stack/metro/branches/tdiesler/
Log:
Create userbranch
Copied: stack/metro/branches/tdiesler (from rev 6729, stack/metro/trunk)
17 years, 8 months
- 1
- 0
JBossWS SVN: r6729 - in stack/metro/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-28 16:23:02 -0400 (Mon, 28 Apr 2008)
New Revision: 6729
Modified:
stack/metro/trunk/ant-import-tests/build-testsuite.xml
stack/metro/trunk/ant-import/build-bin-dist.xml
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/ant-import/build-prepare-deploy.xml
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
stack/metro/trunk/build.xml
Log:
update metro build to use jbossws-jboss??? integration jars
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -19,7 +19,7 @@
<target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
- <property name="bindist.dir" value="${metro.output.dir}/jbossws-metro-dist"/>
+ <property name="bindist.dir" value="${stack.output.dir}/jbossws-metro-dist"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
<property name="bindist.deploy.dir" value="${bindist.dir}/deploy"/>
<property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
@@ -34,17 +34,17 @@
<mkdir dir="${bindist.tools.dir}"/>
<!-- root -->
- <copy tofile="${bindist.dir}/ant.properties.example" file="${metro.distro.dir}/ant.properties.example">
+ <copy tofile="${bindist.dir}/ant.properties.example" file="${stack.distro.dir}/ant.properties.example">
<filterset>
- <filtersfile file="${metro.dir}/ant.properties"/>
+ <filtersfile file="${stack.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/version.properties" file="${metro.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml" file="${metro.distro.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.dir}/version.properties" file="${stack.dir}/version.properties"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${stack.distro.dir}/bin-dist-build.xml"/>
<!-- build -->
<copy todir="${bindist.build.dir}">
- <fileset dir="${metro.dir}/ant-import">
+ <fileset dir="${stack.dir}/ant-import">
<include name="build-deploy.xml"/>
<include name="jbossws-deploy-macros.xml"/>
<include name="jbossws-default-deploy.conf"/>
@@ -58,29 +58,29 @@
<!-- docs -->
<copy todir="${bindist.docs.dir}">
- <fileset dir="${metro.output.dir}">
+ <fileset dir="${stack.output.dir}">
<include name="apidocs/**"/>
</fileset>
</copy>
<copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${metro.distro.dir}">
+ <fileset dir="${stack.distro.dir}">
<include name="Install.txt"/>
<include name="ReleaseNotes.txt"/>
</fileset>
<filterset>
- <filtersfile file="${metro.dir}/version.properties"/>
+ <filtersfile file="${stack.dir}/version.properties"/>
</filterset>
</copy>
<copy todir="${bindist.docs.dir}">
- <fileset dir="${metro.etc.dir}">
+ <fileset dir="${stack.etc.dir}">
<include name="JBossORG-EULA.txt"/>
</fileset>
</copy>
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${metro.dir}/src/test-framework">
+ <fileset dir="${stack.dir}/src/test-framework">
<include name="ant-import/build-testsuite.xml"/>
<include name="ant-import/build-samples-jaxws.xml"/>
<include name="etc/**"/>
@@ -89,7 +89,7 @@
<include name="resources/jaxws/samples/**"/>
<include name="resources/jaxws/smoke/**"/>
</fileset>
- <fileset dir="${metro.dir}/src/test">
+ <fileset dir="${stack.dir}/src/test">
<include name="resources/test-excludes-*.txt"/>
<include name="etc/log4j.xml"/>
</fileset>
@@ -97,18 +97,18 @@
<!-- build tools -->
<copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${metro.dir}/tools"/>
+ <fileset dir="${stack.dir}/tools"/>
</copy>
<copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${metro.dir}">
+ <fileset dir="${stack.dir}">
<include name="build.bat"/>
<include name="build.sh"/>
</fileset>
</copy>
<chmod file="${bindist.dir}/build.sh" perm="+x"/>
- <zip destfile="${metro.output.dir}/jbossws-${version.id}.zip">
- <fileset dir="${metro.output.dir}" includes="jbossws-metro-dist/**"/>
+ <zip destfile="${stack.output.dir}/jbossws-${version.id}.zip">
+ <fileset dir="${stack.output.dir}" includes="jbossws-metro-dist/**"/>
</zip>
</target>
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -21,8 +21,9 @@
<delete dir="${deploy.structure.jboss42}"/>
<antcall target="deploy-jbossws-metro42" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
- <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
+ <param name="resourcesdir" value="${deploy.artifacts.dir}/resources"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="jbossid" value="${deploy.target}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
</target>
@@ -31,6 +32,10 @@
<!-- Deployment JBoss422 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss422" depends="prepare">
+ <property name="deploy.target" value="jboss422"/>
+ </target>
+
<target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<copy todir="${jboss422.home}" overwrite="true">
@@ -40,7 +45,7 @@
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <target name="undeploy-jboss422" depends="deploy-target-jboss422" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss422.server.deploy}/juddi-service.sar"/>
@@ -50,6 +55,10 @@
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss423" depends="prepare">
+ <property name="deploy.target" value="jboss423"/>
+ </target>
+
<target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<copy todir="${jboss423.home}" overwrite="true">
@@ -59,7 +68,7 @@
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <target name="undeploy-jboss423" depends="deploy-target-jboss423" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss423.server.deploy}/juddi-service.sar"/>
@@ -74,6 +83,7 @@
<antcall target="deploy-jbossws-metro50" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="jbossid" value="${deploy.target}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/>
</target>
@@ -82,6 +92,10 @@
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss500" depends="prepare">
+ <property name="deploy.target" value="jboss500"/>
+ </target>
+
<target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
@@ -91,7 +105,7 @@
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
+ <target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
@@ -101,6 +115,10 @@
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss501" depends="prepare">
+ <property name="deploy.target" value="jboss501"/>
+ </target>
+
<target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
@@ -110,7 +128,7 @@
<chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -30,11 +30,15 @@
<patternset refid="jbossws.server.lib.patternset"/>
<patternset refid="jbossws.service.lib.patternset"/>
<include name="juddi-service.sar"/>
- <include name="jbossws-jboss50-container.jar"/>
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss421.jar"/>
+ <include name="jbossws-jboss422.jar"/>
+ <include name="jbossws-jboss423.jar"/>
+ <include name="jbossws-jboss500.jar"/>
+ <include name="jbossws-jboss501.jar"/>
+ <include name="jbossws-jboss500-container.jar"/>
+ <include name="jbossws-jboss501-container.jar"/>
</fileset>
- <fileset dir="${metro.output.lib.dir}">
+ <fileset dir="${stack.output.lib.dir}">
<patternset refid="jbossws.client.patternset"/>
<patternset refid="jbossws.lib.patternset"/>
<patternset refid="jbossws.lib.endorsed.patternset"/>
@@ -44,12 +48,10 @@
</fileset>
</copy>
<copy todir="${deploy.artifacts.dir}/resources">
- <fileset dir="${metro.output.resources.dir}">
- <include name="jbossws-metro42-beans.xml"/>
- <include name="jbossws-metro50-beans.xml"/>
- <include name="jbossws-jboss42.sar/**"/>
+ <fileset dir="${stack.output.resources.dir}">
+ <include name="jbossws-jboss*/**"/>
+ <include name="jbossws-deployer-beans.xml"/>
<include name="jbossws-metro.sar/**"/>
- <include name="jbossws-deployer-beans.xml"/>
</fileset>
</copy>
</target>
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -13,7 +13,7 @@
<project>
- <property file="${int.metro.dir}/version.properties"/>
+ <property file="${stack.dir}/version.properties"/>
<!-- ========= -->
<!-- Libraries -->
@@ -24,15 +24,15 @@
<target name="thirdparty-init" depends="prepare">
- <property name="glassfish.metro.dir" value="${int.metro.dir}/glassfish-metro"/>
- <available property="glassfish.metro.available" file="${glassfish.metro.dir}"/>
- <available property="jboss.wsit.rt.available" file="${metro.output.lib.dir}/jboss-wsit-rt.jar"/>
- <available property="jboss.wsit.tools.available" file="${metro.output.lib.dir}/jboss-wsit-tools.jar"/>
+ <property name="glassfish.stack.dir" value="${stack.dir}/glassfish-metro"/>
+ <available property="glassfish.stack.available" file="${glassfish.stack.dir}"/>
+ <available property="jboss.wsit.rt.available" file="${stack.output.lib.dir}/jboss-wsit-rt.jar"/>
+ <available property="jboss.wsit.tools.available" file="${stack.output.lib.dir}/jboss-wsit-tools.jar"/>
- <checksum file="${int.metro.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+ <checksum file="${stack.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<property name="checksum.ok.${checksum.ok}" value="true"/>
- <property name="thirdparty.dir" value="${int.metro.dir}/thirdparty"/>
+ <property name="thirdparty.dir" value="${stack.dir}/thirdparty"/>
<condition property="force.thirdparty.get">
<or>
<not>
@@ -104,13 +104,13 @@
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
- <checksum file="${int.metro.dir}/version.properties" fileext=".md5"/>
+ <checksum file="${stack.dir}/version.properties" fileext=".md5"/>
</target>
<target name="thirdparty-classpath" depends="thirdparty-get,metro-build">
<!-- The compile classpath for jboss50 integration -->
- <path id="metro.integration.classpath">
+ <path id="stack.integration.classpath">
<!--
A stack MUST NOT have a compile time dependency on framework
http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071
@@ -134,7 +134,7 @@
<!-- The compile classpath for jboss50 integration -->
<path id="metro50.integration.classpath">
- <path refid="metro.integration.classpath"/>
+ <path refid="stack.integration.classpath"/>
<pathelement location="${jboss500.server.lib}/jboss.jar"/>
</path>
@@ -144,75 +144,75 @@
<target name="metro-build" depends="metro-copy-jars" description="Build metro from source">
</target>
- <target name="metro-checkout-dir" depends="thirdparty-init" unless="glassfish.metro.available">
- <property name="metro.checkout.required" value="true"/>
- <echo message="metro.checkout.required=${metro.checkout.required}"/>
+ <target name="metro-checkout-dir" depends="thirdparty-init" unless="glassfish.stack.available">
+ <property name="stack.checkout.required" value="true"/>
+ <echo message="stack.checkout.required=${stack.checkout.required}"/>
</target>
- <target name="metro-checkout-required" depends="metro-checkout-dir" if="glassfish.metro.available">
- <available property="metro.checkout.available" file="${glassfish.metro.dir}/wsit/wsit/build.xml" type="file"/>
- <echo message="metro.checkout.available=${metro.checkout.available}"/>
+ <target name="metro-checkout-required" depends="metro-checkout-dir" if="glassfish.stack.available">
+ <available property="stack.checkout.available" file="${glassfish.stack.dir}/wsit/wsit/build.xml" type="file"/>
+ <echo message="stack.checkout.available=${stack.checkout.available}"/>
</target>
- <target name="metro-checkout" depends="metro-checkout-required" unless="metro.checkout.available">
- <echo message="cvs checkout -r${metro.cvs.tag}"/>
- <delete dir="${glassfish.metro.dir}"/>
- <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs" package="wsit/wsit" dest="${glassfish.metro.dir}" tag="${metro.cvs.tag}" failonerror="true"/>
+ <target name="metro-checkout" depends="metro-checkout-required" unless="stack.checkout.available">
+ <echo message="cvs checkout -r${stack.cvs.tag}"/>
+ <delete dir="${glassfish.stack.dir}"/>
+ <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs" package="wsit/wsit" dest="${glassfish.stack.dir}" tag="${stack.cvs.tag}" failonerror="true"/>
</target>
- <target name="metro-build-required" depends="metro-checkout-dir" if="glassfish.metro.available">
- <available property="metro.build.is.available" file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}" type="file"/>
+ <target name="metro-build-required" depends="metro-checkout-dir" if="glassfish.stack.available">
+ <available property="stack.build.is.available" file="${glassfish.stack.dir}/build-marker-${stack.cvs.tag}" type="file"/>
- <condition property="metro.build.available" value="true">
+ <condition property="stack.build.available" value="true">
<and>
- <equals arg1="${metro.build.is.available}" arg2="true"/>
+ <equals arg1="${stack.build.is.available}" arg2="true"/>
<not>
<equals arg1="${force.thirdparty.get}" arg2="true"/>
</not>
</and>
</condition>
- <echo message="*** metro.build.available=${metro.build.available} ***"/>
+ <echo message="*** stack.build.available=${stack.build.available} ***"/>
</target>
- <target name="metro-cvs-build" depends="metro-checkout,metro-build-required" unless="metro.build.available">
- <antbridge basedir="${glassfish.metro.dir}/wsit/wsit" target="main"/>
+ <target name="metro-cvs-build" depends="metro-checkout,metro-build-required" unless="stack.build.available">
+ <antbridge basedir="${glassfish.stack.dir}/wsit/wsit" target="main"/>
</target>
<target name="metro-runtime-jar" depends="metro-cvs-build" unless="jboss.wsit.rt.available">
- <antbridge basedir="${glassfish.metro.dir}/wsit/wsit" target="create-wsit-runtime-jar"/>
- <delete dir="${metro.output.lib.dir}/jboss-wsit-rt"/>
- <unzip src="${glassfish.metro.dir}/wsit/wsit/rt/build/wsit-rt.jar" dest="${metro.output.lib.dir}/jboss-wsit-rt"/>
- <move file="${metro.output.lib.dir}/jboss-wsit-rt/WEB-INF" todir="${metro.output.lib.dir}/jboss-wsit-rt/wsdl"/>
- <zip basedir="${metro.output.lib.dir}/jboss-wsit-rt" destfile="${metro.output.lib.dir}/jboss-wsit-rt.jar"/>
+ <antbridge basedir="${glassfish.stack.dir}/wsit/wsit" target="create-wsit-runtime-jar"/>
+ <delete dir="${stack.output.lib.dir}/jboss-wsit-rt"/>
+ <unzip src="${glassfish.stack.dir}/wsit/wsit/rt/build/wsit-rt.jar" dest="${stack.output.lib.dir}/jboss-wsit-rt"/>
+ <move file="${stack.output.lib.dir}/jboss-wsit-rt/WEB-INF" todir="${stack.output.lib.dir}/jboss-wsit-rt/wsdl"/>
+ <zip basedir="${stack.output.lib.dir}/jboss-wsit-rt" destfile="${stack.output.lib.dir}/jboss-wsit-rt.jar"/>
</target>
<target name="metro-tools-jar" depends="metro-cvs-build" unless="jboss.wsit.tools.available">
- <antbridge basedir="${glassfish.metro.dir}/wsit/wsit" target="create-wsit-tools-jar"/>
- <delete dir="${metro.output.lib.dir}/jboss-wsit-tools"/>
- <unzip src="${glassfish.metro.dir}/wsit/wsit/tools/build/wsit-tools.jar" dest="${metro.output.lib.dir}/jboss-wsit-tools"/>
- <copy todir="${metro.output.lib.dir}/jboss-wsit-tools/META-INF/services" overwrite="true" verbose="true">
- <fileset dir="${glassfish.metro.dir}/wsit/wsit/etc/META-INF/services">
+ <antbridge basedir="${glassfish.stack.dir}/wsit/wsit" target="create-wsit-tools-jar"/>
+ <delete dir="${stack.output.lib.dir}/jboss-wsit-tools"/>
+ <unzip src="${glassfish.stack.dir}/wsit/wsit/tools/build/wsit-tools.jar" dest="${stack.output.lib.dir}/jboss-wsit-tools"/>
+ <copy todir="${stack.output.lib.dir}/jboss-wsit-tools/META-INF/services" overwrite="true" verbose="true">
+ <fileset dir="${glassfish.stack.dir}/wsit/wsit/etc/META-INF/services">
<include name="*.TWSDLExtensionHandler"/>
</fileset>
</copy>
- <zip basedir="${metro.output.lib.dir}/jboss-wsit-tools" destfile="${metro.output.lib.dir}/jboss-wsit-tools.jar"/>
+ <zip basedir="${stack.output.lib.dir}/jboss-wsit-tools" destfile="${stack.output.lib.dir}/jboss-wsit-tools.jar"/>
</target>
<!-- Copy the metro jars -->
<target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar"
- unless="metro.build.available">
+ unless="stack.build.available">
<mkdir dir="${thirdparty.dir}"/>
- <property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>
+ <property name="lib.runtime.dir" value="${glassfish.stack.dir}/wsit/wsit/lib/runtime"/>
<!-- Verify the JAX-WS Implementation version -->
- <unjar src="${lib.runtime.dir}/jaxws-rt.jar" dest="${metro.output.lib.dir}/jaxws-rt" overwrite="true">
+ <unjar src="${lib.runtime.dir}/jaxws-rt.jar" dest="${stack.output.lib.dir}/jaxws-rt" overwrite="true">
<patternset>
<include name="META-INF/MANIFEST.MF"/>
</patternset>
</unjar>
- <loadfile property="jaxws.impl.version" srcfile="${metro.output.lib.dir}/jaxws-rt/META-INF/MANIFEST.MF">
+ <loadfile property="jaxws.impl.version" srcfile="${stack.output.lib.dir}/jaxws-rt/META-INF/MANIFEST.MF">
<filterchain>
<linecontains>
<contains value="Implementation-Version"/>
@@ -271,7 +271,7 @@
<copy file="${lib.runtime.dir}/resolver.jar" tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true" overwrite="false"/>
<!-- Touch the build marker -->
- <touch file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}"/>
+ <touch file="${glassfish.stack.dir}/build-marker-${stack.cvs.tag}"/>
</target>
<macrodef name="antbridge">
Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -90,7 +90,7 @@
<include name="**/mimepull.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
- <include name="**/sjsxp.jar"/>
+ <include name="**/sjsxp.jar"/>
<include name="**/stax-ex.jar"/>
<include name="**/stax-utils.jar"/>
<include name="**/streambuffer.jar"/>
@@ -153,49 +153,51 @@
</copy>
</sequential>
</macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-deployer-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deploy -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deploy50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss50-container.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
+
<!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -219,60 +221,50 @@
<macrodef name="macro-deploy-jbossws-client">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib">
+ <macrodef name="macro-deploy-jbossws-server-lib42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
- <macrodef name="macro-deploy-jbossws-server-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
-
+
+ <macrodef name="macro-deploy-jbossws-server-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
@@ -281,6 +273,7 @@
<attribute name="thirdpartydir"/>
<attribute name="resourcesdir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true">
@@ -300,12 +293,12 @@
</unzip>
<copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-metro42-beans.xml"/>
+ <include name="**/jbossws-(a){jbossid}-beans.xml"/>
</fileset>
</copy>
- <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-metro42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{resourcesdir}/META-INF"/>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-(a){jbossid}-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{resourcesdir}/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
</copy>
</sequential>
</macrodef>
@@ -313,6 +306,7 @@
<macrodef name="macro-deploy-jbossws-metro50-sar">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
@@ -326,12 +320,11 @@
<include name="**/jbossws-context.war"/>
</fileset>
</unzip>
- <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true">
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-metro50-beans.xml"/>
+ <include name="**/jbossws-(a){jbossid}-beans.xml"/>
</fileset>
</copy>
- <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-metro50-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
</sequential>
</macrodef>
@@ -343,23 +336,22 @@
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
<target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"
+ jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
@@ -377,14 +369,29 @@
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
- <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/>
- <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/>
- <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/>
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+ <!-- delete stale container integration jars -->
<delete>
- <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
</delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
<delete dir="@{targetdir}"/>
+
</sequential>
</macrodef>
Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -10,19 +10,19 @@
<project>
- <property name="tests.output.dir" value="${metro.dir}/output/tests"/>
+ <property name="tests.output.dir" value="${stack.dir}/output/tests"/>
- <import file="${metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
+ <import file="${stack.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="${metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile" value="${stack.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
- <property name="tests.dir" value="${metro.dir}/src/test"/>
+ <property name="tests.dir" value="${stack.dir}/src/test"/>
<property name="tests.java.dir" value="${tests.dir}/java"/>
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
- <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/>
+ <property name="tests.framework.dir" value="${stack.dir}/src/test-framework"/>
<property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/>
<!--
@@ -31,32 +31,32 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-tools.jar"/>
- <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-rt.jar"/>
+ <pathelement location="${stack.dir}/output/lib/jboss-wsit-tools.jar"/>
+ <pathelement location="${stack.dir}/output/lib/jboss-wsit-rt.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/http.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wsit-resolver.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/xws-security.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/xmlsec.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/FastInfoset.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/http.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/jaxws-rt.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/jaxws-tools.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/mimepull.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/sjsxp.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/stax-ex.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/wsdl4j.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/wsit-resolver.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/wstx.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/xws-security.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/xmlsec.jar"/>
</path>
<path id="tests.extra.classpath">
- <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
+ <pathelement location="${stack.dir}/output/lib/jbossws-metro-client.jar"/>
+ <pathelement location="${stack.dir}/thirdparty/jbossws-framework.jar"/>
</path>
</target>
@@ -84,8 +84,8 @@
<target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
<macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${stack.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${stack.dir}/src/test/java" excludesfile="${excludesfile}"/>
</target>
<!-- ================================================================== -->
@@ -94,15 +94,15 @@
<!-- Copy resources -->
<target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${metro.dir}/src/test-framework"/>
- <macro-copy-resources srcdir="${metro.dir}/src/test"/>
+ <macro-copy-resources srcdir="${stack.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${stack.dir}/src/test"/>
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${metro.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
- <ant antfile="${metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${metro.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ <ant antfile="${stack.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${stack.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ <ant antfile="${stack.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${stack.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-04-28 16:34:40 UTC (rev 6728)
+++ stack/metro/trunk/build.xml 2008-04-28 20:23:02 UTC (rev 6729)
@@ -13,7 +13,7 @@
<project default="main" basedir="." name="JBossWS-Metro">
- <property name="int.metro.dir" value="${basedir}"/>
+ <property name="stack.dir" value="${basedir}"/>
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
@@ -27,25 +27,24 @@
<!-- Setup -->
<!-- ================================================================== -->
- <property name="metro.dir" value="${int.metro.dir}"/>
- <property name="metro.src.dir" value="${metro.dir}/src/main"/>
- <property name="metro.distro.dir" value="${metro.src.dir}/distro"/>
- <property name="metro.etc.dir" value="${metro.src.dir}/etc"/>
- <property name="metro.java.dir" value="${metro.src.dir}/java"/>
- <property name="metro.resources.dir" value="${metro.src.dir}/resources"/>
- <property name="metro.output.dir" value="${metro.dir}/output"/>
- <property name="metro.output.apidocs.dir" value="${metro.output.dir}/apidocs"/>
- <property name="metro.output.classes.dir" value="${metro.output.dir}/classes"/>
- <property name="metro.output.deploy.dir" value="${metro.output.dir}/deploy"/>
- <property name="metro.output.etc.dir" value="${metro.output.dir}/etc"/>
- <property name="metro.output.lib.dir" value="${metro.output.dir}/lib"/>
- <property name="metro.output.resources.dir" value="${metro.output.dir}/resources"/>
+ <property name="stack.src.dir" value="${stack.dir}/src/main"/>
+ <property name="stack.distro.dir" value="${stack.src.dir}/distro"/>
+ <property name="stack.etc.dir" value="${stack.src.dir}/etc"/>
+ <property name="stack.java.dir" value="${stack.src.dir}/java"/>
+ <property name="stack.resources.dir" value="${stack.src.dir}/resources"/>
+ <property name="stack.output.dir" value="${stack.dir}/output"/>
+ <property name="stack.output.apidocs.dir" value="${stack.output.dir}/apidocs"/>
+ <property name="stack.output.classes.dir" value="${stack.output.dir}/classes"/>
+ <property name="stack.output.deploy.dir" value="${stack.output.dir}/deploy"/>
+ <property name="stack.output.etc.dir" value="${stack.output.dir}/etc"/>
+ <property name="stack.output.lib.dir" value="${stack.output.dir}/lib"/>
+ <property name="stack.output.resources.dir" value="${stack.output.dir}/resources"/>
- <property name="deploy.artifacts.dir" value="${metro.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${metro.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${metro.output.deploy.dir}-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${metro.dir}/ant-import/jbossws-default-deploy.conf"/>
-
+ <property name="deploy.artifacts.dir" value="${stack.output.deploy.dir}-artifacts"/>
+ <property name="deploy.structure.jboss42" value="${stack.output.deploy.dir}-jboss42"/>
+ <property name="deploy.structure.jboss50" value="${stack.output.deploy.dir}-jboss50"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.dir}/ant-import/jbossws-default-deploy.conf"/>
+
<import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
<!-- ================================================================== -->
@@ -72,19 +71,19 @@
<!-- Compile java sources -->
<target name="compile-classes" depends="compile-classes-metro"/>
<target name="compile-classes-metro" depends="init">
- <mkdir dir="${metro.output.classes.dir}"/>
- <javac srcdir="${metro.java.dir}" sourcepath="" destdir="${metro.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <mkdir dir="${stack.output.classes.dir}"/>
+ <javac srcdir="${stack.java.dir}" sourcepath="" destdir="${stack.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/metro/**"/>
- <classpath refid="metro.integration.classpath"/>
+ <classpath refid="stack.integration.classpath"/>
</javac>
</target>
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${metro.output.etc.dir}"/>
- <copy todir="${metro.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${metro.etc.dir}">
+ <mkdir dir="${stack.output.etc.dir}"/>
+ <copy todir="${stack.output.etc.dir}" filtering="yes" overwrite="true">
+ <fileset dir="${stack.etc.dir}">
<include name="component-info.xml"/>
<include name="default.mf"/>
</fileset>
@@ -93,54 +92,73 @@
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${int.metro.dir}/version.properties"/>
+ <filtersfile file="${stack.dir}/version.properties"/>
</filterset>
</copy>
</target>
<!-- Compile resource files -->
-
+
<!-- Compile resource files -->
- <target name="compile42-resources" if="jbossws.integration.jboss42">
- <mkdir dir="${metro.output.resources.dir}"/>
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml">
- <header trimleading="yes">
- <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">
- </header>
- <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- </target>
-
-
- <target name="compile50-resources" if="jbossws.integration.jboss50">
- <mkdir dir="${metro.output.resources.dir}"/>
- <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${metro.output.resources.dir}"/>
-
- <!-- Concat jbossws-native50-beans.xml -->
- <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
- </target>
-
+ <target name="compile42-resources" if="jbossws.integration.jboss42">
+
+ <unzip dest="${stack.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
+ <unzip dest="${stack.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
+
+ <!-- Concat jbossws-jboss422-beans.xml -->
+ <concat destfile="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml">
+ <header trimleading="yes">
+ <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"> </header>
+ <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
+ <fileset file="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss423-beans.xml -->
+ <concat destfile="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml">
+ <header trimleading="yes">
+ <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"> </header>
+ <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
+ <fileset file="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ </target>
+
+ <target name="compile50-resources" if="jbossws.integration.jboss50">
+
+ <unzip dest="${stack.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/>
+ <unzip dest="${stack.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/>
+
+ <!-- Concat jbossws-jboss500-beans.xml -->
+ <concat destfile="${stack.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss501-beans.xml -->
+ <concat destfile="${stack.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+ </target>
+
<target name="compile-resources" depends="init, compile42-resources, compile50-resources">
-
- <copy todir="${metro.output.resources.dir}">
- <fileset dir="${metro.resources.dir}">
+
+ <copy todir="${stack.output.resources.dir}">
+ <fileset dir="${stack.resources.dir}">
<include name="jbossws-metro.jar/**"/>
- <include name="jbossws-metro.sar/**"/>
+ <include name="jbossws-stack.sar/**"/>
</fileset>
</copy>
</target>
@@ -155,51 +173,50 @@
<target name="jars" depends="compile" description="Builds all jar files.">
<!-- Build jbossws-metro.jar -->
- <mkdir dir="${metro.output.lib.dir}"/>
- <jar jarfile="${metro.output.lib.dir}/jbossws-metro.jar" manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${metro.output.classes.dir}">
+ <mkdir dir="${stack.output.lib.dir}"/>
+ <jar jarfile="${stack.output.lib.dir}/jbossws-metro.jar" manifest="${stack.output.etc.dir}/default.mf">
+ <fileset dir="${stack.output.classes.dir}">
<include name="org/jboss/wsf/stack/metro/injection/**"/>
<include name="org/jboss/wsf/stack/metro/client/**"/>
<include name="org/jboss/wsf/stack/metro/metadata/**"/>
<include name="org/jboss/wsf/stack/metro/log/**"/>
<include name="org/jboss/wsf/stack/metro/*"/>
</fileset>
- <metainf dir="${metro.resources.dir}/jbossws-metro.jar/META-INF"/>
+ <metainf dir="${stack.resources.dir}/jbossws-metro.jar/META-INF"/>
</jar>
<!-- jbossws-metro-client.jar -->
- <jar jarfile="${metro.output.lib.dir}/jbossws-metro-client.jar" manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${metro.output.classes.dir}">
+ <jar jarfile="${stack.output.lib.dir}/jbossws-metro-client.jar" manifest="${stack.output.etc.dir}/default.mf">
+ <fileset dir="${stack.output.classes.dir}">
<include name="org/jboss/wsf/stack/metro/client/**"/>
<include name="org/jboss/wsf/stack/metro/tools/**"/>
</fileset>
- <metainf dir="${metro.resources.dir}/jbossws-metro-client.jar/META-INF"/>
+ <metainf dir="${stack.resources.dir}/jbossws-metro-client.jar/META-INF"/>
</jar>
<!-- Build jbossws-context.war -->
- <copy todir="${metro.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${metro.resources.dir}/jbossws-context.war"/>
+ <copy todir="${stack.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
+ <fileset dir="${stack.resources.dir}/jbossws-context.war"/>
<filterset>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${metro.dir}/version.properties"/>
+ <filtersfile file="${stack.dir}/version.properties"/>
</filterset>
</copy>
- <war warfile="${metro.output.lib.dir}/jbossws-context.war"
- webxml="${metro.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${metro.output.resources.dir}/jbossws-context.war">
+ <war warfile="${stack.output.lib.dir}/jbossws-context.war" webxml="${stack.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
+ manifest="${stack.output.etc.dir}/default.mf">
+ <fileset dir="${stack.output.resources.dir}/jbossws-context.war">
<include name="index.html"/>
<include name="styles.css"/>
</fileset>
- <webinf dir="${metro.output.resources.dir}/jbossws-context.war/WEB-INF">
+ <webinf dir="${stack.output.resources.dir}/jbossws-context.war/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
<!-- Build jbossws-metro-src.zip -->
- <zip zipfile="${metro.output.lib.dir}/jbossws-metro-src.zip">
- <fileset dir="${metro.java.dir}"/>
+ <zip zipfile="${stack.output.lib.dir}/jbossws-metro-src.zip">
+ <fileset dir="${stack.java.dir}"/>
</zip>
</target>
@@ -207,20 +224,20 @@
<target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
<!-- expand the metro sources -->
- <mkdir dir="${metro.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${metro.output.dir}/thirdparty-sources"/>
+ <mkdir dir="${stack.output.dir}/thirdparty-sources"/>
+ <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${stack.output.dir}/thirdparty-sources"/>
- <mkdir dir="${metro.output.apidocs.dir}"/>
- <javadoc destdir="${metro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <mkdir dir="${stack.output.apidocs.dir}"/>
+ <javadoc destdir="${stack.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath>
<pathelement path="${metro50.integration.classpath}"/>
- <pathelement path="${metro.integration.classpath}"/>
+ <pathelement path="${stack.integration.classpath}"/>
</classpath>
- <packageset dir="${metro.java.dir}" defaultexcludes="yes">
+ <packageset dir="${stack.java.dir}" defaultexcludes="yes">
<include name="org/jboss/wsf/**"/>
</packageset>
- <packageset dir="${metro.output.dir}/thirdparty-sources" defaultexcludes="yes">
+ <packageset dir="${stack.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="com/sun/**"/>
</packageset>
@@ -228,6 +245,7 @@
</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*"/>
@@ -241,11 +259,11 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${metro.output.dir}"/>
+ <delete dir="${stack.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.metro.dir}/thirdparty"/>
+ <delete dir="${stack.dir}/thirdparty"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
17 years, 8 months
- 1
- 0
JBossWS SVN: r6728 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-28 12:34:40 -0400 (Mon, 28 Apr 2008)
New Revision: 6728
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
Log:
[JBWS-2159] fixing NPE
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2008-04-28 14:50:43 UTC (rev 6727)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2008-04-28 16:34:40 UTC (rev 6728)
@@ -318,17 +318,22 @@
throw fault; // rethrow
}
- if (inv.getJavaMethod() != null)
+ try
{
- logger.debug("Invoking method: " + inv.getJavaMethod().getName());
- this.delegate.invoke(ep, inv);
+ if (inv.getJavaMethod() != null)
+ {
+ logger.debug("Invoking method: " + inv.getJavaMethod().getName());
+ this.delegate.invoke(ep, inv);
+ }
+ else
+ {
+ logger.debug("RM lifecycle protocol method detected");
+ }
}
- else
+ finally
{
- logger.debug("RM lifecycle protocol method detected");
+ setupResponseContext(rmResponseContext);
}
-
- setupResponseContext(rmResponseContext);
}
private void setupResponseContext(Map<String, Object> rmResponseContext)
17 years, 8 months
- 1
- 0
JBossWS SVN: r6727 - container/jboss50/branches/jbossws-jboss500.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-28 10:50:43 -0400 (Mon, 28 Apr 2008)
New Revision: 6727
Modified:
container/jboss50/branches/jbossws-jboss500/.project
Log:
fix project name
Modified: container/jboss50/branches/jbossws-jboss500/.project
===================================================================
--- container/jboss50/branches/jbossws-jboss500/.project 2008-04-28 14:41:20 UTC (rev 6726)
+++ container/jboss50/branches/jbossws-jboss500/.project 2008-04-28 14:50:43 UTC (rev 6727)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws-jboss501</name>
+ <name>jbossws-jboss500</name>
<comment></comment>
<projects>
</projects>
17 years, 8 months
- 1
- 0