Author: objectiser
Date: 2011-01-26 09:12:29 -0500 (Wed, 26 Jan 2011)
New Revision: 1276
Added:
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/DefaultServerConfig.java
dsp/trunk/integration/
dsp/trunk/integration/jbossas5/
dsp/trunk/integration/jbossas5/pom.xml
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
dsp/trunk/integration/pom.xml
dsp/trunk/integration/tomcat/
dsp/trunk/integration/tomcat/pom.xml
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
Removed:
dsp/trunk/integration/jbossas5/pom.xml
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
dsp/trunk/integration/tomcat/.classpath
dsp/trunk/integration/tomcat/.project
dsp/trunk/integration/tomcat/pom.xml
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
dsp/trunk/jboss/pom.xml
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java
dsp/trunk/jboss/src/main/resources/
dsp/trunk/jboss/src/test/
dsp/trunk/tomcat/.classpath
dsp/trunk/tomcat/.project
dsp/trunk/tomcat/pom.xml
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
dsp/trunk/tomcat/src/main/resources/
Modified:
dsp/trunk/pom.xml
Log:
RIFTSAW-336 - further refactoring work to support AS6.
Added: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/DefaultServerConfig.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/DefaultServerConfig.java
(rev 0)
+++
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/DefaultServerConfig.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server;
+
+import java.io.File;
+
+/**
+ * Default base implementation of the server independent config.
+ * This class should be derived to provide the required information.
+ *
+ */
+public abstract class DefaultServerConfig implements ServerConfig {
+
+ /**
+ * This method returns the server's temp directory. This directory
+ * will be used to create the deployable archive before actual
+ * deployment.
+ *
+ * @return The temp directory
+ */
+ public File getServerTempDir() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * This method returns the directory where the deployable archive
+ * should be placed.
+ *
+ * @return The deployment directory
+ */
+ public File getServerDeployDir() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * This method returns the web service host.
+ *
+ * @return The web service host
+ */
+ public String getWebServiceHost() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * This method returns the web service port.
+ *
+ * @return The web service port
+ */
+ public int getWebServicePort() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * This method returns the secure web service port number.
+ *
+ * @return The secure web service port number
+ */
+ public int getWebServiceSecurePort() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * This method returns the server's cluster node name.
+ *
+ * @return The cluster node name
+ */
+ public String getClusterNodeName() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * This method returns the server's UDDI node name.
+ *
+ * @return The UDDI node name
+ */
+ public String getUddiNodeName() {
+ throw new UnsupportedOperationException();
+ }
+
+}
\ No newline at end of file
Copied: dsp/trunk/integration/jbossas5 (from rev 1273, dsp/trunk/jboss)
Deleted: dsp/trunk/integration/jbossas5/pom.xml
===================================================================
--- dsp/trunk/jboss/pom.xml 2011-01-25 15:33:18 UTC (rev 1273)
+++ dsp/trunk/integration/jbossas5/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0.CR1</version>
- <name>SOA::DSP::JBoss</name>
-
- <parent>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp</artifactId>
- <version>1.0.0.CR1</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-api</artifactId>
- <version>${dsp.version}</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Dependencies for JBoss specific deployer -->
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>${jboss.metadata.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${jboss.microcontainer.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-</project>
Copied: dsp/trunk/integration/jbossas5/pom.xml (from rev 1275, dsp/trunk/jboss/pom.xml)
===================================================================
--- dsp/trunk/integration/jbossas5/pom.xml (rev 0)
+++ dsp/trunk/integration/jbossas5/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jbossas5</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Integration::JBossAS5</name>
+
+ <parent>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Dependencies for JBoss specific deployer -->
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${jboss.metadata.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Deleted:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-25
15:33:18 UTC (rev 1273)
+++
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import java.io.File;
-
-import org.jboss.soa.dsp.server.ServerConfig;
-
-public interface JBossServerConfig extends ServerConfig {
-
- String getImplementationTitle();
-
- String getImplementationVersion();
-
- File getServerDataDir();
-
- String getWebServiceHost();
-
- int getWebServicePort();
-
- int getWebServiceSecurePort();
-
- String getClusterNodeName();
-
- String getUddiNodeName();
-
-}
Copied:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
(from rev 1275,
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java)
===================================================================
---
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
(rev 0)
+++
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -0,0 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import org.jboss.soa.dsp.server.ServerConfig;
+
+public interface JBossServerConfig extends ServerConfig {
+
+}
Deleted:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-25
15:33:18 UTC (rev 1273)
+++
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import org.jboss.soa.dsp.server.ServerConfig;
-
-
-/**
- * Factory to container independent config
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- *
- * @since 08-May-2006
- */
-public class JBossServerConfigFactory implements
org.jboss.soa.dsp.server.ServerConfigFactory
-{
- /** The default bean name */
- public static String BEAN_NAME = "org.jboss.soa.dsp:service=ServerConfig";
-
- public static JBossServerConfig createServerConfig()
- {
- return new KernelAwareSPIFactory().getKernelProvidedSPI(
- BEAN_NAME, JBossServerConfig.class
- );
- }
-
- public ServerConfig getServerConfig() {
- return(createServerConfig());
- }
-}
\ No newline at end of file
Copied:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
(from rev 1275,
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java)
===================================================================
---
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
(rev 0)
+++
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import org.jboss.soa.dsp.server.ServerConfig;
+
+
+/**
+ * Factory to container independent config
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
+ * @since 08-May-2006
+ */
+public class JBossServerConfigFactory implements
org.jboss.soa.dsp.server.ServerConfigFactory
+{
+ /** The default bean name */
+ public static String BEAN_NAME = "org.jboss.soa.dsp:service=ServerConfig";
+
+ public static ServerConfig createServerConfig()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ BEAN_NAME, JBossServerConfig.class
+ );
+ }
+
+ public ServerConfig getServerConfig() {
+ return(createServerConfig());
+ }
+}
\ No newline at end of file
Deleted:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-25
15:33:18 UTC (rev 1273)
+++
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,251 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.util.id.GUID;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Set;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class JBossServerConfigImpl implements JBossServerConfig
-{
- protected final Log log = LogFactory.getLog(getClass());
-
- // The MBeanServer
- private MBeanServer mbeanServer;
-
- private final static String UNDEFINED_HOSTNAME = "undefined.host";
-
- // The webservice host name that will be used when updating the wsdl
- private String webServiceHost = UNDEFINED_HOSTNAME;
- // The webservice port that will be used when updating the wsdl
- private int webServicePort;
- // The webservice port that will be used when updating the wsdl
- private int webServiceSecurePort;
-
- private static String nonClusteredServerName=new GUID().toString();
-
- private String clusterNodeName;
-
- public JBossServerConfigImpl()
- {
- }
-
- public MBeanServer getMbeanServer()
- {
- return mbeanServer;
- }
-
- public void setMbeanServer(MBeanServer mbeanServer)
- {
- this.mbeanServer = mbeanServer;
- }
-
- public String getImplementationTitle()
- {
- return "jbossas-riftsaw";
- }
-
- public String getImplementationVersion()
- {
- return "5.x";
- }
-
- public File getServerTempDir()
- {
- try
- {
- ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getHomeDir()
- {
- try
- {
- ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getServerDataDir()
- {
- try
- {
- ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getServerDeployDir() {
- return(getServerDataDir());
- }
-
- public String getWebServiceHost()
- {
- return webServiceHost;
- }
-
- public void setWebServiceHost(String host) throws UnknownHostException
- {
- if (host == null || host.trim().length() == 0)
- {
- log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
- host = UNDEFINED_HOSTNAME;
- }
- if ("0.0.0.0".equals(host))
- {
- InetAddress localHost = InetAddress.getLocalHost();
- log.debug("Using local host: " + localHost.getHostName());
- host = localHost.getHostName();
- }
- this.webServiceHost = host;
- }
-
- public void setWebServicePort(int port)
- {
- this.webServicePort = port;
- }
-
- public void setWebServiceSecurePort(int port)
- {
- this.webServiceSecurePort = port;
- }
-
- public int getWebServicePort()
- {
- if (webServicePort <= 0)
- webServicePort = getConnectorPort("HTTP/1.1", false);
-
- int localPort = webServicePort;
- if (localPort <= 0)
- {
- // Do not initialize webServicePort with the default, the connector port may become
available later
- log.warn("Unable to calculate 'WebServicePort', using default
'8080'");
- localPort = 8080;
- }
-
- return localPort;
- }
-
-
- public int getWebServiceSecurePort()
- {
- if (webServiceSecurePort <= 0)
- webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
-
- int localPort = webServiceSecurePort;
- if (localPort <= 0)
- {
- // Do not initialize webServiceSecurePort with the default, the connector port may
become available later
- log.warn("Unable to calculate 'WebServiceSecurePort', using default
'8443'");
- localPort = 8443;
- }
-
- return localPort;
- }
-
- private int getConnectorPort(final String protocol, final boolean secure)
- {
- int port = -1;
-
- try
- {
- ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
-
- Set connectorNames = getMbeanServer().queryNames(connectors, null);
- for (Object current : connectorNames)
- {
- ObjectName currentName = (ObjectName)current;
-
- try
- {
- int connectorPort = (Integer)getMbeanServer().getAttribute(currentName,
"port");
- boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName,
"secure");
- String connectorProtocol = (String)getMbeanServer().getAttribute(currentName,
"protocol");
-
-
- if (protocol.equals(connectorProtocol) && secure == connectorSecure)
- {
- if (port > -1)
- {
- log.warn("Found multiple connectors for protocol='" +
protocol + "' and secure='" + secure + "', using first port
found '" + port + "'");
- }
- else
- {
- port = connectorPort;
- }
- }
- }
- catch (AttributeNotFoundException ignored)
- {
- }
- }
-
- return port;
- }
- catch (JMException e)
- {
- return -1;
- }
- }
-
- public String getClusterNodeName() {
- if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim()))
{
- return nonClusteredServerName;
- }
- return this.clusterNodeName;
- }
-
- public void setClusterNodeName(String clusterNodeName) {
- this.clusterNodeName = clusterNodeName;
- }
-
-
- public String getUddiNodeName() {
- return this.getWebServiceHost() + "-" + this.getWebServicePort();
- }
-
-}
Copied:
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
(from rev 1275,
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java)
===================================================================
---
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
(rev 0)
+++
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.soa.dsp.server.DefaultServerConfig;
+import org.jboss.util.id.GUID;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.io.File;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Set;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JBossServerConfigImpl extends DefaultServerConfig
+{
+ protected final Log log = LogFactory.getLog(getClass());
+
+ // The MBeanServer
+ private MBeanServer mbeanServer;
+
+ private final static String UNDEFINED_HOSTNAME = "undefined.host";
+
+ // The webservice host name that will be used when updating the wsdl
+ private String webServiceHost = UNDEFINED_HOSTNAME;
+ // The webservice port that will be used when updating the wsdl
+ private int webServicePort;
+ // The webservice port that will be used when updating the wsdl
+ private int webServiceSecurePort;
+
+ private static String nonClusteredServerName=new GUID().toString();
+
+ private String clusterNodeName;
+
+ public JBossServerConfigImpl()
+ {
+ }
+
+ public MBeanServer getMbeanServer()
+ {
+ return mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer mbeanServer)
+ {
+ this.mbeanServer = mbeanServer;
+ }
+
+ public String getImplementationTitle()
+ {
+ return "jbossas-riftsaw";
+ }
+
+ public String getImplementationVersion()
+ {
+ return "5.x";
+ }
+
+ public File getServerTempDir()
+ {
+ try
+ {
+ ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getHomeDir()
+ {
+ try
+ {
+ ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getServerDataDir()
+ {
+ try
+ {
+ ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getServerDeployDir() {
+ return(getServerDataDir());
+ }
+
+ public String getWebServiceHost()
+ {
+ return webServiceHost;
+ }
+
+ public void setWebServiceHost(String host) throws UnknownHostException
+ {
+ if (host == null || host.trim().length() == 0)
+ {
+ log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
+ host = UNDEFINED_HOSTNAME;
+ }
+ if ("0.0.0.0".equals(host))
+ {
+ InetAddress localHost = InetAddress.getLocalHost();
+ log.debug("Using local host: " + localHost.getHostName());
+ host = localHost.getHostName();
+ }
+ this.webServiceHost = host;
+ }
+
+ public void setWebServicePort(int port)
+ {
+ this.webServicePort = port;
+ }
+
+ public void setWebServiceSecurePort(int port)
+ {
+ this.webServiceSecurePort = port;
+ }
+
+ public int getWebServicePort()
+ {
+ if (webServicePort <= 0)
+ webServicePort = getConnectorPort("HTTP/1.1", false);
+
+ int localPort = webServicePort;
+ if (localPort <= 0)
+ {
+ // Do not initialize webServicePort with the default, the connector port may become
available later
+ log.warn("Unable to calculate 'WebServicePort', using default
'8080'");
+ localPort = 8080;
+ }
+
+ return localPort;
+ }
+
+
+ public int getWebServiceSecurePort()
+ {
+ if (webServiceSecurePort <= 0)
+ webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
+
+ int localPort = webServiceSecurePort;
+ if (localPort <= 0)
+ {
+ // Do not initialize webServiceSecurePort with the default, the connector port may
become available later
+ log.warn("Unable to calculate 'WebServiceSecurePort', using default
'8443'");
+ localPort = 8443;
+ }
+
+ return localPort;
+ }
+
+ private int getConnectorPort(final String protocol, final boolean secure)
+ {
+ int port = -1;
+
+ try
+ {
+ ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
+
+ Set<?> connectorNames = getMbeanServer().queryNames(connectors, null);
+ for (Object current : connectorNames)
+ {
+ ObjectName currentName = (ObjectName)current;
+
+ try
+ {
+ int connectorPort = (Integer)getMbeanServer().getAttribute(currentName,
"port");
+ boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName,
"secure");
+ String connectorProtocol = (String)getMbeanServer().getAttribute(currentName,
"protocol");
+
+
+ if (protocol.equals(connectorProtocol) && secure == connectorSecure)
+ {
+ if (port > -1)
+ {
+ log.warn("Found multiple connectors for protocol='" +
protocol + "' and secure='" + secure + "', using first port
found '" + port + "'");
+ }
+ else
+ {
+ port = connectorPort;
+ }
+ }
+ }
+ catch (AttributeNotFoundException ignored)
+ {
+ }
+ }
+
+ return port;
+ }
+ catch (JMException e)
+ {
+ return -1;
+ }
+ }
+
+ public String getClusterNodeName() {
+ if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim()))
{
+ return nonClusteredServerName;
+ }
+ return this.clusterNodeName;
+ }
+
+ public void setClusterNodeName(String clusterNodeName) {
+ this.clusterNodeName = clusterNodeName;
+ }
+
+
+ public String getUddiNodeName() {
+ return this.getWebServiceHost() + "-" + this.getWebServicePort();
+ }
+
+}
Added: dsp/trunk/integration/pom.xml
===================================================================
--- dsp/trunk/integration/pom.xml (rev 0)
+++ dsp/trunk/integration/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>integration</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Integration</name>
+
+ <parent>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>jbossas5</module>
+ <module>tomcat</module>
+ </modules>
+</project>
Copied: dsp/trunk/integration/tomcat (from rev 1273, dsp/trunk/tomcat)
Property changes on: dsp/trunk/integration/tomcat
___________________________________________________________________
Name: svn:ignore
+ target
.settings
Deleted: dsp/trunk/integration/tomcat/.classpath
===================================================================
--- dsp/trunk/tomcat/.classpath 2011-01-25 15:33:18 UTC (rev 1273)
+++ dsp/trunk/integration/tomcat/.classpath 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src"
path="src/main/java"/>
- <classpathentry excluding="WEB-INF/|WEB-INF/" kind="src"
path="src/main/resources"/>
- <classpathentry kind="var"
path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="src" path="/dsp-api"/>
- <classpathentry kind="var"
path="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar"
sourcepath="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: dsp/trunk/integration/tomcat/.project
===================================================================
--- dsp/trunk/tomcat/.project 2011-01-25 15:33:18 UTC (rev 1273)
+++ dsp/trunk/integration/tomcat/.project 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,15 +0,0 @@
-<projectDescription>
- <name>dsp-tomcat</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the
maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects>
- <project>dsp-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Deleted: dsp/trunk/integration/tomcat/pom.xml
===================================================================
--- dsp/trunk/tomcat/pom.xml 2011-01-25 15:33:18 UTC (rev 1273)
+++ dsp/trunk/integration/tomcat/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-tomcat</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0.CR1</version>
- <name>SOA::DSP::Tomcat</name>
-
- <parent>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp</artifactId>
- <version>1.0.0.CR1</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-api</artifactId>
- <version>${dsp.version}</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-</project>
Copied: dsp/trunk/integration/tomcat/pom.xml (from rev 1275, dsp/trunk/tomcat/pom.xml)
===================================================================
--- dsp/trunk/integration/tomcat/pom.xml (rev 0)
+++ dsp/trunk/integration/tomcat/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-tomcat</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Integration::Tomcat</name>
+
+ <parent>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Deleted:
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
===================================================================
---
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java 2011-01-25
15:33:18 UTC (rev 1273)
+++
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.tomcat;
-
-import java.io.File;
-
-import org.jboss.soa.dsp.server.ServerConfig;
-
-public class TomcatServerConfigFactory implements
org.jboss.soa.dsp.server.ServerConfigFactory {
-
- public ServerConfig getServerConfig() {
- ServerConfig ret=new ServerConfig() {
-
- protected File getTomcatRoot() {
- String path=System.getenv("CATALINA_HOME");
-
- if (path == null) {
- return(null);
- }
-
- return(new File(path));
- }
-
- public File getServerTempDir() {
- File tomcat=getTomcatRoot();
- if (tomcat == null) {
- return(null);
- }
- return(new java.io.File(tomcat, "temp"));
- }
-
- public File getServerDeployDir() {
- File tomcat=getTomcatRoot();
- if (tomcat == null) {
- return(null);
- }
- return(new java.io.File(tomcat, "webapps"));
- }
- };
-
- return(ret);
- }
-
-}
Copied:
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
(from rev 1275,
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java)
===================================================================
---
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
(rev 0)
+++
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.tomcat;
+
+import java.io.File;
+
+import org.jboss.soa.dsp.server.ServerConfig;
+
+public class TomcatServerConfigFactory implements
org.jboss.soa.dsp.server.ServerConfigFactory {
+
+ public ServerConfig getServerConfig() {
+ ServerConfig ret=new ServerConfig() {
+
+ protected File getTomcatRoot() {
+ String path=System.getenv("CATALINA_HOME");
+
+ if (path == null) {
+ return(null);
+ }
+
+ return(new File(path));
+ }
+
+ public File getServerTempDir() {
+ File tomcat=getTomcatRoot();
+ if (tomcat == null) {
+ return(null);
+ }
+ return(new java.io.File(tomcat, "temp"));
+ }
+
+ public File getServerDeployDir() {
+ File tomcat=getTomcatRoot();
+ if (tomcat == null) {
+ return(null);
+ }
+ return(new java.io.File(tomcat, "webapps"));
+ }
+
+ public String getWebServiceHost() {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getWebServicePort() {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getWebServiceSecurePort() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getClusterNodeName() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getUddiNodeName() {
+ throw new UnsupportedOperationException();
+ }
+ };
+
+ return(ret);
+ }
+
+}
Deleted: dsp/trunk/jboss/pom.xml
===================================================================
--- dsp/trunk/jboss/pom.xml 2011-01-26 13:53:29 UTC (rev 1275)
+++ dsp/trunk/jboss/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-jboss</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
- <name>SOA::DSP::JBoss</name>
-
- <parent>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-api</artifactId>
- <version>${dsp.version}</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Dependencies for JBoss specific deployer -->
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>${jboss.metadata.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${jboss.microcontainer.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-</project>
Deleted:
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import org.jboss.soa.dsp.server.ServerConfig;
-
-public interface JBossServerConfig extends ServerConfig {
-
-}
Deleted:
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import org.jboss.soa.dsp.server.ServerConfig;
-
-
-/**
- * Factory to container independent config
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- *
- * @since 08-May-2006
- */
-public class JBossServerConfigFactory implements
org.jboss.soa.dsp.server.ServerConfigFactory
-{
- /** The default bean name */
- public static String BEAN_NAME = "org.jboss.soa.dsp:service=ServerConfig";
-
- public static ServerConfig createServerConfig()
- {
- return new KernelAwareSPIFactory().getKernelProvidedSPI(
- BEAN_NAME, JBossServerConfig.class
- );
- }
-
- public ServerConfig getServerConfig() {
- return(createServerConfig());
- }
-}
\ No newline at end of file
Deleted:
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,251 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.soa.dsp.server.ServerConfig;
-import org.jboss.util.id.GUID;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Set;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class JBossServerConfigImpl implements ServerConfig
-{
- protected final Log log = LogFactory.getLog(getClass());
-
- // The MBeanServer
- private MBeanServer mbeanServer;
-
- private final static String UNDEFINED_HOSTNAME = "undefined.host";
-
- // The webservice host name that will be used when updating the wsdl
- private String webServiceHost = UNDEFINED_HOSTNAME;
- // The webservice port that will be used when updating the wsdl
- private int webServicePort;
- // The webservice port that will be used when updating the wsdl
- private int webServiceSecurePort;
-
- private static String nonClusteredServerName=new GUID().toString();
-
- private String clusterNodeName;
-
- public JBossServerConfigImpl()
- {
- }
-
- public MBeanServer getMbeanServer()
- {
- return mbeanServer;
- }
-
- public void setMbeanServer(MBeanServer mbeanServer)
- {
- this.mbeanServer = mbeanServer;
- }
-
- public String getImplementationTitle()
- {
- return "jbossas-riftsaw";
- }
-
- public String getImplementationVersion()
- {
- return "5.x";
- }
-
- public File getServerTempDir()
- {
- try
- {
- ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getHomeDir()
- {
- try
- {
- ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getServerDataDir()
- {
- try
- {
- ObjectName oname =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
- }
-
- public File getServerDeployDir() {
- return(getServerDataDir());
- }
-
- public String getWebServiceHost()
- {
- return webServiceHost;
- }
-
- public void setWebServiceHost(String host) throws UnknownHostException
- {
- if (host == null || host.trim().length() == 0)
- {
- log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
- host = UNDEFINED_HOSTNAME;
- }
- if ("0.0.0.0".equals(host))
- {
- InetAddress localHost = InetAddress.getLocalHost();
- log.debug("Using local host: " + localHost.getHostName());
- host = localHost.getHostName();
- }
- this.webServiceHost = host;
- }
-
- public void setWebServicePort(int port)
- {
- this.webServicePort = port;
- }
-
- public void setWebServiceSecurePort(int port)
- {
- this.webServiceSecurePort = port;
- }
-
- public int getWebServicePort()
- {
- if (webServicePort <= 0)
- webServicePort = getConnectorPort("HTTP/1.1", false);
-
- int localPort = webServicePort;
- if (localPort <= 0)
- {
- // Do not initialize webServicePort with the default, the connector port may become
available later
- log.warn("Unable to calculate 'WebServicePort', using default
'8080'");
- localPort = 8080;
- }
-
- return localPort;
- }
-
-
- public int getWebServiceSecurePort()
- {
- if (webServiceSecurePort <= 0)
- webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
-
- int localPort = webServiceSecurePort;
- if (localPort <= 0)
- {
- // Do not initialize webServiceSecurePort with the default, the connector port may
become available later
- log.warn("Unable to calculate 'WebServiceSecurePort', using default
'8443'");
- localPort = 8443;
- }
-
- return localPort;
- }
-
- private int getConnectorPort(final String protocol, final boolean secure)
- {
- int port = -1;
-
- try
- {
- ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
-
- Set connectorNames = getMbeanServer().queryNames(connectors, null);
- for (Object current : connectorNames)
- {
- ObjectName currentName = (ObjectName)current;
-
- try
- {
- int connectorPort = (Integer)getMbeanServer().getAttribute(currentName,
"port");
- boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName,
"secure");
- String connectorProtocol = (String)getMbeanServer().getAttribute(currentName,
"protocol");
-
-
- if (protocol.equals(connectorProtocol) && secure == connectorSecure)
- {
- if (port > -1)
- {
- log.warn("Found multiple connectors for protocol='" +
protocol + "' and secure='" + secure + "', using first port
found '" + port + "'");
- }
- else
- {
- port = connectorPort;
- }
- }
- }
- catch (AttributeNotFoundException ignored)
- {
- }
- }
-
- return port;
- }
- catch (JMException e)
- {
- return -1;
- }
- }
-
- public String getClusterNodeName() {
- if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim()))
{
- return nonClusteredServerName;
- }
- return this.clusterNodeName;
- }
-
- public void setClusterNodeName(String clusterNodeName) {
- this.clusterNodeName = clusterNodeName;
- }
-
-
- public String getUddiNodeName() {
- return this.getWebServiceHost() + "-" + this.getWebServicePort();
- }
-
-}
Deleted:
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.spi.dependency.KernelController;
-
-/**
- * SPI factory delegating to kernel for bean lookups
- *
- * @author richard.opalka(a)jboss.com
- * @author Heiko.Braun(a)jboss.com
- */
-public class KernelAwareSPIFactory
-{
- @SuppressWarnings("unchecked")
- public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact)
- {
- KernelController controller = KernelLocator.getKernel().getController();
- ControllerContext ctx = controller.getInstalledContext(beanName);
- return (T)ctx.getTarget();
- }
-}
\ No newline at end of file
Deleted: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-//$Id$
-
-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:
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,51 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import java.util.Iterator;
-
-/**
- * Locate the single instance of the MBeanServer
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 30-Jul-2007
- */
-public class MBeanServerLocator
-{
- private MBeanServer mbeanServer;
-
- public MBeanServer getMbeanServer()
- {
- // In jboss-4.2 the MBeanServer cannot be injected
- if (mbeanServer == null)
- {
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator();
i.hasNext();)
- {
- mbeanServer = (MBeanServer)i.next();
- break;
- }
- }
- return mbeanServer;
- }
-
- public void setMbeanServer(MBeanServer mbeanServer)
- {
- this.mbeanServer = mbeanServer;
- }
-}
Deleted:
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java
===================================================================
---
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.jboss;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.util.Hashtable;
-
-/**
- * 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);
- }
- }
-}
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2011-01-26 13:53:29 UTC (rev 1275)
+++ dsp/trunk/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -23,8 +23,7 @@
<modules>
<module>api</module>
- <module>jboss</module>
- <module>tomcat</module>
+ <module>integration</module>
<module>distribution</module>
</modules>
Deleted: dsp/trunk/tomcat/.classpath
===================================================================
--- dsp/trunk/tomcat/.classpath 2011-01-26 13:53:29 UTC (rev 1275)
+++ dsp/trunk/tomcat/.classpath 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src"
path="src/main/java"/>
- <classpathentry excluding="WEB-INF/|WEB-INF/" kind="src"
path="src/main/resources"/>
- <classpathentry kind="var"
path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="src" path="/dsp-api"/>
- <classpathentry kind="var"
path="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar"
sourcepath="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: dsp/trunk/tomcat/.project
===================================================================
--- dsp/trunk/tomcat/.project 2011-01-26 13:53:29 UTC (rev 1275)
+++ dsp/trunk/tomcat/.project 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,15 +0,0 @@
-<projectDescription>
- <name>dsp-tomcat</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the
maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects>
- <project>dsp-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Deleted: dsp/trunk/tomcat/pom.xml
===================================================================
--- dsp/trunk/tomcat/pom.xml 2011-01-26 13:53:29 UTC (rev 1275)
+++ dsp/trunk/tomcat/pom.xml 2011-01-26 14:12:29 UTC (rev 1276)
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-tomcat</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
- <name>SOA::DSP::Tomcat</name>
-
- <parent>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.soa.dsp</groupId>
- <artifactId>dsp-api</artifactId>
- <version>${dsp.version}</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-</project>
Deleted:
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java
===================================================================
---
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java 2011-01-26
13:53:29 UTC (rev 1275)
+++
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java 2011-01-26
14:12:29 UTC (rev 1276)
@@ -1,78 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *
http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.server.tomcat;
-
-import java.io.File;
-
-import org.jboss.soa.dsp.server.ServerConfig;
-
-public class TomcatServerConfigFactory implements
org.jboss.soa.dsp.server.ServerConfigFactory {
-
- public ServerConfig getServerConfig() {
- ServerConfig ret=new ServerConfig() {
-
- protected File getTomcatRoot() {
- String path=System.getenv("CATALINA_HOME");
-
- if (path == null) {
- return(null);
- }
-
- return(new File(path));
- }
-
- public File getServerTempDir() {
- File tomcat=getTomcatRoot();
- if (tomcat == null) {
- return(null);
- }
- return(new java.io.File(tomcat, "temp"));
- }
-
- public File getServerDeployDir() {
- File tomcat=getTomcatRoot();
- if (tomcat == null) {
- return(null);
- }
- return(new java.io.File(tomcat, "webapps"));
- }
-
- public String getWebServiceHost() {
- throw new UnsupportedOperationException();
- }
-
- public int getWebServicePort() {
- throw new UnsupportedOperationException();
- }
-
- public int getWebServiceSecurePort() {
- throw new UnsupportedOperationException();
- }
-
- public String getClusterNodeName() {
- throw new UnsupportedOperationException();
- }
-
- public String getUddiNodeName() {
- throw new UnsupportedOperationException();
- }
- };
-
- return(ret);
- }
-
-}