[riftsaw-commits] riftsaw SVN: r1275 - in dsp/trunk: api and 6 other directories.

Author: objectiser Date: 2011-01-26 08:53:29 -0500 (Wed, 26 Jan 2011) New Revision: 1275 Modified: dsp/trunk/api/pom.xml dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java dsp/trunk/distribution/pom.xml dsp/trunk/jboss/pom.xml 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/pom.xml dsp/trunk/tomcat/pom.xml dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java Log: RIFTSAW-336 - initial work to support AS6. Modified: dsp/trunk/api/pom.xml =================================================================== --- dsp/trunk/api/pom.xml 2011-01-26 11:49:19 UTC (rev 1274) +++ dsp/trunk/api/pom.xml 2011-01-26 13:53:29 UTC (rev 1275) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-api</artifactId> <packaging>jar</packaging> - <version>1.0.0.CR1</version> + <version>1.0.0-SNAPSHOT</version> <name>SOA::DSP::API</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.0.0.CR1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <dependencies> Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java =================================================================== --- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java 2011-01-26 11:49:19 UTC (rev 1274) +++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java 2011-01-26 13:53:29 UTC (rev 1275) @@ -41,4 +41,39 @@ */ public File getServerDeployDir(); + /** + * This method returns the web service host. + * + * @return The web service host + */ + public String getWebServiceHost(); + + /** + * This method returns the web service port. + * + * @return The web service port + */ + public int getWebServicePort(); + + /** + * This method returns the secure web service port number. + * + * @return The secure web service port number + */ + public int getWebServiceSecurePort(); + + /** + * This method returns the server's cluster node name. + * + * @return The cluster node name + */ + public String getClusterNodeName(); + + /** + * This method returns the server's UDDI node name. + * + * @return The UDDI node name + */ + public String getUddiNodeName(); + } \ No newline at end of file Modified: dsp/trunk/distribution/pom.xml =================================================================== --- dsp/trunk/distribution/pom.xml 2011-01-26 11:49:19 UTC (rev 1274) +++ dsp/trunk/distribution/pom.xml 2011-01-26 13:53:29 UTC (rev 1275) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>distribution</artifactId> <packaging>pom</packaging> - <version>1.0.0.CR1</version> + <version>1.0.0-SNAPSHOT</version> <name>SOA::DSP::Distribution</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.0.0.CR1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/trunk/jboss/pom.xml =================================================================== --- dsp/trunk/jboss/pom.xml 2011-01-26 11:49:19 UTC (rev 1274) +++ dsp/trunk/jboss/pom.xml 2011-01-26 13:53:29 UTC (rev 1275) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-jboss</artifactId> <packaging>jar</packaging> - <version>1.0.0.CR1</version> + <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.CR1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <dependencies> Modified: 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 11:49:19 UTC (rev 1274) +++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfig.java 2011-01-26 13:53:29 UTC (rev 1275) @@ -17,26 +17,8 @@ */ 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(); - } Modified: 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 11:49:19 UTC (rev 1274) +++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigFactory.java 2011-01-26 13:53:29 UTC (rev 1275) @@ -32,7 +32,7 @@ /** The default bean name */ public static String BEAN_NAME = "org.jboss.soa.dsp:service=ServerConfig"; - public static JBossServerConfig createServerConfig() + public static ServerConfig createServerConfig() { return new KernelAwareSPIFactory().getKernelProvidedSPI( BEAN_NAME, JBossServerConfig.class Modified: 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 11:49:19 UTC (rev 1274) +++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/JBossServerConfigImpl.java 2011-01-26 13:53:29 UTC (rev 1275) @@ -33,7 +33,7 @@ /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ -public class JBossServerConfigImpl implements JBossServerConfig +public class JBossServerConfigImpl implements ServerConfig { protected final Log log = LogFactory.getLog(getClass()); Modified: dsp/trunk/pom.xml =================================================================== --- dsp/trunk/pom.xml 2011-01-26 11:49:19 UTC (rev 1274) +++ dsp/trunk/pom.xml 2011-01-26 13:53:29 UTC (rev 1275) @@ -5,11 +5,11 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> <packaging>pom</packaging> - <version>1.0.0.CR1</version> + <version>1.0.0-SNAPSHOT</version> <name>SOA::DSP</name> <properties> - <dsp.version>1.0.0.CR1</dsp.version> + <dsp.version>1.0.0-SNAPSHOT</dsp.version> <junit.version>4.8.1</junit.version> <jboss.version>5.1.0.GA</jboss.version> <jaxws.version>2.1</jaxws.version> Modified: dsp/trunk/tomcat/pom.xml =================================================================== --- dsp/trunk/tomcat/pom.xml 2011-01-26 11:49:19 UTC (rev 1274) +++ dsp/trunk/tomcat/pom.xml 2011-01-26 13:53:29 UTC (rev 1275) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-tomcat</artifactId> <packaging>jar</packaging> - <version>1.0.0.CR1</version> + <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.CR1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <dependencies> Modified: 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 11:49:19 UTC (rev 1274) +++ dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigFactory.java 2011-01-26 13:53:29 UTC (rev 1275) @@ -50,6 +50,26 @@ } 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);