JBossWS SVN: r4077 - trunk/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 02:43:23 -0400 (Thu, 02 Aug 2007)
New Revision: 4077
Modified:
trunk/build/ant-import/build-testsuite.xml
Log:
Add jbosssx.jar to as50 test client classpath
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-08-02 06:31:48 UTC (rev 4076)
+++ trunk/build/ant-import/build-testsuite.xml 2007-08-02 06:43:23 UTC (rev 4077)
@@ -150,6 +150,7 @@
<pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
17 years, 5 months
- 1
- 0
JBossWS SVN: r4076 - branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 02:31:48 -0400 (Thu, 02 Aug 2007)
New Revision: 4076
Added:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java
Log:
partial
Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java 2007-08-02 06:31:48 UTC (rev 4076)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParser;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 02-Aug-2007
+ */
+public class DefaultServiceRefMetaDataParserFactory implements ServiceRefMetaDataParserFactory
+{
+ public ServiceRefMetaDataParser getServiceRefMetaDataParser()
+ {
+ return new DefaultServiceRefMetaDataParser();
+ }
+}
17 years, 5 months
- 1
- 0
JBossWS SVN: r4075 - in branches/tdiesler/trunk: integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40 and 17 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 02:29:52 -0400 (Thu, 02 Aug 2007)
New Revision: 4075
Added:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java
Removed:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/
Modified:
branches/tdiesler/trunk/integration/jboss40/.classpath
branches/tdiesler/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
branches/tdiesler/trunk/integration/jboss42/.classpath
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java
branches/tdiesler/trunk/integration/jboss50/.classpath
branches/tdiesler/trunk/integration/native/.classpath
branches/tdiesler/trunk/integration/spi/.classpath
branches/tdiesler/trunk/integration/spi/build.xml
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
branches/tdiesler/trunk/integration/sunri/.classpath
branches/tdiesler/trunk/integration/xfire/.classpath
branches/tdiesler/trunk/jbossws-core/.classpath
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
branches/tdiesler/trunk/testsuite/.classpath
Log:
partial
Modified: branches/tdiesler/trunk/integration/jboss40/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss40/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/jboss40/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -11,5 +11,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -25,7 +25,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Thomas.Diesler(a)jboss.org
Modified: branches/tdiesler/trunk/integration/jboss42/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/jboss42/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -32,6 +32,6 @@
{
public static Kernel getKernel()
{
- return org.jboss.wsf.common.KernelLocator.getKernel();
+ return org.jboss.wsf.spi.util.KernelLocator.getKernel();
}
}
Modified: branches/tdiesler/trunk/integration/jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/jboss50/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/native/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/native/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/native/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/jbossws-core/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/spi/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/spi/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/spi/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -23,5 +23,6 @@
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/spi/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/build.xml 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/spi/build.xml 2007-08-02 06:29:52 UTC (rev 4075)
@@ -71,9 +71,6 @@
<mkdir dir="${spi.output.etc.dir}"/>
<copy todir="${spi.output.etc.dir}" filtering="yes">
<fileset dir="${spi.etc.dir}"/>
- <fileset dir="${spi.etc.dir}">
- <include name="default.mf"/>
- </fileset>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
@@ -99,11 +96,13 @@
-->
<target name="module-jars">
- <!-- Build jbossws-spi.jar -->
+ <!-- Build jbossws-framework.jar -->
<mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
+ <jar jarfile="${spi.output.lib.dir}/jbossws-framework.jar" manifest="${spi.output.etc.dir}/default.mf">
<fileset dir="${spi.output.classes.dir}">
- <include name="org/jboss/wsf/**"/>
+ <include name="org/jboss/wsf/common/**"/>
+ <include name="org/jboss/wsf/framework/**"/>
+ <include name="org/jboss/wsf/test/**"/>
</fileset>
</jar>
@@ -137,7 +136,6 @@
<javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath refid="spi.thirdparty.classpath"/>
<packageset dir="${spi.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
<include name="org/jboss/wsf/**"/>
</packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -24,7 +24,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Heiko.Braun(a)jboss.com
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
-
-import org.jboss.kernel.Kernel;
-
-/**
- * Locate the single instance of the kernel
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class KernelLocator
-{
- private static Kernel kernel;
-
- public static Kernel getKernel()
- {
- return KernelLocator.kernel;
- }
-
- public void setKernel(Kernel kernel)
- {
- KernelLocator.kernel = kernel;
- }
-}
Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -1,251 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Properties;
-
-// $Id$
-
-/**
- * Load a service class using this ordered lookup procedure
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 14-Dec-2006
- */
-public abstract class ServiceLoader
-{
- /**
- * This method uses the algorithm below using the JAXWS Provider as an example.
- *
- * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
- * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
- *
- * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
- * java.util.Properties.load(InputStream) method and it contains an entry whose key is
- * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
- *
- * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
- * as the name of the implementation class.
- *
- * 4. Finally, a default implementation class name is used.
- */
- public static Object loadService(String propertyName, String defaultFactory)
- {
- Object factory = loadFromServices(propertyName, null);
- if (factory == null)
- {
- factory = loadFromPropertiesFile(propertyName, null);
- }
- if (factory == null)
- {
- factory = loadFromSystemProperty(propertyName, defaultFactory);
- }
- return factory;
- }
-
- /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- */
- public static Object loadFromServices(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- String filename = "META-INF/services/" + propertyName;
- InputStream inStream = loader.getResourceAsStream(filename);
- if (inStream != null)
- {
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- if (factoryName != null)
- {
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /** Use the system property
- */
- public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- PrivilegedAction action = new PropertyAccessAction(propertyName);
- String factoryName = (String)AccessController.doPrivileged(action);
- if (factoryName != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /**
- * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory.
- * This configuration file is in standard java.util.Properties format and contains the
- * fully qualified name of the implementation class with the key being the system property defined above.
- */
- public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the properties file "lib/jaxm.properties" in the JRE directory.
- // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
- PrivilegedAction action = new PropertyAccessAction("java.home");
- String javaHome = (String)AccessController.doPrivileged(action);
- File jaxmFile = new File(javaHome + "/lib/jaxws.properties");
- if (jaxmFile.exists())
- {
- try
- {
- action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
- Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
- factoryName = jaxmProperties.getProperty(propertyName);
- if (factoryName != null)
- {
- //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- private static Object loadDefault(String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the default factory implementation class.
- if (defaultFactory != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
- Class factoryClass = loader.loadClass(defaultFactory);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load: " + defaultFactory, t);
- }
- }
-
- return factory;
- }
-
- private static class PropertyAccessAction implements PrivilegedAction
- {
- private String name;
-
- PropertyAccessAction(String name)
- {
- this.name = name;
- }
-
- public Object run()
- {
- return System.getProperty(name);
- }
- }
-
- private static class PropertyFileAccessAction implements PrivilegedAction
- {
- private String filename;
-
- PropertyFileAccessAction(String filename)
- {
- this.filename = filename;
- }
-
- public Object run()
- {
- try
- {
- InputStream inStream = new FileInputStream(filename);
- Properties props = new Properties();
- props.load(inStream);
- return props;
- }
- catch (IOException ex)
- {
- throw new SecurityException("Cannot load properties: " + filename, ex);
- }
- }
- }
-}
Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -22,7 +22,6 @@
package org.jboss.wsf.framework;
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.ServiceLoader;
import org.jboss.wsf.framework.deployment.DefaultDeploymentAspectManagerFactory;
import org.jboss.wsf.framework.deployment.DefaultDeploymentModelFactory;
import org.jboss.wsf.framework.deployment.DefaultLifecycleHandlerFactory;
@@ -31,6 +30,7 @@
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandler;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
+import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
@@ -46,8 +46,10 @@
import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* @author Heiko.Braun(a)jboss.com
@@ -106,6 +108,10 @@
{
returnType = (T)loadService(spiType, DefaultServiceRefHandlerFactory.class.getName());
}
+ else if (ServiceRefMetaDataParserFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultServiceRefMetaDataParserFactory.class.getName());
+ }
// SPI provided by either container or stack integration
Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java (rev 0)
+++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -0,0 +1,256 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParser;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+import org.jboss.xb.QNameBuilder;
+import org.w3c.dom.Element;
+
+/**
+ * The metdata data from service-ref element in web.xml, ejb-jar.xml, and
+ * application-client.xml.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class DefaultServiceRefMetaDataParser implements ServiceRefMetaDataParser
+{
+ private static final Logger log = Logger.getLogger(DefaultServiceRefMetaDataParser.class);
+
+ public void importStandardXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setServiceRefName(getElementContent(root, "service-ref-name"));
+ sref.setServiceInterface(getOptionalElementContent(root, "service-interface"));
+ sref.setWsdlFile(getOptionalElementContent(root, "wsdl-file"));
+ sref.setMappingFile(getOptionalElementContent(root, "jaxrpc-mapping-file"));
+
+ Element child = DOMUtils.getFirstChildElement(root, "service-qname");
+ if (child != null)
+ sref.setServiceQName(QNameBuilder.buildQName(child, getTextContent(child)));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ UnifiedPortComponentRefMetaData pcrefMetaData = new UnifiedPortComponentRefMetaData(sref);
+ pcrefMetaData.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcrefMetaData);
+ }
+
+ // Parse the handler elements
+ iterator = DOMUtils.getChildElements(root, "handler");
+ while (iterator.hasNext())
+ {
+ Element handlerElement = (Element)iterator.next();
+ UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
+ handlerMetaData.importStandardXml(handlerElement);
+ sref.addHandler(handlerMetaData);
+ }
+ }
+
+ public void importJBossXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setConfigName(getOptionalElementContent(root, "config-name"));
+ sref.setConfigFile(getOptionalElementContent(root, "config-file"));
+ sref.setWsdlOverride(getOptionalElementContent(root, "wsdl-override"));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
+ QName portName = getOptionalElementContentAsQName(pcrefElement, "port-qname");
+
+ UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName);
+ if (pcref == null && seiName != null)
+ {
+ // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
+ // if it has at least a SEI declared
+ pcref = new UnifiedPortComponentRefMetaData(sref);
+ pcref.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcref);
+ }
+
+ if (pcref != null)
+ pcref.importJBossXml(pcrefElement);
+ }
+
+ // Parse the call-property elements
+ iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ sref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+
+ public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
+ pcref.setPortComponentLink(getOptionalElementContent(root, "port-component-link"));
+ }
+
+ public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ // Look for call-property elements
+ Iterator iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ pcref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+
+ // Look for stub-property elements
+ iterator = DOMUtils.getChildElements(root, "stub-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ UnifiedStubPropertyMetaData propMetaData = new UnifiedStubPropertyMetaData();
+ propMetaData.setPropName(name);
+ propMetaData.setPropValue(value);
+ pcref.addStubProperty(propMetaData);
+ }
+
+ // portQName
+ QName portQName = getOptionalElementContentAsQName(root, "port-qname");
+ if (portQName != null)
+ pcref.setPortQName(portQName);
+
+ // config
+ Element configName = DOMUtils.getFirstChildElement(root, "config-name");
+ if (configName != null)
+ pcref.setConfigName(getTextContent(configName));
+
+ Element configFile = DOMUtils.getFirstChildElement(root, "config-file");
+ if (configFile != null)
+ pcref.setConfigFile(getTextContent(configFile));
+
+ // service-endpoint-interface
+ Element sei = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
+ if (sei != null)
+ pcref.setServiceEndpointInterface(getTextContent(sei));
+
+ }
+
+ public void importStandardXml(Element root, UnifiedHandlerMetaData href)
+ {
+ href.setHandlerName(getElementContent(root, "handler-name"));
+ href.setHandlerClass(getElementContent(root, "handler-class"));
+
+ // Parse the init-param elements
+ Iterator iterator = DOMUtils.getChildElements(root, "init-param");
+ while (iterator.hasNext())
+ {
+ Element paramElement = (Element)iterator.next();
+ UnifiedInitParamMetaData param = new UnifiedInitParamMetaData();
+ param.setParamName(getElementContent(paramElement, "param-name"));
+ param.setParamValue(getElementContent(paramElement, "param-value"));
+ href.addInitParam(param);
+ }
+
+ // Parse the soap-header elements
+ iterator = DOMUtils.getChildElements(root, "soap-header");
+ while (iterator.hasNext())
+ {
+ Element headerElement = (Element)iterator.next();
+ String content = getTextContent(headerElement);
+ QName qname = DOMUtils.resolveQName(headerElement, content);
+ href.addSoapHeader(qname);
+ }
+
+ // Parse the soap-role elements
+ iterator = DOMUtils.getChildElements(root, "soap-role");
+ while (iterator.hasNext())
+ {
+ Element roleElement = (Element)iterator.next();
+ String content = getTextContent(roleElement);
+ href.addSoapRole(content);
+ }
+
+ // Parse the port-name elements
+ iterator = DOMUtils.getChildElements(root, "port-name");
+ while (iterator.hasNext())
+ {
+ Element portElement = (Element)iterator.next();
+ String content = getTextContent(portElement);
+ href.addPortName(content);
+ }
+ }
+
+ private String getElementContent(Element element, String childName)
+ {
+ String childValue = getOptionalElementContent(element, childName);
+ if (childValue == null || childValue.length() == 0)
+ throw new IllegalStateException("Invalid null element content: " + childName);
+
+ return childValue;
+ }
+
+ private String getOptionalElementContent(Element element, String childName)
+ {
+ return getTextContent(DOMUtils.getFirstChildElement(element, childName));
+ }
+
+ private QName getOptionalElementContentAsQName(Element element, String childName)
+ {
+ QName qname = null;
+ String value = getOptionalElementContent(element, childName);
+ if (value != null)
+ {
+ qname = (value.startsWith("{") ? QName.valueOf(value) : DOMUtils.resolveQName(element, value));
+ }
+ return qname;
+ }
+
+ private String getTextContent(Element element)
+ {
+ String content = null;
+ if (element != null)
+ {
+ content = DOMUtils.getTextContent(element);
+ if (content != null)
+ content = content.trim();
+ }
+ return content;
+ }
+}
Modified: branches/tdiesler/trunk/integration/sunri/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/sunri/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/sunri/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -24,5 +24,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/xfire/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/xfire/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/integration/xfire/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -19,5 +19,6 @@
<classpathentry kind="lib" path="thirdparty/spring-beans.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-core.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-web.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-core/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws-core/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/jbossws-core/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -37,5 +37,6 @@
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -22,7 +22,7 @@
package org.jboss.ws.core.jaxws;
import org.jboss.ws.WSException;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import javax.xml.bind.JAXBContext;
@@ -41,7 +41,7 @@
public abstract JAXBContext createContext(Class clazz) throws WSException;
/**
- * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.common.ServiceLoader}.
+ * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.spi.util.ServiceLoader}.
* Defaults to {@link CustomizableJAXBContextFactory}
* @return JAXBContextFactory
*/
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -47,7 +47,7 @@
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Element;
/**
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -45,8 +45,8 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
-import org.jboss.wsf.common.ServiceLoader;
import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* MessageFactory implementation
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-08-02 06:29:52 UTC (rev 4075)
@@ -2,7 +2,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Heiko Braun, <heiko(a)openj.net>
Modified: branches/tdiesler/trunk/testsuite/.classpath
===================================================================
--- branches/tdiesler/trunk/testsuite/.classpath 2007-08-02 06:26:38 UTC (rev 4074)
+++ branches/tdiesler/trunk/testsuite/.classpath 2007-08-02 06:29:52 UTC (rev 4075)
@@ -15,5 +15,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/wsdl4j.jar" sourcepath="/integration-spi/thirdparty/wsdl4j-src.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years, 5 months
- 1
- 0
JBossWS SVN: r4074 - branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 02:26:38 -0400 (Thu, 02 Aug 2007)
New Revision: 4074
Added:
branches/tdiesler/trunk/
Log:
Recreate userbranch
Copied: branches/tdiesler/trunk (from rev 4073, trunk)
17 years, 5 months
- 1
- 0
JBossWS SVN: r4073 - branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 02:26:08 -0400 (Thu, 02 Aug 2007)
New Revision: 4073
Removed:
branches/tdiesler/trunk/
Log:
Recreate userbranch
17 years, 5 months
- 1
- 0
JBossWS SVN: r4072 - in spi/trunk/src/main/java/org/jboss/wsf: spi and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 02:24:26 -0400 (Thu, 02 Aug 2007)
New Revision: 4072
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/util/
spi/trunk/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java
spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
Removed:
spi/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
spi/trunk/src/main/java/org/jboss/wsf/common/KernelLocator.java
spi/trunk/src/main/java/org/jboss/wsf/common/ServiceLoader.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java
Log:
Remove unwanted classes
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -1,619 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-// $Id$
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.jboss.logging.Logger;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * DOM2 utilites
- *
- * @author Thomas.Diesler(a)jboss.org
- */
-public final class DOMUtils
-{
- private static Logger log = Logger.getLogger(DOMUtils.class);
-
- // All elements created by the same thread are created by the same builder and belong to the same doc
- private static ThreadLocal documentThreadLocal = new ThreadLocal();
- private static ThreadLocal builderThreadLocal = new ThreadLocal()
- {
- protected Object initialValue()
- {
- try
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setValidating(false);
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- setEntityResolver(builder);
- return builder;
- }
- catch (ParserConfigurationException e)
- {
- throw new RuntimeException("Failed to create DocumentBuilder", e);
- }
- }
-
- private void setEntityResolver(DocumentBuilder builder)
- {
- String[] resolvers = new String[] { "org.jboss.ws.core.utils.JBossWSEntityResolver", "org.jboss.util.xml.JBossEntityResolver" };
-
- EntityResolver entityResolver = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for (String resolver : resolvers)
- {
- try
- {
- Class<?> resolverClass = loader.loadClass(resolver);
- entityResolver = (EntityResolver)resolverClass.newInstance();
- }
- catch (Exception ex)
- {
- log.debug("Cannot load: " + resolver);
- }
- }
-
- if (entityResolver != null)
- builder.setEntityResolver(entityResolver);
- }
- };
-
- // Hide the constructor
- private DOMUtils()
- {
- }
-
- /** Initialise the the DocumentBuilder
- */
- public static DocumentBuilder getDocumentBuilder()
- {
- DocumentBuilder builder = (DocumentBuilder)builderThreadLocal.get();
- return builder;
- }
-
- /** Parse the given XML string and return the root Element
- */
- public static Element parse(String xmlString) throws IOException
- {
- try
- {
- return parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
- }
- catch (IOException e)
- {
- log.error("Cannot parse: " + xmlString);
- throw e;
- }
- }
-
- /** Parse the given XML stream and return the root Element
- */
- public static Element parse(InputStream xmlStream) throws IOException
- {
- try
- {
- Document doc = getDocumentBuilder().parse(xmlStream);
- Element root = doc.getDocumentElement();
- return root;
- }
- catch (SAXException e)
- {
- throw new IOException(e.toString());
- }
- }
-
- /** Parse the given input source and return the root Element
- */
- public static Element parse(InputSource source) throws IOException
- {
- try
- {
- Document doc = getDocumentBuilder().parse(source);
- Element root = doc.getDocumentElement();
- return root;
- }
- catch (SAXException e)
- {
- throw new IOException(e.toString());
- }
- }
-
- /** Create an Element for a given name
- */
- public static Element createElement(String localPart)
- {
- Document doc = getOwnerDocument();
- log.trace("createElement {}" + localPart);
- return doc.createElement(localPart);
- }
-
- /** Create an Element for a given name and prefix
- */
- public static Element createElement(String localPart, String prefix)
- {
- Document doc = getOwnerDocument();
- log.trace("createElement {}" + prefix + ":" + localPart);
- return doc.createElement(prefix + ":" + localPart);
- }
-
- /** Create an Element for a given name, prefix and uri
- */
- public static Element createElement(String localPart, String prefix, String uri)
- {
- Document doc = getOwnerDocument();
- if (prefix == null || prefix.length() == 0)
- {
- log.trace("createElement {" + uri + "}" + localPart);
- return doc.createElementNS(uri, localPart);
- }
- else
- {
- log.trace("createElement {" + uri + "}" + prefix + ":" + localPart);
- return doc.createElementNS(uri, prefix + ":" + localPart);
- }
- }
-
- /** Create an Element for a given QName
- */
- public static Element createElement(QName qname)
- {
- return createElement(qname.getLocalPart(), qname.getPrefix(), qname.getNamespaceURI());
- }
-
- /** Create a org.w3c.dom.Text node
- */
- public static Text createTextNode(String value)
- {
- Document doc = getOwnerDocument();
- return doc.createTextNode(value);
- }
-
- /** Get the qname of the given node.
- */
- public static QName getElementQName(Element el)
- {
- String qualifiedName = el.getNodeName();
- return resolveQName(el, qualifiedName);
- }
-
- /** Transform the given qualified name into a QName
- */
- public static QName resolveQName(Element el, String qualifiedName)
- {
- QName qname;
- String prefix = "";
- String namespaceURI = "";
- String localPart = qualifiedName;
-
- int colIndex = qualifiedName.indexOf(":");
- if (colIndex > 0)
- {
- prefix = qualifiedName.substring(0, colIndex);
- localPart = qualifiedName.substring(colIndex + 1);
-
- if ("xmlns".equals(prefix))
- {
- namespaceURI = "URI:XML_PREDEFINED_NAMESPACE";
- }
- else
- {
- Element nsElement = el;
- while (namespaceURI.equals("") && nsElement != null)
- {
- namespaceURI = nsElement.getAttribute("xmlns:" + prefix);
- if (namespaceURI.equals(""))
- nsElement = getParentElement(nsElement);
- }
- }
-
- if (namespaceURI.equals(""))
- throw new IllegalArgumentException("Cannot find namespace uri for: " + qualifiedName);
- }
- else
- {
- Element nsElement = el;
- while (namespaceURI.equals("") && nsElement != null)
- {
- namespaceURI = nsElement.getAttribute("xmlns");
- if (namespaceURI.equals(""))
- nsElement = getParentElement(nsElement);
- }
- }
-
- qname = new QName(namespaceURI, localPart, prefix);
- return qname;
- }
-
- /** Get the value from the given attribute
- *
- * @return null if the attribute value is empty or the attribute is not present
- */
- public static String getAttributeValue(Element el, String attrName)
- {
- return getAttributeValue(el, new QName(attrName));
- }
-
- /** Get the value from the given attribute
- *
- * @return null if the attribute value is empty or the attribute is not present
- */
- public static String getAttributeValue(Element el, QName attrName)
- {
- String attr = null;
- if ("".equals(attrName.getNamespaceURI()))
- attr = el.getAttribute(attrName.getLocalPart());
- else attr = el.getAttributeNS(attrName.getNamespaceURI(), attrName.getLocalPart());
-
- if ("".equals(attr))
- attr = null;
-
- return attr;
- }
-
- /** Get the qname value from the given attribute
- */
- public static QName getAttributeValueAsQName(Element el, String attrName)
- {
- return getAttributeValueAsQName(el, new QName(attrName));
-
- }
-
- /** Get the qname value from the given attribute
- */
- public static QName getAttributeValueAsQName(Element el, QName attrName)
- {
- QName qname = null;
-
- String qualifiedName = getAttributeValue(el, attrName);
- if (qualifiedName != null)
- {
- qname = resolveQName(el, qualifiedName);
- }
-
- return qname;
- }
-
- /** Get the boolean value from the given attribute
- */
- public static boolean getAttributeValueAsBoolean(Element el, String attrName)
- {
- return getAttributeValueAsBoolean(el, new QName(attrName));
- }
-
- /** Get the boolean value from the given attribute
- */
- public static boolean getAttributeValueAsBoolean(Element el, QName attrName)
- {
- String attrVal = getAttributeValue(el, attrName);
- boolean ret = "true".equalsIgnoreCase(attrVal) || "1".equalsIgnoreCase(attrVal);
- return ret;
- }
-
- /** Get the integer value from the given attribute
- */
- public static Integer getAttributeValueAsInteger(Element el, String attrName)
- {
- return getAttributeValueAsInteger(el, new QName(attrName));
- }
-
- /** Get the integer value from the given attribute
- */
- public static Integer getAttributeValueAsInteger(Element el, QName attrName)
- {
- String attrVal = getAttributeValue(el, attrName);
- return (attrVal != null ? new Integer(attrVal) : null);
- }
-
- /** Get the attributes as Map<QName, String>
- */
- public static Map getAttributes(Element el)
- {
- Map attmap = new HashMap();
- NamedNodeMap attribs = el.getAttributes();
- for (int i = 0; i < attribs.getLength(); i++)
- {
- Attr attr = (Attr)attribs.item(i);
- String name = attr.getName();
- QName qname = resolveQName(el, name);
- String value = attr.getNodeValue();
- attmap.put(qname, value);
- }
- return attmap;
- }
-
- /** Copy attributes between elements
- */
- public static void copyAttributes(Element destElement, Element srcElement)
- {
- NamedNodeMap attribs = srcElement.getAttributes();
- for (int i = 0; i < attribs.getLength(); i++)
- {
- Attr attr = (Attr)attribs.item(i);
- String uri = attr.getNamespaceURI();
- String qname = attr.getName();
- String value = attr.getNodeValue();
-
- // Prevent DOMException: NAMESPACE_ERR: An attempt is made to create or
- // change an object in a way which is incorrect with regard to namespaces.
- if (uri == null && qname.startsWith("xmlns"))
- {
- log.trace("Ignore attribute: [uri=" + uri + ",qname=" + qname + ",value=" + value + "]");
- }
- else
- {
- destElement.setAttributeNS(uri, qname, value);
- }
- }
- }
-
- /** True if the node has child elements
- */
- public static boolean hasChildElements(Node node)
- {
- NodeList nlist = node.getChildNodes();
- for (int i = 0; i < nlist.getLength(); i++)
- {
- Node child = nlist.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- return true;
- }
- return false;
- }
-
- /** Gets child elements
- */
- public static Iterator getChildElements(Node node)
- {
- ArrayList list = new ArrayList();
- NodeList nlist = node.getChildNodes();
- for (int i = 0; i < nlist.getLength(); i++)
- {
- Node child = nlist.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- list.add(child);
- }
- return list.iterator();
- }
-
- /** Get the concatenated text content, or null.
- */
- public static String getTextContent(Node node)
- {
- boolean hasTextContent = false;
- StringBuffer buffer = new StringBuffer();
- NodeList nlist = node.getChildNodes();
- for (int i = 0; i < nlist.getLength(); i++)
- {
- Node child = nlist.item(i);
- if (child.getNodeType() == Node.TEXT_NODE)
- {
- buffer.append(child.getNodeValue());
- hasTextContent = true;
- }
- }
- return (hasTextContent ? buffer.toString() : null);
- }
-
- /** Gets the first child element
- */
- public static Element getFirstChildElement(Node node)
- {
- return getFirstChildElementIntern(node, null);
- }
-
- /** Gets the first child element for a given local name without namespace
- */
- public static Element getFirstChildElement(Node node, String nodeName)
- {
- return getFirstChildElementIntern(node, new QName(nodeName));
- }
-
- /** Gets the first child element for a given qname
- */
- public static Element getFirstChildElement(Node node, QName nodeName)
- {
- return getFirstChildElementIntern(node, nodeName);
- }
-
- private static Element getFirstChildElementIntern(Node node, QName nodeName)
- {
- Element childElement = null;
- Iterator it = getChildElementsIntern(node, nodeName);
- if (it.hasNext())
- {
- childElement = (Element)it.next();
- }
- return childElement;
- }
-
- /** Gets the child elements for a given local name without namespace
- */
- public static Iterator getChildElements(Node node, String nodeName)
- {
- return getChildElementsIntern(node, new QName(nodeName));
- }
-
- /** Gets the child element for a given qname
- */
- public static Iterator getChildElements(Node node, QName nodeName)
- {
- return getChildElementsIntern(node, nodeName);
- }
-
- private static Iterator getChildElementsIntern(Node node, QName nodeName)
- {
- ArrayList list = new ArrayList();
- NodeList nlist = node.getChildNodes();
- for (int i = 0; i < nlist.getLength(); i++)
- {
- Node child = nlist.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- if (nodeName == null)
- {
- list.add(child);
- }
- else
- {
- QName qname;
- if (nodeName.getNamespaceURI().length() > 0)
- {
- qname = new QName(child.getNamespaceURI(), child.getLocalName());
- }
- else
- {
- qname = new QName(child.getLocalName());
- }
- if (qname.equals(nodeName))
- {
- list.add(child);
- }
- }
- }
- }
- return list.iterator();
- }
-
- /** Gets parent element or null if there is none
- */
- public static Element getParentElement(Node node)
- {
- Node parent = node.getParentNode();
- return (parent instanceof Element ? (Element)parent : null);
- }
-
- /** Get the owner document that is associated with the current thread */
- public static Document getOwnerDocument()
- {
- Document doc = (Document)documentThreadLocal.get();
- if (doc == null)
- {
- doc = getDocumentBuilder().newDocument();
- documentThreadLocal.set(doc);
- }
- return doc;
- }
-
- public static Element sourceToElement(Source source) throws IOException
- {
- Element retElement = null;
-
- try
- {
- if (source instanceof StreamSource)
- {
- StreamSource streamSource = (StreamSource)source;
-
- InputStream ins = streamSource.getInputStream();
- if (ins != null)
- {
- retElement = DOMUtils.parse(ins);
- }
- else
- {
- Reader reader = streamSource.getReader();
- retElement = DOMUtils.parse(new InputSource(reader));
- }
- }
- else if (source instanceof DOMSource)
- {
- DOMSource domSource = (DOMSource)source;
- Node node = domSource.getNode();
- if (node instanceof Element)
- {
- retElement = (Element)node;
- }
- else if (node instanceof Document)
- {
- retElement = ((Document)node).getDocumentElement();
- }
- else
- {
- throw new RuntimeException("Unsupported Node type: " + node.getClass().getName());
- }
- }
- else if (source instanceof SAXSource)
- {
- // The fact that JAXBSource derives from SAXSource is an implementation detail.
- // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource.
- // The XMLReader object obtained by the getXMLReader method shall be used only for parsing the InputSource object returned by the getInputSource method.
-
- TransformerFactory tf = TransformerFactory.newInstance();
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- Transformer transformer = tf.newTransformer();
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- transformer.transform(source, new StreamResult(baos));
- retElement = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
- }
- else
- {
- throw new RuntimeException("Source type not implemented: " + source.getClass().getName());
- }
-
- }
- catch (TransformerException ex)
- {
- IOException ioex = new IOException();
- ioex.initCause(ex);
- throw ioex;
- }
-
- return retElement;
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/KernelLocator.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
-
-import org.jboss.kernel.Kernel;
-
-/**
- * Locate the single instance of the kernel
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class KernelLocator
-{
- private static Kernel kernel;
-
- public static Kernel getKernel()
- {
- return KernelLocator.kernel;
- }
-
- public void setKernel(Kernel kernel)
- {
- KernelLocator.kernel = kernel;
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/ServiceLoader.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -1,251 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Properties;
-
-// $Id$
-
-/**
- * Load a service class using this ordered lookup procedure
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 14-Dec-2006
- */
-public abstract class ServiceLoader
-{
- /**
- * This method uses the algorithm below using the JAXWS Provider as an example.
- *
- * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
- * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
- *
- * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
- * java.util.Properties.load(InputStream) method and it contains an entry whose key is
- * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
- *
- * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
- * as the name of the implementation class.
- *
- * 4. Finally, a default implementation class name is used.
- */
- public static Object loadService(String propertyName, String defaultFactory)
- {
- Object factory = loadFromServices(propertyName, null);
- if (factory == null)
- {
- factory = loadFromPropertiesFile(propertyName, null);
- }
- if (factory == null)
- {
- factory = loadFromSystemProperty(propertyName, defaultFactory);
- }
- return factory;
- }
-
- /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- */
- public static Object loadFromServices(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- String filename = "META-INF/services/" + propertyName;
- InputStream inStream = loader.getResourceAsStream(filename);
- if (inStream != null)
- {
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- if (factoryName != null)
- {
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /** Use the system property
- */
- public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- PrivilegedAction action = new PropertyAccessAction(propertyName);
- String factoryName = (String)AccessController.doPrivileged(action);
- if (factoryName != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /**
- * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory.
- * This configuration file is in standard java.util.Properties format and contains the
- * fully qualified name of the implementation class with the key being the system property defined above.
- */
- public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the properties file "lib/jaxm.properties" in the JRE directory.
- // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
- PrivilegedAction action = new PropertyAccessAction("java.home");
- String javaHome = (String)AccessController.doPrivileged(action);
- File jaxmFile = new File(javaHome + "/lib/jaxws.properties");
- if (jaxmFile.exists())
- {
- try
- {
- action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
- Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
- factoryName = jaxmProperties.getProperty(propertyName);
- if (factoryName != null)
- {
- //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- private static Object loadDefault(String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the default factory implementation class.
- if (defaultFactory != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
- Class factoryClass = loader.loadClass(defaultFactory);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load: " + defaultFactory, t);
- }
- }
-
- return factory;
- }
-
- private static class PropertyAccessAction implements PrivilegedAction
- {
- private String name;
-
- PropertyAccessAction(String name)
- {
- this.name = name;
- }
-
- public Object run()
- {
- return System.getProperty(name);
- }
- }
-
- private static class PropertyFileAccessAction implements PrivilegedAction
- {
- private String filename;
-
- PropertyFileAccessAction(String filename)
- {
- this.filename = filename;
- }
-
- public Object run()
- {
- try
- {
- InputStream inStream = new FileInputStream(filename);
- Properties props = new Properties();
- props.load(inStream);
- return props;
- }
- catch (IOException ex)
- {
- throw new SecurityException("Cannot load properties: " + filename, ex);
- }
- }
- }
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -21,8 +21,9 @@
*/
package org.jboss.wsf.spi;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
+
/**
* Locates an SPIProvider.
*
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -27,11 +27,7 @@
import java.util.Set;
import java.util.StringTokenizer;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelRegistry;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.KernelLocator;
/**
* A deployment aspect that does nothing.
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -23,13 +23,6 @@
// $Id$
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.xb.QNameBuilder;
import org.w3c.dom.Element;
/**
@@ -38,212 +31,15 @@
*
* @author Thomas.Diesler(a)jboss.org
*/
-public class ServiceRefMetaDataParser
+public interface ServiceRefMetaDataParser
{
- private static final Logger log = Logger.getLogger(ServiceRefMetaDataParser.class);
+ public void importStandardXml(Element root, UnifiedServiceRefMetaData sref);
+
+ public void importJBossXml(Element root, UnifiedServiceRefMetaData sref);
- public void importStandardXml(Element root, UnifiedServiceRefMetaData sref)
- {
- sref.setServiceRefName(getElementContent(root, "service-ref-name"));
- sref.setServiceInterface(getOptionalElementContent(root, "service-interface"));
- sref.setWsdlFile(getOptionalElementContent(root, "wsdl-file"));
- sref.setMappingFile(getOptionalElementContent(root, "jaxrpc-mapping-file"));
+ public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref);
- Element child = DOMUtils.getFirstChildElement(root, "service-qname");
- if (child != null)
- sref.setServiceQName(QNameBuilder.buildQName(child, getTextContent(child)));
+ public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref);
- // Parse the port-component-ref elements
- Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
- while (iterator.hasNext())
- {
- Element pcrefElement = (Element)iterator.next();
- UnifiedPortComponentRefMetaData pcrefMetaData = new UnifiedPortComponentRefMetaData(sref);
- pcrefMetaData.importStandardXml(pcrefElement);
- sref.addPortComponentRef(pcrefMetaData);
- }
-
- // Parse the handler elements
- iterator = DOMUtils.getChildElements(root, "handler");
- while (iterator.hasNext())
- {
- Element handlerElement = (Element)iterator.next();
- UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
- handlerMetaData.importStandardXml(handlerElement);
- sref.addHandler(handlerMetaData);
- }
- }
-
- public void importJBossXml(Element root, UnifiedServiceRefMetaData sref)
- {
- sref.setConfigName(getOptionalElementContent(root, "config-name"));
- sref.setConfigFile(getOptionalElementContent(root, "config-file"));
- sref.setWsdlOverride(getOptionalElementContent(root, "wsdl-override"));
-
- // Parse the port-component-ref elements
- Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
- while (iterator.hasNext())
- {
- Element pcrefElement = (Element)iterator.next();
- String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
- QName portName = getOptionalElementContentAsQName(pcrefElement, "port-qname");
-
- UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName);
- if (pcref == null && seiName != null)
- {
- // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
- // if it has at least a SEI declared
- pcref = new UnifiedPortComponentRefMetaData(sref);
- pcref.importStandardXml(pcrefElement);
- sref.addPortComponentRef(pcref);
- }
-
- if (pcref != null)
- pcref.importJBossXml(pcrefElement);
- }
-
- // Parse the call-property elements
- iterator = DOMUtils.getChildElements(root, "call-property");
- while (iterator.hasNext())
- {
- Element propElement = (Element)iterator.next();
- String name = getElementContent(propElement, "prop-name");
- String value = getElementContent(propElement, "prop-value");
- sref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
- }
- }
-
- public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref)
- {
- pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
- pcref.setPortComponentLink(getOptionalElementContent(root, "port-component-link"));
- }
-
- public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
- {
- // Look for call-property elements
- Iterator iterator = DOMUtils.getChildElements(root, "call-property");
- while (iterator.hasNext())
- {
- Element propElement = (Element)iterator.next();
- String name = getElementContent(propElement, "prop-name");
- String value = getElementContent(propElement, "prop-value");
- pcref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
- }
-
- // Look for stub-property elements
- iterator = DOMUtils.getChildElements(root, "stub-property");
- while (iterator.hasNext())
- {
- Element propElement = (Element)iterator.next();
- String name = getElementContent(propElement, "prop-name");
- String value = getElementContent(propElement, "prop-value");
- UnifiedStubPropertyMetaData propMetaData = new UnifiedStubPropertyMetaData();
- propMetaData.setPropName(name);
- propMetaData.setPropValue(value);
- pcref.addStubProperty(propMetaData);
- }
-
- // portQName
- QName portQName = getOptionalElementContentAsQName(root, "port-qname");
- if (portQName != null)
- pcref.setPortQName(portQName);
-
- // config
- Element configName = DOMUtils.getFirstChildElement(root, "config-name");
- if (configName != null)
- pcref.setConfigName(getTextContent(configName));
-
- Element configFile = DOMUtils.getFirstChildElement(root, "config-file");
- if (configFile != null)
- pcref.setConfigFile(getTextContent(configFile));
-
- // service-endpoint-interface
- Element sei = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
- if (sei != null)
- pcref.setServiceEndpointInterface(getTextContent(sei));
-
- }
-
- public void importStandardXml(Element root, UnifiedHandlerMetaData href)
- {
- href.setHandlerName(getElementContent(root, "handler-name"));
- href.setHandlerClass(getElementContent(root, "handler-class"));
-
- // Parse the init-param elements
- Iterator iterator = DOMUtils.getChildElements(root, "init-param");
- while (iterator.hasNext())
- {
- Element paramElement = (Element)iterator.next();
- UnifiedInitParamMetaData param = new UnifiedInitParamMetaData();
- param.setParamName(getElementContent(paramElement, "param-name"));
- param.setParamValue(getElementContent(paramElement, "param-value"));
- href.addInitParam(param);
- }
-
- // Parse the soap-header elements
- iterator = DOMUtils.getChildElements(root, "soap-header");
- while (iterator.hasNext())
- {
- Element headerElement = (Element)iterator.next();
- String content = getTextContent(headerElement);
- QName qname = DOMUtils.resolveQName(headerElement, content);
- href.addSoapHeader(qname);
- }
-
- // Parse the soap-role elements
- iterator = DOMUtils.getChildElements(root, "soap-role");
- while (iterator.hasNext())
- {
- Element roleElement = (Element)iterator.next();
- String content = getTextContent(roleElement);
- href.addSoapRole(content);
- }
-
- // Parse the port-name elements
- iterator = DOMUtils.getChildElements(root, "port-name");
- while (iterator.hasNext())
- {
- Element portElement = (Element)iterator.next();
- String content = getTextContent(portElement);
- href.addPortName(content);
- }
- }
-
- private String getElementContent(Element element, String childName)
- {
- String childValue = getOptionalElementContent(element, childName);
- if (childValue == null || childValue.length() == 0)
- throw new IllegalStateException("Invalid null element content: " + childName);
-
- return childValue;
- }
-
- private String getOptionalElementContent(Element element, String childName)
- {
- return getTextContent(DOMUtils.getFirstChildElement(element, childName));
- }
-
- private QName getOptionalElementContentAsQName(Element element, String childName)
- {
- QName qname = null;
- String value = getOptionalElementContent(element, childName);
- if (value != null)
- {
- qname = (value.startsWith("{") ? QName.valueOf(value) : DOMUtils.resolveQName(element, value));
- }
- return qname;
- }
-
- private String getTextContent(Element element)
- {
- String content = null;
- if (element != null)
- {
- content = DOMUtils.getTextContent(element);
- if (content != null)
- content = content.trim();
- }
- return content;
- }
+ public void importStandardXml(Element root, UnifiedHandlerMetaData href);
}
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/ServiceRefMetaDataParserFactory.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata.j2ee.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 02-Aug-2007
+ */
+public interface ServiceRefMetaDataParserFactory
+{
+ ServiceRefMetaDataParser getServiceRefMetaDataParser();
+}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -30,6 +30,8 @@
import javax.xml.namespace.QName;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.serviceref.ServiceRefElement;
import org.w3c.dom.Element;
@@ -136,7 +138,9 @@
public void importStandardXml(Element root)
{
- new ServiceRefMetaDataParser().importStandardXml(root, this);
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class);
+ factory.getServiceRefMetaDataParser().importStandardXml(root, this);
}
public String toString()
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -28,6 +28,8 @@
import javax.xml.namespace.QName;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.serviceref.ServiceRefElement;
import org.w3c.dom.Element;
@@ -179,12 +181,16 @@
public void importStandardXml(Element root)
{
- new ServiceRefMetaDataParser().importStandardXml(root, this);
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class);
+ factory.getServiceRefMetaDataParser().importStandardXml(root, this);
}
public void importJBossXml(Element root)
{
- new ServiceRefMetaDataParser().importJBossXml(root, this);
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class);
+ factory.getServiceRefMetaDataParser().importJBossXml(root, this);
}
public boolean matches(String seiName, QName portName)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -33,6 +33,8 @@
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
@@ -393,13 +395,17 @@
@Override
public void importStandardXml(Element root)
{
- new ServiceRefMetaDataParser().importStandardXml(root, this);
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class);
+ factory.getServiceRefMetaDataParser().importStandardXml(root, this);
}
@Override
public void importJBossXml(Element root)
{
- new ServiceRefMetaDataParser().importJBossXml(root, this);
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServiceRefMetaDataParserFactory factory = provider.getSPI(ServiceRefMetaDataParserFactory.class);
+ factory.getServiceRefMetaDataParser().importJBossXml(root, this);
}
public String toString()
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -27,7 +27,7 @@
import java.net.URL;
import java.util.List;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* WSContractConsumer is responsible for generating JAX-WS client and server
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2007-08-01 22:58:35 UTC (rev 4071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -3,7 +3,7 @@
import java.io.File;
import java.io.PrintStream;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* WSContractProvider is responsible for generating the required portable
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.util;
+
+//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
+
+import org.jboss.kernel.Kernel;
+
+/**
+ * Locate the single instance of the kernel
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class KernelLocator
+{
+ private static Kernel kernel;
+
+ public static Kernel getKernel()
+ {
+ return KernelLocator.kernel;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ KernelLocator.kernel = kernel;
+ }
+}
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2007-08-02 06:24:26 UTC (rev 4072)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Properties;
+
+// $Id: ServiceLoader.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+/**
+ * Load a service class using this ordered lookup procedure
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 14-Dec-2006
+ */
+public abstract class ServiceLoader
+{
+ /**
+ * This method uses the algorithm below using the JAXWS Provider as an example.
+ *
+ * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
+ * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
+ *
+ * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
+ * java.util.Properties.load(InputStream) method and it contains an entry whose key is
+ * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
+ *
+ * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
+ * as the name of the implementation class.
+ *
+ * 4. Finally, a default implementation class name is used.
+ */
+ public static Object loadService(String propertyName, String defaultFactory)
+ {
+ Object factory = loadFromServices(propertyName, null);
+ if (factory == null)
+ {
+ factory = loadFromPropertiesFile(propertyName, null);
+ }
+ if (factory == null)
+ {
+ factory = loadFromSystemProperty(propertyName, defaultFactory);
+ }
+ return factory;
+ }
+
+ /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
+ */
+ public static Object loadFromServices(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ String factoryName = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
+ String filename = "META-INF/services/" + propertyName;
+ InputStream inStream = loader.getResourceAsStream(filename);
+ if (inStream != null)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+ factoryName = br.readLine();
+ br.close();
+ if (factoryName != null)
+ {
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ factory = loadDefault(defaultFactory);
+ }
+
+ return factory;
+ }
+
+ /** Use the system property
+ */
+ public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ PrivilegedAction action = new PropertyAccessAction(propertyName);
+ String factoryName = (String)AccessController.doPrivileged(action);
+ if (factoryName != null)
+ {
+ try
+ {
+ //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ factory = loadDefault(defaultFactory);
+ }
+
+ return factory;
+ }
+
+ /**
+ * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory.
+ * This configuration file is in standard java.util.Properties format and contains the
+ * fully qualified name of the implementation class with the key being the system property defined above.
+ */
+ public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
+ {
+ Object factory = null;
+ String factoryName = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the properties file "lib/jaxm.properties" in the JRE directory.
+ // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
+ PrivilegedAction action = new PropertyAccessAction("java.home");
+ String javaHome = (String)AccessController.doPrivileged(action);
+ File jaxmFile = new File(javaHome + "/lib/jaxws.properties");
+ if (jaxmFile.exists())
+ {
+ try
+ {
+ action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
+ Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
+ factoryName = jaxmProperties.getProperty(propertyName);
+ if (factoryName != null)
+ {
+ //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
+ Class factoryClass = loader.loadClass(factoryName);
+ factory = factoryClass.newInstance();
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
+ }
+ }
+
+ // Use the default factory implementation class.
+ if (factory == null && defaultFactory != null)
+ {
+ factory = loadDefault(defaultFactory);
+ }
+
+ return factory;
+ }
+
+ private static Object loadDefault(String defaultFactory)
+ {
+ Object factory = null;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // Use the default factory implementation class.
+ if (defaultFactory != null)
+ {
+ try
+ {
+ //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
+ Class factoryClass = loader.loadClass(defaultFactory);
+ factory = factoryClass.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Failed to load: " + defaultFactory, t);
+ }
+ }
+
+ return factory;
+ }
+
+ private static class PropertyAccessAction implements PrivilegedAction
+ {
+ private String name;
+
+ PropertyAccessAction(String name)
+ {
+ this.name = name;
+ }
+
+ public Object run()
+ {
+ return System.getProperty(name);
+ }
+ }
+
+ private static class PropertyFileAccessAction implements PrivilegedAction
+ {
+ private String filename;
+
+ PropertyFileAccessAction(String filename)
+ {
+ this.filename = filename;
+ }
+
+ public Object run()
+ {
+ try
+ {
+ InputStream inStream = new FileInputStream(filename);
+ Properties props = new Properties();
+ props.load(inStream);
+ return props;
+ }
+ catch (IOException ex)
+ {
+ throw new SecurityException("Cannot load properties: " + filename, ex);
+ }
+ }
+ }
+}
17 years, 5 months
- 1
- 0
JBossWS SVN: r4071 - in spi/trunk/src/main/java/org/jboss/wsf: common and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-01 18:58:35 -0400 (Wed, 01 Aug 2007)
New Revision: 4071
Removed:
spi/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java
spi/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java
spi/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
spi/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java
spi/trunk/src/main/java/org/jboss/wsf/common/log/
spi/trunk/src/main/java/org/jboss/wsf/test/
Log:
Remove unwated classes
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2007-08-01 22:52:05 UTC (rev 4070)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2007-08-01 22:58:35 UTC (rev 4071)
@@ -1,609 +0,0 @@
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-package org.jboss.wsf.common;
-
-// $Id$
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Traverse a DOM tree in order to print a document that is parsed.
- *
- * @author Andy Clark, IBM
- * @author Thomas.Diesler(a)jboss.org
- * @version $Revision$
- */
-public class DOMWriter
-{
- // Print writer
- private PrintWriter out;
- // True, if canonical output
- private boolean canonical;
- // True, if pretty printing should be used
- private boolean prettyprint;
- // True, if the XML declaration should be written
- private boolean writeXMLDeclaration;
- // Explicit character set encoding
- private String charsetName;
- // indent for the pretty printer
- private int prettyIndent;
- // True, if the XML declaration has been written
- private boolean wroteXMLDeclaration;
- // The node that started the write
- private Node rootNode;
- // True if we want namespace completion
- private boolean completeNamespaces = true;
- // The current default namespace
- private String currentDefaultNamespace;
-
- public DOMWriter(Writer w)
- {
- this.out = new PrintWriter(w);
- }
-
- public DOMWriter(Writer w, String charsetName)
- {
- this.out = new PrintWriter(w);
- this.charsetName = charsetName;
- this.writeXMLDeclaration = true;
- }
-
- public DOMWriter(OutputStream stream)
- {
- try
- {
- this.out = new PrintWriter(new OutputStreamWriter(stream, "UTF-8"));
- }
- catch (UnsupportedEncodingException e)
- {
- // ignore, UTF-8 should be available
- }
- }
-
- public DOMWriter(OutputStream stream, String charsetName)
- {
- try
- {
- this.out = new PrintWriter(new OutputStreamWriter(stream, charsetName));
- this.charsetName = charsetName;
- this.writeXMLDeclaration = true;
- }
- catch (UnsupportedEncodingException e)
- {
- throw new IllegalArgumentException("Unsupported encoding: " + charsetName);
- }
- }
-
- /**
- * Print a node with explicit prettyprinting.
- * The defaults for all other DOMWriter properties apply.
- *
- */
- public static String printNode(Node node, boolean prettyprint)
- {
- StringWriter strw = new StringWriter();
- new DOMWriter(strw).setPrettyprint(prettyprint).print(node);
- return strw.toString();
- }
-
- public boolean isCanonical()
- {
- return canonical;
- }
-
- /**
- * Set wheter entities should appear in their canonical form.
- * The default is false.
- */
- public DOMWriter setCanonical(boolean canonical)
- {
- this.canonical = canonical;
- return this;
- }
-
- /**
- * Set wheter subelements should have their namespaces completed.
- * Setting this to false may lead to invalid XML fragments.
- * The default is true.
- */
- public DOMWriter setCompleteNamespaces(boolean complete)
- {
- this.completeNamespaces = complete;
- return this;
- }
-
- public boolean isPrettyprint()
- {
- return prettyprint;
- }
-
- /**
- * Set wheter element should be indented.
- * The default is false.
- */
- public DOMWriter setPrettyprint(boolean prettyprint)
- {
- this.prettyprint = prettyprint;
- return this;
- }
-
- public boolean isWriteXMLDeclaration()
- {
- return writeXMLDeclaration;
- }
-
- /**
- * Set wheter the XML declaration should be written.
- * The default is false.
- */
- public DOMWriter setWriteXMLDeclaration(boolean flag)
- {
- this.writeXMLDeclaration = flag;
- return this;
- }
-
- public void print(Node node)
- {
- rootNode = node;
- printInternal(node, false);
- }
-
- private void printInternal(Node node, boolean indentEndMarker)
- {
- // is there anything to do?
- if (node == null)
- {
- return;
- }
-
- // JBAS-2117 - Don't skip the DOCUMENT_NODE
- // if (node instanceof Document) node = ((Document)node).getDocumentElement();
-
- if (wroteXMLDeclaration == false && writeXMLDeclaration == true && canonical == false)
- {
- out.print("<?xml version='1.0'");
- if (charsetName != null)
- out.print(" encoding='" + charsetName + "'");
-
- out.print("?>");
- if (prettyprint)
- out.println();
-
- wroteXMLDeclaration = true;
- }
-
- int type = node.getNodeType();
- boolean hasChildNodes = node.getChildNodes().getLength() > 0;
-
- String nodeName = node.getNodeName();
- switch (type)
- {
- // print document
- case Node.DOCUMENT_NODE:
- {
- NodeList children = node.getChildNodes();
- for (int iChild = 0; iChild < children.getLength(); iChild++)
- {
- printInternal(children.item(iChild), false);
- }
- out.flush();
- break;
- }
-
- // print element with attributes
- case Node.ELEMENT_NODE:
- {
- Element element = (Element)node;
- if (prettyprint)
- {
- for (int i = 0; i < prettyIndent; i++)
- {
- out.print(' ');
- }
- prettyIndent++;
- }
-
- out.print('<');
- out.print(nodeName);
-
- Map nsMap = new HashMap();
- String elPrefix = node.getPrefix();
- String elNamespaceURI = node.getNamespaceURI();
- if (elPrefix != null)
- {
- String nsURI = getNamespaceURI(elPrefix, element, rootNode);
- nsMap.put(elPrefix, nsURI);
- }
-
- Attr attrs[] = sortAttributes(node.getAttributes());
- for (int i = 0; i < attrs.length; i++)
- {
- Attr attr = attrs[i];
- String atPrefix = attr.getPrefix();
- String atName = attr.getNodeName();
- String atValue = normalize(attr.getNodeValue(), canonical);
-
- if (atName.equals("xmlns"))
- currentDefaultNamespace = atValue;
-
- if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
- {
- String nsURI = getNamespaceURI(atPrefix, element, rootNode);
- nsMap.put(atPrefix, nsURI);
- // xsi:type='ns1:SubType', xsi:type='xsd:string'
- if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0)
- {
- // xsi defined on the envelope
- if (nsURI == null)
- nsURI = getNamespaceURI(atPrefix, element, null);
-
- if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI))
- {
- String typePrefix = atValue.substring(0, atValue.indexOf(":"));
- String typeURI = getNamespaceURI(typePrefix, element, rootNode);
- nsMap.put(typePrefix, typeURI);
- }
- }
- }
-
- out.print(" " + atName + "='" + atValue + "'");
- }
-
- // Add namespace declaration for prefixes
- // that are defined further up the tree
- if (completeNamespaces)
- {
- Iterator itPrefix = nsMap.keySet().iterator();
- while (itPrefix.hasNext())
- {
- String prefix = (String)itPrefix.next();
- String nsURI = (String)nsMap.get(prefix);
- if (nsURI == null)
- {
- nsURI = getNamespaceURI(prefix, element, null);
- out.print(" xmlns:" + prefix + "='" + nsURI + "'");
- }
- }
- }
-
- // The SAX ContentHandler will by default not add the namespace declaration
- // <Hello xmlns='http://somens'>World</Hello>
- if (elPrefix == null && elNamespaceURI != null)
- {
- String defaultNamespace = element.getAttribute("xmlns");
- if (defaultNamespace.length() == 0 && !elNamespaceURI.equals(currentDefaultNamespace))
- {
- out.print(" xmlns='" + elNamespaceURI + "'");
- currentDefaultNamespace = elNamespaceURI;
- }
- }
-
- if (hasChildNodes)
- {
- out.print('>');
- }
-
- // Find out if the end marker is indented
- indentEndMarker = isEndMarkerIndented(node);
-
- if (indentEndMarker)
- {
- out.print('\n');
- }
-
- NodeList childNodes = node.getChildNodes();
- int len = childNodes.getLength();
- for (int i = 0; i < len; i++)
- {
- Node childNode = childNodes.item(i);
- printInternal(childNode, false);
- }
- break;
- }
-
- // handle entity reference nodes
- case Node.ENTITY_REFERENCE_NODE:
- {
- if (canonical)
- {
- NodeList children = node.getChildNodes();
- if (children != null)
- {
- int len = children.getLength();
- for (int i = 0; i < len; i++)
- {
- printInternal(children.item(i), false);
- }
- }
- }
- else
- {
- out.print('&');
- out.print(nodeName);
- out.print(';');
- }
- break;
- }
-
- // print cdata sections
- case Node.CDATA_SECTION_NODE:
- {
- if (canonical)
- {
- out.print(normalize(node.getNodeValue(), canonical));
- }
- else
- {
- out.print("<![CDATA[");
- out.print(node.getNodeValue());
- out.print("]]>");
- }
- break;
- }
-
- // print text
- case Node.TEXT_NODE:
- {
- String text = normalize(node.getNodeValue(), canonical);
- if (prettyprint == false || text.trim().length() > 0)
- out.print(text);
- break;
- }
-
- // print processing instruction
- case Node.PROCESSING_INSTRUCTION_NODE:
- {
- out.print("<?");
- out.print(nodeName);
- String data = node.getNodeValue();
- if (data != null && data.length() > 0)
- {
- out.print(' ');
- out.print(data);
- }
- out.print("?>");
- break;
- }
-
- // print comment
- case Node.COMMENT_NODE:
- {
- for (int i = 0; i < prettyIndent; i++)
- {
- out.print(' ');
- }
-
- out.print("<!--");
- String data = node.getNodeValue();
- if (data != null)
- {
- out.print(data);
- }
- out.print("-->");
-
- if (prettyprint)
- {
- out.print('\n');
- }
-
- break;
- }
- }
-
- if (type == Node.ELEMENT_NODE)
- {
- if (prettyprint)
- prettyIndent--;
-
- if (hasChildNodes == false)
- {
- out.print("/>");
- }
- else
- {
- if (indentEndMarker)
- {
- for (int i = 0; i < prettyIndent; i++)
- {
- out.print(' ');
- }
- }
-
- out.print("</");
- out.print(nodeName);
- out.print('>');
- }
-
- if (prettyIndent > 0)
- {
- out.print('\n');
- }
- }
- out.flush();
- }
-
- private String getNamespaceURI(String prefix, Element element, Node stopNode)
- {
- Node parent = element.getParentNode();
- String nsURI = element.getAttribute("xmlns:" + prefix);
- if (nsURI.length() == 0 && element != stopNode && parent instanceof Element)
- return getNamespaceURI(prefix, (Element)parent, stopNode);
-
- return (nsURI.length() > 0 ? nsURI : null);
- }
-
- private boolean isEndMarkerIndented(Node node)
- {
- if (prettyprint)
- {
- NodeList childNodes = node.getChildNodes();
- int len = childNodes.getLength();
- for (int i = 0; i < len; i++)
- {
- Node children = childNodes.item(i);
- if (children.getNodeType() == Node.ELEMENT_NODE)
- {
- return true;
- }
- }
- }
- return false;
- }
-
- /** Returns a sorted list of attributes. */
- private Attr[] sortAttributes(NamedNodeMap attrs)
- {
-
- int len = (attrs != null) ? attrs.getLength() : 0;
- Attr array[] = new Attr[len];
- for (int i = 0; i < len; i++)
- {
- array[i] = (Attr)attrs.item(i);
- }
- for (int i = 0; i < len - 1; i++)
- {
- String name = array[i].getNodeName();
- int index = i;
- for (int j = i + 1; j < len; j++)
- {
- String curName = array[j].getNodeName();
- if (curName.compareTo(name) < 0)
- {
- name = curName;
- index = j;
- }
- }
- if (index != i)
- {
- Attr temp = array[i];
- array[i] = array[index];
- array[index] = temp;
- }
- }
- return (array);
- }
-
- /** Normalizes the given string. */
- public static String normalize(String s, boolean canonical)
- {
- StringBuffer str = new StringBuffer();
-
- int len = (s != null) ? s.length() : 0;
- for (int i = 0; i < len; i++)
- {
- char ch = s.charAt(i);
- switch (ch)
- {
- case '<':
- {
- str.append("<");
- break;
- }
- case '>':
- {
- str.append(">");
- break;
- }
- case '&':
- {
- str.append("&");
- break;
- }
- case '"':
- {
- str.append(""");
- break;
- }
- case '\'':
- {
- str.append("'");
- break;
- }
- case '\r':
- case '\n':
- {
- if (canonical)
- {
- str.append("&#");
- str.append(Integer.toString(ch));
- str.append(';');
- break;
- }
- // else, default append char
- }
- default:
- {
- str.append(ch);
- }
- }
- }
- return (str.toString());
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-08-01 22:52:05 UTC (rev 4070)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-08-01 22:58:35 UTC (rev 4071)
@@ -1,142 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-// $Id$
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-
-import javax.activation.DataHandler;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-
-/**
- * IO utilites
- *
- * @author Thomas.Diesler(a)jboss.org
- */
-public final class IOUtils
-{
- // Hide the constructor
- private IOUtils()
- {
- }
-
- public static Writer getCharsetFileWriter(File file, String charset) throws IOException
- {
- return new OutputStreamWriter(new FileOutputStream(file), charset);
- }
-
- /** Copy the input stream to the output stream
- */
- public static void copyStream(OutputStream outs, InputStream ins) throws IOException
- {
- byte[] bytes = new byte[1024];
- int r = ins.read(bytes);
- while (r > 0)
- {
- outs.write(bytes, 0, r);
- r = ins.read(bytes);
- }
- }
-
- /** Copy the reader to the output stream
- */
- public static void copyReader(OutputStream outs, Reader reader) throws IOException
- {
- OutputStreamWriter writer = new OutputStreamWriter(outs);
- char[] bytes = new char[1024];
- int r = reader.read(bytes);
- while (r > 0)
- {
- writer.write(bytes, 0, r);
- r = reader.read(bytes);
- }
- }
-
- public static byte[] convertToBytes(DataHandler dh)
- {
- try
- {
- ByteArrayOutputStream buffOS = new ByteArrayOutputStream();
- dh.writeTo(buffOS);
- return buffOS.toByteArray();
- }
- catch (IOException e)
- {
- throw new WebServiceException("Unable to convert DataHandler to byte[]: " + e.getMessage());
- }
- }
-
- /**
- * Transform a Reader to an InputStream
- * Background is that DocumentBuilder.parse() cannot take the Reader directly
- */
- public static InputStream transformReader(Reader reader) throws IOException
- {
- int capacity = 1024;
- char[] charBuffer = new char[capacity];
- StringBuffer strBuffer = new StringBuffer(capacity);
-
- int len = reader.read(charBuffer, 0, capacity);
- while (len > 0)
- {
- strBuffer.append(charBuffer, 0, len);
- len = reader.read(charBuffer, 0, capacity);
- }
- return new ByteArrayInputStream(strBuffer.toString().getBytes());
- }
-
- public static File createTempDirectory() throws IOException
- {
- File tmpdir = null;
-
- try
- {
- // TODO: recursive dependency, ohoh
-
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws");
- tmpdir.mkdirs();
- }
- catch (Throwable t)
- {
- // Use the Java temp directory if there is no server config (the client)
- }
-
- return tmpdir;
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-01 22:52:05 UTC (rev 4070)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-01 22:58:35 UTC (rev 4071)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelRegistry;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 19, 2007
- */
-public class KernelAwareSPIFactory
-{
- public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact)
- {
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistry registry = kernel.getRegistry();
- KernelRegistryEntry entry = registry.getEntry(beanName);
- return (T)entry.getTarget();
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java 2007-08-01 22:52:05 UTC (rev 4070)
+++ spi/trunk/src/main/java/org/jboss/wsf/common/ObjectNameFactory.java 2007-08-01 22:58:35 UTC (rev 4071)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common;
-
-import java.util.Hashtable;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * A simple factory for creating safe object names.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public class ObjectNameFactory
-{
- public static ObjectName create(String name)
- {
- try
- {
- return new ObjectName(name);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + name + "; " + e);
- }
- }
-
- public static ObjectName create(String domain, String key, String value)
- {
- try
- {
- return new ObjectName(domain, key, value);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
- }
- }
-
- public static ObjectName create(String domain, Hashtable table)
- {
- try
- {
- return new ObjectName(domain, table);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
- }
- }
-}
17 years, 5 months
- 1
- 0
JBossWS SVN: r4070 - in spi/trunk: src/main/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-01 18:52:05 -0400 (Wed, 01 Aug 2007)
New Revision: 4070
Removed:
spi/trunk/src/main/etc/wsconsume.bat
spi/trunk/src/main/etc/wsconsume.sh
spi/trunk/src/main/etc/wsprovide.bat
spi/trunk/src/main/etc/wsprovide.sh
Modified:
spi/trunk/ant-import/build-release.xml
spi/trunk/src/main/etc/component-info.xml
Log:
Fix component-info
Modified: spi/trunk/ant-import/build-release.xml
===================================================================
--- spi/trunk/ant-import/build-release.xml 2007-08-01 22:44:38 UTC (rev 4069)
+++ spi/trunk/ant-import/build-release.xml 2007-08-01 22:52:05 UTC (rev 4070)
@@ -19,12 +19,11 @@
<!-- jboss/jbossws-spi -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
- <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true">
<fileset dir="${spi.output.lib.dir}">
<include name="jbossws-spi.jar"/>
<include name="jbossws-spi-src.zip"/>
- <include name="jbossws-spi-scripts.zip"/>
</fileset>
</copy>
<copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true">
Modified: spi/trunk/src/main/etc/component-info.xml
===================================================================
--- spi/trunk/src/main/etc/component-info.xml 2007-08-01 22:44:38 UTC (rev 4069)
+++ spi/trunk/src/main/etc/component-info.xml 2007-08-01 22:52:05 UTC (rev 4070)
@@ -6,21 +6,7 @@
licenseType="lgpl">
<artifact id="jbossws-spi.jar"/>
- <artifact id="jbossws-spi-scripts.zip"/>
- <import componentref="sun-jaxb">
- <compatible version="@sun-jaxb@"/>
- </import>
-
- <import componentref="sun-jaxws">
- <compatible version="@sun-jaxws@"/>
- </import>
-
- <import componentref="woodstox">
- <compatible version="@woodstox@"/>
- <compatible version="@woodstox@-brew"/>
- </import>
-
<export>
<include input="jbossws-spi.jar"/>
</export>
Deleted: spi/trunk/src/main/etc/wsconsume.bat
===================================================================
--- spi/trunk/src/main/etc/wsconsume.bat 2007-08-01 22:44:38 UTC (rev 4069)
+++ spi/trunk/src/main/etc/wsconsume.bat 2007-08-01 22:52:05 UTC (rev 4070)
@@ -1,55 +0,0 @@
-@echo off
-
-rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $
-
-@if not "%ECHO%" == "" echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM set ARGS=%ARGS% %1
-REM shift
-REM goto loop
-REM :endloop
-
-set JAVA=%JAVA_HOME%\bin\java
-set JBOSS_HOME=%DIRNAME%\..
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Setup the wstools classpath
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-
-rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %*
Deleted: spi/trunk/src/main/etc/wsconsume.sh
===================================================================
--- spi/trunk/src/main/etc/wsconsume.sh 2007-08-01 22:44:38 UTC (rev 4069)
+++ spi/trunk/src/main/etc/wsconsume.sh 2007-08-01 22:52:05 UTC (rev 4070)
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-#
-# Invoke wsconsume with dynamic classpath
-# depending on the deployed stack and the location
-#
-# @author Heiko.Braun(a)jboss.com
-# @version $Id: $
-#
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JBOSS_HOME" ] &&
- JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-###
-# Setup the LIBDIR
-# This script maybe used form within the jbossws distribution
-# or installed under JBOSS_HOME/bin
-###
-
-PARENT=`cd $DIRNAME/..; pwd`
-if [ -d $PARENT/client ]; then
- LIBDIR=$JBOSS_HOME/client
-else
- LIBDIR=$PARENT/lib
-fi
-
-# Is it a JBossWS-native or SunRI installation?
-if [ -a $LIBDIR/jbossws-client.jar ]; then
- JBOSSWS_NATIVE="true"
-fi
-
-###
-# Setup the wsconsume classpath
-# The classpath is dynamically build depending on the stack that
-# is deployed. See $JBOSSWS_NATIVE above.
-###
-
-# shared libs
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/activation.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/getopt.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wstx.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossall-client.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/log4j.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/mail.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-spi.jar"
-
-# shared jaxws libs
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/streambuffer.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-ex.jar"
-
-# stack specific dependencies
-if [ "x$JBOSSWS_NATIVE" = "x" ]; then
- echo "JBossWS-SunRI stack deployed"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
-else
- echo "JBossWS-Native stack deployed"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar"
-fi
-
-###
-# Execute the JVM
-###
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"`
- JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-"$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -Dlog4j.configuration=wstools-log4j.xml \
- -classpath "$WSCONSUME_CLASSPATH" \
- org.jboss.wsf.spi.tools.cmd.WSConsume "$@"
Deleted: spi/trunk/src/main/etc/wsprovide.bat
===================================================================
--- spi/trunk/src/main/etc/wsprovide.bat 2007-08-01 22:44:38 UTC (rev 4069)
+++ spi/trunk/src/main/etc/wsprovide.bat 2007-08-01 22:52:05 UTC (rev 4070)
@@ -1,49 +0,0 @@
-@echo off
-
-rem $Id: wsprovide.bat 3101 2007-05-16 08:26:33Z heiko.braun(a)jboss.com $
-
-@if not "%ECHO%" == "" echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM set ARGS=%ARGS% %1
-REM shift
-REM goto loop
-REM :endloop
-
-set JAVA=%JAVA_HOME%\bin\java
-set JBOSS_HOME=%DIRNAME%\..
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Setup the wstools classpath
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
-
-rem Execute the JVM
-"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*
Deleted: spi/trunk/src/main/etc/wsprovide.sh
===================================================================
--- spi/trunk/src/main/etc/wsprovide.sh 2007-08-01 22:44:38 UTC (rev 4069)
+++ spi/trunk/src/main/etc/wsprovide.sh 2007-08-01 22:52:05 UTC (rev 4070)
@@ -1,136 +0,0 @@
-#!/bin/sh
-
-#
-# Invoke wsprovide with dynamic classpath
-# depending on the deployed stack and the location
-#
-# @author Heiko.Braun(a)jboss.com
-# @version $Id: $
-#
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JBOSS_HOME" ] &&
- JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="$JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-###
-# Setup the LIBDIR
-# This script maybe used form within the jbossws distribution
-# or installed under JBOSS_HOME/bin
-###
-
-PARENT=`cd $DIRNAME/..; pwd`
-if [ -d $PARENT/client ]; then
- LIBDIR=$JBOSS_HOME/client
-else
- LIBDIR=$PARENT/lib
-fi
-
-# is it a JBossWS-native or SunRI installation?
-if [ -a $LIBDIR/jbossws-client.jar ]; then
- JBOSSWS_NATIVE="true"
-fi
-
-###
-# Setup the wsprovide classpath
-# The classpath is dynamically build depending on the stack that
-# is deployed. See $JBOSSWS_NATIVE above.
-###
-
-# shared libs
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar"
-
-# TODO: verify jbossall-client.jar dependency. It might be just logging
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/log4j.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/mail.jar"
-
-# shared jaxws libs
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-tools.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-rt.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/streambuffer.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-ex.jar"
-
-# stack specific dependencies
-if [ "x$JBOSSWS_NATIVE" = "x" ]; then
- echo "JBossWS-SunRI stack deployed"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
-else
- echo "JBossWS-Native stack deployed"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
-fi
-
-###
-# Execute the JVM
-###
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"`
- JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-"$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -Dlog4j.configuration=wstools-log4j.xml \
- -classpath "$WSPROVIDE_CLASSPATH" \
- org.jboss.wsf.spi.tools.cmd.WSProvide "$@"
17 years, 5 months
- 1
- 0
JBossWS SVN: r4069 - in spi/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-01 18:44:38 -0400 (Wed, 01 Aug 2007)
New Revision: 4069
Added:
spi/trunk/ant-import/build-setup.xml
spi/trunk/ant.properties
spi/trunk/ant.properties.example
spi/trunk/version.properties
Removed:
spi/trunk/build.bat
spi/trunk/build.sh
spi/trunk/spi.iml
spi/trunk/src/main/java/org/jboss/wsf/framework/
Modified:
spi/trunk/
spi/trunk/.classpath
spi/trunk/.project
spi/trunk/ant-import/build-release.xml
spi/trunk/ant-import/build-thirdparty.xml
spi/trunk/build.xml
Log:
Initial build
Property changes on: spi/trunk
___________________________________________________________________
Name: svn:ignore
- output*
thirdparty
+ ant.properties
version.properties.md5
output*
thirdparty
Modified: spi/trunk/.classpath
===================================================================
--- spi/trunk/.classpath 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/.classpath 2007-08-01 22:44:38 UTC (rev 4069)
@@ -3,25 +3,21 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-container.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar" sourcepath="thirdparty/jboss-deployers-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/getopt.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-xml-binding-sources.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/junit.jar"/>
- <classpathentry kind="lib" path="thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
- <classpathentry kind="lib" path="thirdparty/getopt.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: spi/trunk/.project
===================================================================
--- spi/trunk/.project 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/.project 2007-08-01 22:44:38 UTC (rev 4069)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>integration-spi</name>
+ <name>spi</name>
<comment></comment>
<projects>
</projects>
Modified: spi/trunk/ant-import/build-release.xml
===================================================================
--- spi/trunk/ant-import/build-release.xml 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/ant-import/build-release.xml 2007-08-01 22:44:38 UTC (rev 4069)
@@ -29,7 +29,7 @@
</copy>
<copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
- <filtersfile file="${build.dir}/version.properties"/>
+ <filtersfile file="${spi.dir}/version.properties"/>
</filterset>
</copy>
Added: spi/trunk/ant-import/build-setup.xml
===================================================================
--- spi/trunk/ant-import/build-setup.xml (rev 0)
+++ spi/trunk/ant-import/build-setup.xml 2007-08-01 22:44:38 UTC (rev 4069)
@@ -0,0 +1,45 @@
+<?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: build-setup.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="spi.dir" value="${basedir}"/>
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${spi.dir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${spi.dir}/ant.properties"/>
+ <property file="${spi.dir}/version.properties"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Modified: spi/trunk/ant-import/build-thirdparty.xml
===================================================================
--- spi/trunk/ant-import/build-thirdparty.xml 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/ant-import/build-thirdparty.xml 2007-08-01 22:44:38 UTC (rev 4069)
@@ -13,7 +13,7 @@
<project>
- <property file="${core.dir}/version.properties"/>
+ <property file="${basedir}/version.properties"/>
<!-- ========= -->
<!-- Libraries -->
@@ -22,7 +22,7 @@
<target name="thirdparty-init" depends="prepare">
<property name="thirdparty.dir" value="${spi.dir}/thirdparty"/>
- <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+ <checksum file="${spi.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty">
<or>
<not>
@@ -39,45 +39,31 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.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}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <checksum file="${build.dir}/version.properties" fileext=".md5"/>
+ <checksum file="${spi.dir}/version.properties" fileext=".md5"/>
</target>
<target name="thirdparty-classpath" depends="thirdparty-get">
<!-- The compile classpath for jbossws spi -->
<path id="spi.thirdparty.classpath">
- <pathelement location="${thirdparty.dir}/ant.jar"/>
<pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
@@ -90,10 +76,7 @@
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
</path>
</target>
Added: spi/trunk/ant.properties
===================================================================
--- spi/trunk/ant.properties (rev 0)
+++ spi/trunk/ant.properties 2007-08-01 22:44:38 UTC (rev 4069)
@@ -0,0 +1,20 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# JBoss Repository
+jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+#jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Added: spi/trunk/ant.properties.example
===================================================================
--- spi/trunk/ant.properties.example (rev 0)
+++ spi/trunk/ant.properties.example 2007-08-01 22:44:38 UTC (rev 4069)
@@ -0,0 +1,20 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Deleted: spi/trunk/build.bat
===================================================================
--- spi/trunk/build.bat 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/build.bat 2007-08-01 22:44:38 UTC (rev 4069)
@@ -1,109 +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 NOTE: Uncomment the USE_JDK6 property when using JDK 1.6
-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 JDK 6 Settings
-REM Uncomment when using JDK 6
-REM ******************************************************
-REM set USE_JDK6=true
-
-REM
-REM - "for" loops have been unrolled for compatibility
-REM with some WIN32 systems.
-REM ******************************************************
-
-set NAMES=build\tools;build\tools\ant;build\tools\apache\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: spi/trunk/build.sh
===================================================================
--- spi/trunk/build.sh 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/build.sh 2007-08-01 22:44:38 UTC (rev 4069)
@@ -1,183 +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=""
-
-# Uncomment when using JDK 6
-#USE_JDK6=true
-
-# the default search path for ant
-ANT_SEARCH_PATH="\
- tools
- tools/ant \
- tools/apache/ant \
- ant \
- ../build/tools/ant \
- ../../build/tools/ant \
- ../../../build/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" "../build/build.conf" "../../build/build.conf" "../../../build/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
-
- if [ "x$USE_JDK6" = "xtrue" ]; then
- ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed"
- echo "--------------------------------------"
- echo "Endorsed Directory: $ANT_HOME/endorsed"
- echo "--------------------------------------"
- fi
-
- # 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 "$@"
Modified: spi/trunk/build.xml
===================================================================
--- spi/trunk/build.xml 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/build.xml 2007-08-01 22:44:38 UTC (rev 4069)
@@ -11,13 +11,12 @@
<!-- $Id$ -->
-<project default="main" basedir="../..">
+<project default="main" basedir=".">
- <import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${spi.dir}/ant-import/build-release.xml"/>
- <import file="${spi.dir}/ant-import/build-thirdparty.xml"/>
-
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
@@ -70,7 +69,6 @@
<target name="compile-etc" depends="init">
<mkdir dir="${spi.output.etc.dir}"/>
<copy todir="${spi.output.etc.dir}" filtering="yes">
- <fileset dir="${spi.etc.dir}"/>
<fileset dir="${spi.etc.dir}">
<include name="default.mf"/>
</fileset>
@@ -79,7 +77,7 @@
<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="${build.dir}/version.properties"/>
+ <filtersfile file="${spi.dir}/version.properties"/>
</filterset>
</copy>
</target>
@@ -107,18 +105,6 @@
</fileset>
</jar>
- <!-- Build jbossws-spi-scripts.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" >
- <fileset dir="${spi.output.etc.dir}">
- <include name="wsconsume.bat"/>
- <include name="wsprovide.bat"/>
- </fileset>
- <zipfileset dir="${spi.output.etc.dir}" filemode="755">
- <include name="wsconsume.sh"/>
- <include name="wsprovide.sh"/>
- </zipfileset>
- </zip>
-
<!-- Build jbossws-spi-src.zip -->
<zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
<fileset dir="${spi.java.dir}"/>
Deleted: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2007-08-01 21:55:27 UTC (rev 4068)
+++ spi/trunk/spi.iml 2007-08-01 22:44:38 UTC (rev 4069)
@@ -1,294 +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="false">
- <output url="file://$MODULE_DIR$/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <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/jboss-logging-log4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-container.jar!/" />
- </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-xml-binding.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/servlet-api.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/jboss-dependency.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/stax-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.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/jaxws-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/jboss-microcontainer.jar!/" />
- </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/activation.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/jboss-microcontainer-src.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers-src.zip!/" />
- </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/jboss-deployers.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/wsdl4j-src.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <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/getopt.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/ant.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/jboss-logging-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
-</module>
-
Added: spi/trunk/version.properties
===================================================================
--- spi/trunk/version.properties (rev 0)
+++ spi/trunk/version.properties 2007-08-01 22:44:38 UTC (rev 4069)
@@ -0,0 +1,30 @@
+
+# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $
+
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-2.0
+
+version.id=2.0.1.CR1
+repository.id=2.0.1.CR1
+
+implementation.title=JBoss Web Services - SPI
+implementation.url=http://www.jboss.org/products/jbossws
+implementation.vendor=JBoss Inc.
+implementation.vendor.id=http://www.jboss.org
+
+# Thirdparty library versions
+apache-ant=1.6.5
+dom4j=1.6.1
+gnu-getopt=1.0.10
+jboss-common-core=2.0.2.GA
+jboss-common-logging-log4j=2.0.2.GA
+jboss-common-logging-spi=2.0.2.GA
+jboss-javaee=5.0.0-SNAPSHOT
+jboss-jbossxb=1.0.0.GA-brew
+jboss-microcontainer=2.0.0.Beta3
+sun-jaf=1.1
+sun-jaxb=2.1.4
+sun-jaxrpc=1.1
+sun-jaxws=2.1.1
+sun-servlet=2.5
17 years, 5 months
- 1
- 0
JBossWS SVN: r4068 - spi.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-01 17:55:27 -0400 (Wed, 01 Aug 2007)
New Revision: 4068
Added:
spi/trunk/
Log:
Copy trunk/integration/spi to jbossws/spi/trunk
Copied: spi/trunk (from rev 4067, trunk/integration/spi)
17 years, 5 months
- 1
- 0